/[pkg-src]/trunk/nxserver-freenx/patches/nxserver-freenx-0.6.1-svn333-update.patch

Contents of /trunk/nxserver-freenx/patches/nxserver-freenx-0.6.1-svn333-update.patch

Revision 203 - (show annotations) (download)
Mon May 21 12:07:25 2007 UTC (16 years, 11 months ago) by niro
File size: 77656 byte(s)

upstream fixes from svn, rev 333

1	diff -Naur freenx-0.6.0/ChangeLog trunk/ChangeLog
2	--- freenx-0.6.0/ChangeLog 2007-01-23 04:22:49.000000000 +0100
3	+++ trunk/ChangeLog 2007-05-21 12:00:39.000000000 +0200
4	@@ -1,3 +1,42 @@
5	+xx.xx.2007 FreeNX 0.6.1
6	+ * Fixed the printing support for CUPS 1.2.
7	+ Older versions of CUPS are no longer supported.
8	+ * Note: You must do as root:
9	+
10	+ cp /usr/lib/cups/backend/ipp /usr/lib/cups/backend/nxipp
11	+ chmod 755 /usr/lib/cups/backend/nxipp
12	+
13	+ Or alternatively re-run nxsetup.
14	+
15	+ * Added foomatic support.
16	+ * Note: You might need to do: ln -s /usr/bin/foomatic-ppdfile
17	+ /usr/lib/cups/driver/
18	+ * Added setting of CUPS_SERVER environment var.
19	+ * Added automatic downloading of PPDs, if the client supports it.
20	+ * Added configuration vars to tweak the new behaviour.
21	+ * Added cups seamless support with no "use this driver?" dialogs at all.
22	+ * Note: You need nxcupsd-wrapper on the client side for CUPS 1.2
23	+ clients.
24	+
25	+ Get it from nxutils repository.
26	+
27	+ * Fixed Support for "Running" sessions - again.
28	+ * Made the NXAgent exited with exit code 1 message more verbose.
29	+ * Added support for nxipp to nxnode and nxsetup.
30	+ * Added nxcups-gethost script for automatic usage in KDE.
31	+ * Fixed RDP/VNC sessions. No application should be started for that type.
32	+ (Patch by Bernard Cafarelli <voyageur@operamail.com>)
33	+ * Added backingstore fix for older clients from Gentoo.
34	+ (http://bugs.gentoo.org/show_bug.cgi?id=149298)
35	+ * Fixed VNC sessions.
36	+ * Fixed fullscreen sessions.
37	+ (Patch by Gentoo Bugtracker)
38	+ * Fixed --broadcast.
39	+ * Added "passwd -u nx" to nxsetup to fix slackware.
40	+ * Fixed respecting of enconding settings in case of rootless mode.
41	+ * Fixed smb mounting in case nxclient sends the wrong port.
42	+ (Patch by Jan Lockenvitz <jan.lockenvitz.ext@siemens.com>)
43	+
44	23.01.2007 FreeNX 0.6.0 "Juliana birthday edition"
45	* Opened the 0.6.0 branch.
46	* Added nxnode slave mode.
47	diff -Naur freenx-0.6.0/node.conf.sample trunk/node.conf.sample
48	--- freenx-0.6.0/node.conf.sample 2007-01-23 04:22:50.000000000 +0100
49	+++ trunk/node.conf.sample 2007-05-21 12:00:39.000000000 +0200
50	@@ -37,7 +37,7 @@
51	#
52	# https://mail.kde.org/mailman/listinfo/freenx-knx
53	#
54	-# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
55	+# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
56
57	#########################################################################
58	# General FreeNX directives
59	@@ -247,11 +247,51 @@
60	#ARTSD_BIN_PRELOAD="artsdsp"
61
62	# FreeNX with ENABLE_KDE_CUPS="1" will automatically write
63	-# $KDE_PRINTRC and put the current used port into it.
64	+# $KDE_PRINTRC and put the current used socket into it.
65	+#
66	+# If you additionally enable ENABLE_KDE_CUPS_DYNAMIC it will set the
67	+# Host entry to the script nxcups-gethost, which dynamically tries all
68	+# possible entries to find the current printing host.
69	+#
70	+# The order is: CUPS_SERVER (env var), ~/.cups/client.conf, $KDE_PRINTRC,
71	+# $CUPS_DEFAULT_SOCK, localhost
72	+#
73	+# So this option is most useful with ENABLE_CUPS_SERVER_EXPORT="1".
74	+#
75	# $KDE_PRINTRC is automatically calculated if its not set.
76
77	#ENABLE_KDE_CUPS="0"
78	+#ENABLE_KDE_CUPS_DYNAMIC="0"
79	#KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
80	+
81	+# FreeNX with ENABLE_CUPS_SERVER_EXPORT="1" will automatically
82	+# export the environment variable CUPS_SERVER.
83	+
84	+#ENABLE_CUPS_SERVER_EXPORT="1"
85	+
86	+# FreeNX with ENABLE_CUPS_SEAMLESS will automatically try to download the
87	+# necessary ppds from the client.
88	+#
89	+# As the forwarding is just active as soon as nxagent is started,
90	+# we need a small delay of $CUPS_SEAMLESS_DELAY.
91	+#
92	+# Note: You need to use a patched cupsd on client side.
93	+
94	+#ENABLE_CUPS_SEAMLESS="0"
95	+#CUPS_SEAMLESS_DELAY="10"
96	+
97	+# FreeNX with ENABLE_FOOMATIC will integrate the foomatic db to the list
98	+# of available ppd drivers via the $COMMAND_FOOMATIC command.
99	+
100	+#ENABLE_FOOMATIC="1"
101	+#COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
102	+
103	+# CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS
104	+# installation.
105	+
106	+#CUPS_BACKEND="/usr/lib/cups/backend"
107	+#CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
108	+#CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
109	#CUPS_ETC="/etc/cups"
110
111	#########################################################################
112	diff -Naur freenx-0.6.0/nxclient trunk/nxclient
113	--- freenx-0.6.0/nxclient 2007-01-23 04:22:49.000000000 +0100
114	+++ trunk/nxclient 2007-05-21 12:00:39.000000000 +0200
115	@@ -9,7 +9,7 @@
116	# but we set it to a "good value" anyway in case
117	# it does check it someday.
118	#
119	-# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
120	+# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
121	#
122	# ========================================================================
123
124	@@ -98,6 +98,8 @@
125	[ -n "$USER_FAKE_HOME" ] && UTILITY_DRIVERS_CACHE="$USER_FAKE_HOME/.nx/config/drivers.cache"
126	UTILITY_NXPRINT="nxprint"
127	[ -n "$PATH_BIN" ] && UTILITY_NXPRINT="$PATH_BIN/nxprint"
128	+ # Export configuration vars for nxprint
129	+ export ENABLE_FOOMATIC COMMAND_FOOMATIC
130	case "$1" in
131	get)
132	grep "driver\|$2\|" "$UTILITY_DRIVERS_CACHE" 2>/dev/null
133	@@ -251,7 +253,7 @@
134	# xdialog_printer_configure_driver vendor old_driver
135	xdialog_printer_configure_driver()
136	{
137	- IFS='\|' XDIALOG_LIST=( $(utility_printer getextdrvlist "$1" \| sed 's/$/\|off/g; /'"$2"'/ s/\|off/\|on/g' \| tr '\n' '\|') )
138	+ IFS='\|' XDIALOG_LIST=( $(utility_printer getextdrvlist "$1" \| sed 's,$,\|off,g; /'"$(basename $2)"'/ s,\|off,\|on,g' \| tr '\n' '\|') )
139	$DIALOG --stdout --title "$DIALOG_CAPTION" --radiolist "$DIALOG_MESSAGE" 0 0 6 "${XDIALOG_LIST[@]}"
140	}
141
142	diff -Naur freenx-0.6.0/nxcups-gethost trunk/nxcups-gethost
143	--- freenx-0.6.0/nxcups-gethost 1970-01-01 01:00:00.000000000 +0100
144	+++ trunk/nxcups-gethost 2007-05-21 12:00:39.000000000 +0200
145	@@ -0,0 +1,23 @@
146	+#!/bin/sh
147	+
148	+# Read the config file
149	+. $(PATH=$(cd $(dirname $0) && pwd):$PATH which nxloadconfig) --userconf
150	+
151	+CUPS_HOST=""
152	+
153	+# see if environment is helpful
154	+[ -n "$CUPS_SERVER" ] && CUPS_HOST=$CUPS_SERVER
155	+
156	+# no, lets see if the user has a cups config file
157	+[ -z "$CUPS_HOST" -a -f "$HOME/.cups/client.conf" ] && CUPS_HOST=$(grep "^ServerName " "$HOME/.cups/client.conf" \| sed 's/^ServerName //g; s/#.*//g')
158	+
159	+# not even close, so lets use the kdeprintrcs configuration key
160	+[ -z "$CUPS_HOST" ] && CUPS_HOST=$(grep "^Host=" "$KDE_PRINTRC" \| cut -d'=' -f2)
161	+
162	+# Hm, perhaps there is a global cupsd running on this host
163	+[ -z "$CUPS_HOST" -a -S "$CUPS_DEFAULT_SOCK" ] && CUPS_HOST="$CUPS_DEFAULT_SOCK"
164	+
165	+# no, no, no - so we fallback to localhost
166	+[ -z "$CUPS_HOST" ] && CUPS_HOST="127.0.0.1"
167	+
168	+echo "$CUPS_HOST"
169	diff -Naur freenx-0.6.0/nxloadconfig trunk/nxloadconfig
170	--- freenx-0.6.0/nxloadconfig 2007-01-23 04:22:50.000000000 +0100
171	+++ trunk/nxloadconfig 2007-05-21 12:00:39.000000000 +0200
172	@@ -5,7 +5,7 @@
173	#
174	# License: GPL, version 2
175	#
176	-# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
177	+# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
178	#
179	# ========================================================================
180
181	@@ -52,7 +52,7 @@
182	# DO NOT TOUCH unless you REALLY know what you are doing
183	#########################################################################
184
185	-NX_VERSION=1.5.0-60
186	+NX_VERSION=1.5.0-61-SVN
187	NX_LICENSE="OS (GPL)"
188
189	# Where can different nx components be found
190	@@ -143,7 +143,18 @@
191	ARTSD_BIN_PRELOAD="artsdsp"
192
193	ENABLE_KDE_CUPS="0"
194	+ENABLE_KDE_CUPS_DYNAMIC="0"
195	KDE_PRINTRC="" # Calculated
196	+
197	+ENABLE_CUPS_SERVER_EXPORT="1"
198	+ENABLE_CUPS_SEAMLESS="0"
199	+CUPS_SEAMLESS_DELAY="10"
200	+ENABLE_FOOMATIC="1"
201	+COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
202	+
203	+CUPS_BACKEND="/usr/lib/cups/backend"
204	+CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
205	+CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
206	CUPS_ETC="/etc/cups/"
207
208	# Path directives
209	@@ -271,7 +282,8 @@
210	fi
211
212	[ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
213	-[ -z "$KDE_PRINTRC" -a -z "$KDEHOME" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
214	+[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
215	+[ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
216
217	#########################################################################
218	# Support for --check
219	@@ -436,6 +448,17 @@
220	ERROR="yes" && echo "Error: Invalid value \"ENABLE_KDE_CUPS=$ENABLE_KDE_CUPS\""
221	[ "$ENABLE_KDE_CUPS" = "1" -a ! -e "$KDE_PRINTRC" ] && \
222	ERROR="yes" && echo "Error: Invalid value \"KDE_PRINTRC=$KDE_PRINTRC\""
223	+
224	+
225	+ [ "$ENABLE_FOOMATIC" = "1" ] && ! which "$COMMAND_FOOMATIC" >/dev/null 2>&1 && \
226	+ WARNING="yes" && echo "Warning: Invalid value \"COMMAND_FOOMATIC=$COMMAND_FOOMATIC\"" \
227	+ && echo " Users will not be able to use foomatic."
228	+ [ ! -x "$CUPS_IPP_BACKEND" ] && \
229	+ WARNING="yes" && echo "Warning: \"$CUPS_IPP_BACKEND\" is not executable." \
230	+ && echo " Users will not be able to enable printing."
231	+ [ ! -x "$CUPS_BACKEND/smb" ] && \
232	+ WARNING="yes" && echo "Warning: \"$CUPS_BACKEND/smb\" is not executable." \
233	+ && echo " Users will not be able to enable printing."
234	[ ! -e "$CUPS_ETC/mime.types" -o ! -e "$CUPS_ETC/mime.convs" ] && \
235	WARNING="yes" && echo "Warning: Invalid value \"CUPS_ETC=$CUPS_ETC\"" \
236	&& echo " Users will not be able to enable printing."
237	@@ -483,6 +506,9 @@
238	! which "$COMMAND_CUPSD" >/dev/null 2>&1 && \
239	WARNING="yes" && echo "Warning: Invalid value \"COMMAND_CUPSD=$COMMAND_CUPSD\"" \
240	&& echo " Users will not be able to enable printing."
241	+ [ -z "$(strings $COMMAND_CUPSD \| egrep 'CUPS\/1.2')" ] && \
242	+ WARNING="yes" && echo "Warning: Invalid cupsd version of \"$COMMAND_CUPSD\". Need version 1.2." \
243	+ && echo " Users will not be able to enable printing."
244	! which "$COMMAND_MD5SUM" >/dev/null 2>&1 && \
245	ERROR="yes" && echo "Error: Invalid value \"COMMAND_MD5SUM=$COMMAND_MD5SUM\""
246
247	diff -Naur freenx-0.6.0/nxnode trunk/nxnode
248	--- freenx-0.6.0/nxnode 2007-01-23 04:22:50.000000000 +0100
249	+++ trunk/nxnode 2007-05-21 12:00:39.000000000 +0200
250	@@ -13,7 +13,7 @@
251	#
252	# License: GNU GPL, version 2
253	#
254	-# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
255	+# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
256	#
257	# 21.06.2004: - Full reconnection support
258
259	@@ -252,6 +252,9 @@
260	#
261
262	NODE_APPLICATION=$(node_find_application "$type")
263	+
264	+ # For rdesktop/VNC, there is no application to start
265	+ [ -n "$NODE_APPLICATION" ] \|\| return
266
267	#
268	# Check if we want to use a mediahelper
269	@@ -283,6 +286,8 @@
270	fi
271	fi
272
273	+ [ "$cups" = "1" -a "$ENABLE_CUPS_SERVER_EXPORT" = "1" ] && export CUPS_SERVER="$USER_FAKE_HOME/.nx/C-$sess_id/cups/cups.sock"
274	+
275	#
276	# Do we need to PRELOAD any libraries?
277	#
278	@@ -407,7 +412,11 @@
279	# backingstore
280
281	B=""
282	- [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ] && B="-bs $backingstore"
283	+ if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ]
284	+ then
285	+ [ "$backingstore" != 1 ] && B="-bs $backingstore"
286	+ [ "$backingstore" = 1 ] && B="+bs"
287	+ fi
288
289	# geometry
290
291	@@ -495,7 +504,8 @@
292	NODE_FAILED=""
293	if [ $NODE_AGENT_EXIT_STATUS -ne 0 ]
294	then
295	- echo "NX> 1004 Error: NX Agent exited with exit status 1."
296	+ echo "NX> 1004 Error: NX Agent exited with exit status 1. To troubleshoot set SESSION_LOG_CLEAN=0 in node.conf and investigate \"$USER_FAKE_HOME/.nx/F-C-$sess_id/session\". You might also want to try: ssh -X myserver; $PATH_BIN/nxnode --agent to test the basic functionality. Session log follows:"
297	+ cat "$USER_FAKE_HOME/.nx/C-$sess_id/session" 1>&2
298	NODE_FAILED="failed"
299	fi
300	echo "NX> 1006 Session status: closed"
301	@@ -551,12 +561,13 @@
302	let NODE_CUPSD_PORT=$display+9000 # offset 9000 for userspace cupsd's
303	export NODE_CUPSD_PORT
304
305	+ export NODE_CUPSD_SOCKET="$USER_FAKE_HOME/.nx/C-$sess_id/cups/cups.sock"
306	+
307	mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/pids/"
308	[ -e "$USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd" ] && return
309	touch "$USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd"
310
311	- mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/tmp" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/certs" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/ppd"
312	- ln -sf spool/certs "$USER_FAKE_HOME/.nx/C-$sess_id/cups/certs"
313	+ mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/tmp" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/certs" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/ppd" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cache"
314
315	cat <<EOF > $USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf
316	AccessLog /dev/null
317	@@ -566,15 +577,27 @@
318	TempDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/tmp
319	RequestRoot $USER_FAKE_HOME/.nx/C-$sess_id/cups/spool
320	ServerRoot $USER_FAKE_HOME/.nx/C-$sess_id/cups/
321	-Port $NODE_CUPSD_PORT
322	+StateDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/
323	+CacheDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/cache
324	+
325	+Listen $NODE_CUPSD_SOCKET
326	Browsing Off
327	ServerName localhost
328	+PidFile $USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd
329
330	<Location />
331	Order Deny,Allow
332	Deny From All
333	Allow from 127.0.0.1
334	</Location>
335	+
336	+# Allow everything for anonymous, because we are protected through UNIX socket
337	+<Policy default>
338	+ <Limit All>
339	+ AuthType None
340	+ Order deny,allow
341	+ </Limit>
342	+</Policy>
343	EOF
344
345	touch "$USER_FAKE_HOME/.nx/C-$sess_id/cups/printers.conf" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/classes.conf"
346	@@ -583,20 +606,19 @@
347	cp -af "$CUPS_ETC"/mime.* "$USER_FAKE_HOME/.nx/C-$sess_id/cups/"
348
349	# start cupsd
350	- $COMMAND_CUPSD -f -c "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf" &>/dev/null </dev/null &
351	- NODE_CUPSD_PID=$!
352	- sleep 3
353	- echo $NODE_CUPSD_PID >"$USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd"
354	+ $COMMAND_CUPSD -c "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf" &>/dev/null </dev/null
355
356	# setup KDE
357	if [ "$ENABLE_KDE_CUPS" = "1" -a -e "$KDE_PRINTRC" ]
358	then
359	- if egrep -q "^Port=" "$KDE_PRINTRC"
360	+ if egrep -q "^Host=" "$KDE_PRINTRC"
361	then
362	- perl -pi -e 's/^Port=.*/Port='"$NODE_CUPSD_PORT"'/g' "$KDE_PRINTRC"
363	+ [ "$ENABLE_KDE_CUPS_DYNAMIC" = "1" ] && perl -pi -e 's,^Host=.*,Host[\$ie]=\$\('"$PATH_BIN/nxcups-gethost"'),g' "$KDE_PRINTRC"
364	+ [ "$ENABLE_KDE_CUPS_DYNAMIC" != "1" ] && perl -pi -e 's,^Host=.*,Host='"$NODE_CUPSD_SOCKET"',g' "$KDE_PRINTRC"
365	else
366	echo "[CUPS]" >> "$KDE_PRINTRC"
367	- echo "Port=$NODE_CUPSD_PORT" >> "$KDE_PRINTRC"
368	+ [ "$ENABLE_KDE_CUPS_DYNAMIC" = "1" ] && echo "Host[\$ie]=\$($PATH_BIN/nxcups-gethost)" >> "$KDE_PRINTRC"
369	+ [ "$ENABLE_KDE_CUPS_DYNAMIC" != "1" ] && echo "Host=$NODE_CUPSD_SOCKET" >> "$KDE_PRINTRC"
370	fi
371	fi
372	}
373	@@ -614,10 +636,10 @@
374	[ -n "$NODE_CUPSD_PID" ] && kill -0 $NODE_CUPSD_PID && kill -HUP $NODE_CUPSD_PID
375	}
376
377	-node_cupsd_get_port()
378	+node_cupsd_get_socket()
379	{
380	node_cupsd_setup
381	- echo $NODE_CUPSD_PORT
382	+ echo $NODE_CUPSD_SOCKET
383	}
384
385	node_umount_smb()
386	@@ -670,6 +692,16 @@
387	fi
388
389	#
390	+ # Catch NXAGENT SMB Port (sometimes the port differs from what we got from nxserver)
391	+ #
392	+
393	+ if stringinstring "Info: Listening for SMB connections on port" "$line"
394	+ then
395	+ SMBMOUNT_PORT=$(echo $line \| cut -d"'" -f2)
396	+ echo "$SMBMOUNT_PORT" >"$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mport"
397	+ fi
398	+
399	+ #
400	# Session messages
401	#
402
403	@@ -947,7 +979,7 @@
404	sync=$(getparam sync)
405	samba=$(getparam samba)
406	cups=$(getparam cups)
407	- agent_server=$(getparam agent_server)
408	+ agent_server=$(getparam agent_server \| sed 's/%3A/:/g')
409	agent_user=$(getparam agent_user)
410	agent_password=$(getparam agent_password)
411	agent_domain=$(getparam agent_domain)
412	@@ -969,13 +1001,17 @@
413	rootless=0
414	# Its still the clients decision
415	[ "$ENABLE_ROOTLESS_MODE" = "1" ] && rootless=$(getparam rootless)
416	+
417	+ # Rootless fix from 2x nxserver 1.5.0
418	+ realtype=$type
419	+ [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop"
420
421	# FreeNX specific variables
422	clientproto=$(getparam clientproto)
423	status=$(getparam status)
424	host=$(getparam host)
425
426	- fullscreen=""
427	+ fullscreen=$(getparam fullscreen)
428	[ "$geometry" = "fullscreen" ] && fullscreen="1"
429
430	[ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
431	@@ -1016,7 +1052,8 @@
432
433	proxy_cookie=$(echo $[$RANDOM*$RANDOM] \| $COMMAND_MD5SUM \| cut -d" " -f1)
434
435	- if [ "$clientproto" = "1.5.0" ]
436	+ # all newer clients support fake cookie authentication
437	+ if [ "$clientproto" != "1.4.0" ]
438	then
439	# enable fake cookie authentication
440	cookie=$proxy_cookie
441	@@ -1039,7 +1076,7 @@
442	umask 0077
443
444	cat << EOF > $USER_FAKE_HOME/.nx/C-$sess_id/options
445	-${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$type,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}:$display
446	+${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}:$display
447	EOF
448	umask $OLD_UMASK
449	#samba=$samba,
450	@@ -1150,16 +1187,24 @@
451	share=$(getparam share)
452	computername=$(getparam computername)
453	dir=$(getparam dir \| sed 's\|$(SHARES)\|MyShares\|g')
454	- rdir=$(getparam dir \| sed 's\|$(SHARES)/\|\|g')
455	+ # rdir=$(getparam dir \| sed 's\|$(SHARES)/\|\|g')
456	display=$(cd $USER_FAKE_HOME/.nx/; echo C-$SERVER_NAME-*-$sessionid \| rev\|cut -d"-" -f2\| rev)
457	mkdir -p "$HOME/$dir"
458	- error=$(PASSWD="$password" "$COMMAND_SMBMOUNT" "//$computername/$rdir" "$HOME/$dir" -o username="$username,ip=127.0.0.1,port=$port" 2>&1)
459	+ # wait up to 30 sec until nxagent has opened the listener port for samba connections
460	+ for (( i=30; $i; --i ))
461	+ do
462	+ [ -f "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mport" ] && break
463	+ sleep 1
464	+ done
465	+ # sometimes the samba port we get from nxserver is not the right one, so let's get it from nxagent
466	+ port=$(cat "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mport")
467	+ error=$(PASSWD="$password" "$COMMAND_SMBMOUNT" "//$computername/$share" "$HOME/$dir" -o username="$username,ip=127.0.0.1,port=$port" 2>&1)
468	if [ $? -eq 0 ]
469	then
470	- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display &
471	+ $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$share' mounted on: '$HOME/$dir'" -noautokill -display :$display &
472	echo "$HOME/$dir" >> "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mpoint"
473	else
474	- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' failed to mount: $error" -noautokill -display :$display &
475	+ $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$share' failed to mount: $error" -noautokill -display :$display &
476	fi
477	}
478
479	@@ -1180,25 +1225,53 @@
480	sess_id="$SERVER_NAME-$display-$sessionid"
481
482	# this will also setup the userspace cupsd
483	- IPP_PORT=$(node_cupsd_get_port)
484	- export IPP_PORT
485	+ export CUPS_SERVER=$(node_cupsd_get_socket)
486
487	if [ "$type" = "smb" ]
488	then
489	- DEVICE_URI="smb://$username:$password@localhost:$port/$share"
490	+ DEVICE_URI="smb://$username:$password@127.0.0.1:$port/$share"
491	NAME="$share"
492	+ ENABLE_CUPS_SEAMLESS="0"
493	else
494	- DEVICE_URI="ipp://$username:$password@localhost:$port/printers/$printer"
495	+ DEVICE_URI="nxipp://$username:$password@127.0.0.1:$port/printers/$printer"
496	NAME="$printer"
497	fi
498	-
499	- MODEL=$($PATH_BIN/nxclient -printer "$NAME" -noautokill -display :$display)
500	- [ -z "$MODEL" -o "$MODEL" = "cancel: aborted" ] && return
501	+ export PATH_BIN
502	+
503	+ if [ "$ENABLE_CUPS_SEAMLESS" != "1" ]
504	+ then
505	+ MODEL=$($PATH_BIN/nxclient -printer "$NAME" -noautokill -display :$display)
506	+ [ -z "$MODEL" -o "$MODEL" = "cancel: aborted" ] && return
507	+ else
508	+ sleep $CUPS_SEAMLESS_DELAY
509	+ MODEL="download_cached"
510	+ fi
511
512	PUBLIC="-u allow:$USER"
513	[ "$public" == "1" ] && PUBLIC=""
514	- lpadmin -p "$NAME" -E -v "$DEVICE_URI" -m "$MODEL" $PUBLIC
515	- [ "$defaultPrinter" = "1" ] && lpadmin -d "$NAME"
516	+
517	+ if [ "$MODEL" = "download_new" -o "$MODEL" = "download_cached" ]
518	+ then
519	+ mkdir -p "$USER_FAKE_HOME/.nx/config/ppd/"
520	+ if [ "$MODEL" = "download_new" -o ! -r "$USER_FAKE_HOME/.nx/config/ppd/$printer.ppd" ]
521	+ then
522	+ curl --digest -o "$USER_FAKE_HOME/.nx/config/ppd/$printer.ppd" "http://$username:$password@127.0.0.1:$port/ppd/${printer}_nxdl.ppd" >>$USER_FAKE_HOME/.nx/C-$sess_id/cups/curl.log 2>&1
523	+ RC=$?
524	+ [ $RC -eq 0 -a "$ENABLE_CUPS_SEAMLESS" != "1" ] && $PATH_BIN/nxclient --message "Download successful." -noautokill -display :$display
525	+ [ $RC -ne 0 -a "$ENABLE_CUPS_SEAMLESS" != "1" ] && $PATH_BIN/nxclient --message "Download failed. Log is: $USER_FAKE_HOME/.nx/C-$sess_id/cups/curl.log" -noautokill -display :$display
526	+ fi
527	+ MODEL="$USER_FAKE_HOME/.nx/config/ppd/$printer.ppd"
528	+ fi
529	+
530	+ if [ ! -r "$MODEL" ]
531	+ then
532	+ # Foomatic and co
533	+ /usr/sbin/lpadmin -p "$NAME" -E -v "$DEVICE_URI" -m "$MODEL" $PUBLIC
534	+ else
535	+ /usr/sbin/lpadmin -p "$NAME" -E -v "$DEVICE_URI" -P "$MODEL" $PUBLIC
536	+ fi
537	+
538	+ [ "$defaultPrinter" = "1" ] && /usr/sbin/lpadmin -d "$NAME"
539	}
540
541	nxnode_func()
542	diff -Naur freenx-0.6.0/nxprint trunk/nxprint
543	--- freenx-0.6.0/nxprint 2007-01-23 04:22:50.000000000 +0100
544	+++ trunk/nxprint 2007-05-21 12:00:39.000000000 +0200
545	@@ -6,12 +6,9 @@
546	#
547	# License: GPL, version 2
548	#
549	-# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
550	+# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
551	#
552
553	-# disable foomatic by default
554	-FOOMATIC="no"
555	-
556	HELP="no"
557	DRIVERS="no"
558	PRINTERS="no"
559	@@ -35,7 +32,7 @@
560	echo ""
561	echo "Syntax: nxprint --help"
562	echo " nxprint --drivers"
563	- echo " nxprint --printes"
564	+ echo " nxprint --printers"
565	echo
566	echo " --drivers prints a list of available CUPS drivers"
567	echo " --printers prints a list of available CUPS printers"
568	@@ -45,21 +42,23 @@
569	if [ "$DRIVERS" = "yes" ]
570	then
571	echo "driver\|Raw\|Raw Queue\|raw"
572	+ echo "driver\|Download (CUPS)\|Download from CUPS server (cached)\|download_cached"
573	+ echo "driver\|Download (CUPS)\|Download from CUPS server (redownload)\|download_new"
574	{
575	- cd /usr/share/cups/model
576	- awk -F '"' '/*Manufacturer:/ { a[FILENAME]=$2 }
577	- /*NickName:/ { b[FILENAME]=$2 }
578	+ cd /usr/share/ppd/
579	+ awk -F '"' '/\*Manufacturer:/ { a[FILENAME]=$2 }
580	+ /\*NickName:/ { b[FILENAME]=$2 }
581	END {
582	for (i in a)
583	- print "driver\|" (a[i]=="ESP"?substr(b[i],0,index(b[i]," ")-1):a[i]) "\|"b[i]"\|"i
584	- }' *.ppd
585	- } \| sort
586	+ print "driver\|" (a[i]=="ESP"?substr(b[i],0,index(b[i]," ")-1):a[i]) "\|"b[i]"\|"i"\|en"
587	+ }' $(find -name "*.ppd")
588
589	- if [ $FOOMATIC="yes" ]
590	+ if [ "$ENABLE_FOOMATIC" = "1" ]
591	then
592	- # TODO: Add support for foomatic-style ppds
593	- :
594	+ [ -z "$COMMAND_FOOMATIC" ] && COMMAND_FOOMATIC="foomatic-ppdfile"
595	+ $COMMAND_FOOMATIC list \| awk -F'"' '{ A=""; if ($4 == "HP") { B=substr($6,index($6," ")+1); A=" "substr(B,0,index(B," ")); } printf("driver\|%s%s\|%s\|%s\|%s\n",$4,A,$6,$2,substr($3,2)) } '
596	fi
597	+ } \| sort
598	fi
599
600	if [ "$PRINTERS" = "yes" ]
601	diff -Naur freenx-0.6.0/nxserver trunk/nxserver
602	--- freenx-0.6.0/nxserver 2007-01-23 04:22:50.000000000 +0100
603	+++ trunk/nxserver 2007-05-21 12:00:39.000000000 +0200
604	@@ -11,7 +11,7 @@
605	#
606	# License: GNU GPL, version 2
607	#
608	-# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
609	+# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
610	#
611
612	# Read the config file
613	@@ -798,6 +798,7 @@
614
615	server_nxnode_echo()
616	{
617	+ log 6 "server_nxnode_echo: $@"
618	[ "$SERVER_CHANNEL" = "1" ] && echo "$@"
619	[ "$SERVER_CHANNEL" = "2" ] && echo "$@" >&2
620	}
621	@@ -839,18 +840,30 @@
622	running)
623	[ "$KILL_WAIT_PID" = "1" ] && kill $SERVER_WAIT_PID
624	KILL_WAIT_PID=0
625	+ log 6 session_status $uniqueid "Running"
626	session_status $uniqueid "Running"
627	[ "$SERVER_CHANNEL" = "1" ] && SERVER_CHANNEL=2
628	;;
629	closed)
630	+ log 6 session_close $uniqueid
631	session_close $uniqueid
632	;;
633	suspended)
634	[ "$KILL_WAIT_PID" = "1" ] && kill $SERVER_WAIT_PID
635	KILL_WAIT_PID=0
636	+ log 6 session_suspend $uniqueid
637	session_suspend $uniqueid
638	;;
639	+ suspending)
640	+ log 6 session_status $uniqueid "Suspending"
641	+ session_status $uniqueid "Suspending"
642	+ # we need to stop sending to client as it will have already
643	+ # closed his side of the channel and this will lead to not
644	+ # closed sessions.
645	+ SERVER_CHANNEL=0
646	+ ;;
647	terminating)
648	+ log 6 session_status $uniqueid "Terminating"
649	session_status $uniqueid "Terminating"
650	# we need to stop sending to client as it will have already
651	# closed his side of the channel and this will lead to not
652	@@ -1340,6 +1353,7 @@
653	PARAMS=$SERVER_PARAMS
654	# TODO: This redirecion is crap here.
655	server_nxnode_start --addprinter "$USER" "$PARAMS" >/dev/null 2>&1 \| log_error >/dev/null
656	+ echo_x "NX> 719 CUPS printer: running"
657	;;
658	*)
659	# disabled for 1.4.0-5 snapshot client
660	@@ -1630,9 +1644,9 @@
661	else
662	CMD_PARAMS=$(cmd_parse_3_params "$2")
663	[ -z "$CMD_PARAMS" ] && exit 1
664	+ shift
665	fi
666	shift
667	- shift
668	for i in $CMD_PARAMS;
669	do
670	CMDLINE=$(session_get_cmdline $i)
671	diff -Naur freenx-0.6.0/nxserver-helper/.svn/dir-props trunk/nxserver-helper/.svn/dir-props
672	--- freenx-0.6.0/nxserver-helper/.svn/dir-props 1970-01-01 01:00:00.000000000 +0100
673	+++ trunk/nxserver-helper/.svn/dir-props 2007-05-21 12:00:38.000000000 +0200
674	@@ -0,0 +1,6 @@
675	+K 10
676	+svn:ignore
677	+V 16
678	+nxserver-helper
679	+
680	+END
681	diff -Naur freenx-0.6.0/nxserver-helper/.svn/dir-wcprops trunk/nxserver-helper/.svn/dir-wcprops
682	--- freenx-0.6.0/nxserver-helper/.svn/dir-wcprops 1970-01-01 01:00:00.000000000 +0100
683	+++ trunk/nxserver-helper/.svn/dir-wcprops 2007-05-21 12:00:38.000000000 +0200
684	@@ -0,0 +1,5 @@
685	+K 25
686	+svn:wc:ra_dav:version-url
687	+V 70
688	+/svnroot/repos/freenx/!svn/ver/225/freenx-server/trunk/nxserver-helper
689	+END
690	diff -Naur freenx-0.6.0/nxserver-helper/.svn/entries trunk/nxserver-helper/.svn/entries
691	--- freenx-0.6.0/nxserver-helper/.svn/entries 2007-01-23 04:22:49.000000000 +0100
692	+++ trunk/nxserver-helper/.svn/entries 2007-05-21 12:00:38.000000000 +0200
693	@@ -1,53 +1,33 @@
694	-8
695	-
696	-dir
697	-285
698	-svn://svn.berlios.de/freenx/freenx-server/tags/FreeNX-0.6.0/nxserver-helper
699	-svn://svn.berlios.de/freenx
700	-
701	-
702	-
703	-2006-07-04T22:23:53.879011Z
704	-225
705	-fabianx
706	-has-props
707	-
708	-svn:special svn:externals svn:needs-lock
709	-
710	-
711	-
712	-
713	-
714	-
715	-
716	-
717	-
718	-
719	-
720	-80778403-ebee-0310-8e0a-e86a689f3fff
721	-
722	-nxserver-helper.c
723	-file
724	-
725	-
726	-
727	-
728	-2007-01-23T03:22:49.000000Z
729	-b93cec4f3739b9d4b5abb769dd0e9f2b
730	-2006-07-04T22:23:46.997510Z
731	-222
732	-fabianx
733	-has-props
734	-
735	-Makefile
736	-file
737	-
738	-
739	-
740	-
741	-2007-01-23T03:22:49.000000Z
742	-cd7061b91d982e6fa88b52f63d3fea70
743	-2006-07-04T15:46:40.825116Z
744	-219
745	-fabianx
746	-
747	+<?xml version="1.0" encoding="utf-8"?>
748	+<wc-entries
749	+ xmlns="svn:">
750	+<entry
751	+ committed-rev="225"
752	+ name=""
753	+ committed-date="2006-07-04T22:23:53.879011Z"
754	+ url="http://svn.berlios.de/svnroot/repos/freenx/freenx-server/trunk/nxserver-helper"
755	+ last-author="fabianx"
756	+ kind="dir"
757	+ uuid="80778403-ebee-0310-8e0a-e86a689f3fff"
758	+ repos="http://svn.berlios.de/svnroot/repos/freenx"
759	+ prop-time="2007-05-21T10:00:38.000000Z"
760	+ revision="333"/>
761	+<entry
762	+ committed-rev="222"
763	+ name="nxserver-helper.c"
764	+ text-time="2007-05-21T10:00:38.000000Z"
765	+ committed-date="2006-07-04T22:23:46.997510Z"
766	+ checksum="b93cec4f3739b9d4b5abb769dd0e9f2b"
767	+ last-author="fabianx"
768	+ kind="file"
769	+ prop-time="2007-05-21T10:00:38.000000Z"/>
770	+<entry
771	+ committed-rev="219"
772	+ name="Makefile"
773	+ text-time="2007-05-21T10:00:38.000000Z"
774	+ committed-date="2006-07-04T15:46:40.825116Z"
775	+ checksum="cd7061b91d982e6fa88b52f63d3fea70"
776	+ last-author="fabianx"
777	+ kind="file"
778	+ prop-time="2007-05-21T10:00:38.000000Z"/>
779	+</wc-entries>
780	diff -Naur freenx-0.6.0/nxserver-helper/.svn/format trunk/nxserver-helper/.svn/format
781	--- freenx-0.6.0/nxserver-helper/.svn/format 2007-01-23 04:22:49.000000000 +0100
782	+++ trunk/nxserver-helper/.svn/format 2007-05-21 12:00:38.000000000 +0200
783	@@ -1 +1 @@
784	-8
785	+4
786	diff -Naur freenx-0.6.0/nxserver-helper/.svn/props/nxserver-helper.c.svn-work trunk/nxserver-helper/.svn/props/nxserver-helper.c.svn-work
787	--- freenx-0.6.0/nxserver-helper/.svn/props/nxserver-helper.c.svn-work 1970-01-01 01:00:00.000000000 +0100
788	+++ trunk/nxserver-helper/.svn/props/nxserver-helper.c.svn-work 2007-05-21 12:00:38.000000000 +0200
789	@@ -0,0 +1,5 @@
790	+K 12
791	+svn:keywords
792	+V 2
793	+Id
794	+END
795	diff -Naur freenx-0.6.0/nxserver-helper/.svn/README.txt trunk/nxserver-helper/.svn/README.txt
796	--- freenx-0.6.0/nxserver-helper/.svn/README.txt 1970-01-01 01:00:00.000000000 +0100
797	+++ trunk/nxserver-helper/.svn/README.txt 2007-05-21 12:00:38.000000000 +0200
798	@@ -0,0 +1,2 @@
799	+This is a Subversion working copy administrative directory.
800	+Visit http://subversion.tigris.org/ for more information.
801	diff -Naur freenx-0.6.0/nxserver-helper/.svn/wcprops/Makefile.svn-work trunk/nxserver-helper/.svn/wcprops/Makefile.svn-work
802	--- freenx-0.6.0/nxserver-helper/.svn/wcprops/Makefile.svn-work 1970-01-01 01:00:00.000000000 +0100
803	+++ trunk/nxserver-helper/.svn/wcprops/Makefile.svn-work 2007-05-21 12:00:38.000000000 +0200
804	@@ -0,0 +1,5 @@
805	+K 25
806	+svn:wc:ra_dav:version-url
807	+V 79
808	+/svnroot/repos/freenx/!svn/ver/219/freenx-server/trunk/nxserver-helper/Makefile
809	+END
810	diff -Naur freenx-0.6.0/nxserver-helper/.svn/wcprops/nxserver-helper.c.svn-work trunk/nxserver-helper/.svn/wcprops/nxserver-helper.c.svn-work
811	--- freenx-0.6.0/nxserver-helper/.svn/wcprops/nxserver-helper.c.svn-work 1970-01-01 01:00:00.000000000 +0100
812	+++ trunk/nxserver-helper/.svn/wcprops/nxserver-helper.c.svn-work 2007-05-21 12:00:38.000000000 +0200
813	@@ -0,0 +1,5 @@
814	+K 25
815	+svn:wc:ra_dav:version-url
816	+V 88
817	+/svnroot/repos/freenx/!svn/ver/222/freenx-server/trunk/nxserver-helper/nxserver-helper.c
818	+END
819	diff -Naur freenx-0.6.0/nxsetup trunk/nxsetup
820	--- freenx-0.6.0/nxsetup 2007-01-23 04:22:50.000000000 +0100
821	+++ trunk/nxsetup 2007-05-21 12:00:39.000000000 +0200
822	@@ -5,7 +5,7 @@
823	#
824	# License: GNU GPL, version 2
825	#
826	-# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
827	+# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
828	#
829
830	HELP="no"
831	@@ -193,6 +193,9 @@
832
833
834	fi
835	+
836	+ # the nx user account might be locked, so unlock it.
837	+ passwd -u nx
838	}
839
840	install_nx()
841	@@ -326,7 +329,16 @@
842	chown -R nx:root $NX_ETC_DIR
843	chown -R nx:root $NX_HOME_DIR
844	chown nx:root "$NX_LOGFILE"
845	+
846	echo "done"
847	+
848	+ if [ -d "$CUPS_BACKEND" ]
849	+ then
850	+ echo -n "Setting up cups nxipp backend ..."
851	+ cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND"
852	+ chmod 755 "$CUPS_IPP_BACKEND"
853	+ echo "done"
854	+ fi
855	}
856
857	test_nx()
858	diff -Naur freenx-0.6.0/.svn/dir-props trunk/.svn/dir-props
859	--- freenx-0.6.0/.svn/dir-props 1970-01-01 01:00:00.000000000 +0100
860	+++ trunk/.svn/dir-props 2007-05-21 12:00:39.000000000 +0200
861	@@ -0,0 +1,5 @@
862	+K 9
863	+svk:merge
864	+V 88
865	+dfed1786-65ff-0310-a727-a632acf074e8:/local/freenx/freenx-server/branches/FreeNX-0.4:184
866	+END
867	diff -Naur freenx-0.6.0/.svn/dir-wcprops trunk/.svn/dir-wcprops
868	--- freenx-0.6.0/.svn/dir-wcprops 1970-01-01 01:00:00.000000000 +0100
869	+++ trunk/.svn/dir-wcprops 2007-05-21 12:00:39.000000000 +0200
870	@@ -0,0 +1,5 @@
871	+K 25
872	+svn:wc:ra_dav:version-url
873	+V 54
874	+/svnroot/repos/freenx/!svn/ver/333/freenx-server/trunk
875	+END
876	diff -Naur freenx-0.6.0/.svn/entries trunk/.svn/entries
877	--- freenx-0.6.0/.svn/entries 2007-01-23 04:22:50.000000000 +0100
878	+++ trunk/.svn/entries 2007-05-21 12:00:39.000000000 +0200
879	@@ -1,234 +1,171 @@
880	-8
881	-
882	-dir
883	-285
884	-svn://svn.berlios.de/freenx/freenx-server/tags/FreeNX-0.6.0
885	-svn://svn.berlios.de/freenx
886	-
887	-
888	-
889	-2007-01-23T03:11:18.497161Z
890	-285
891	-fabianx
892	-has-props
893	-
894	-svn:special svn:externals svn:needs-lock
895	-
896	-
897	-
898	-
899	-
900	-
901	-
902	-
903	-
904	-
905	-
906	-80778403-ebee-0310-8e0a-e86a689f3fff
907	-
908	-nxclient
909	-file
910	-
911	-
912	-
913	-
914	-2007-01-23T03:22:49.000000Z
915	-ae295c939bbef09987430c3d98b0db23
916	-2007-01-23T03:11:18.497161Z
917	-285
918	-fabianx
919	-has-props
920	-
921	-AUTHORS
922	-file
923	-
924	-
925	-
926	-
927	-2007-01-23T03:22:49.000000Z
928	-ca2f01e8b83619bba925899d9c51a4c0
929	-2005-08-02T17:49:08.143420Z
930	-96
931	-fabianx
932	-
933	-ChangeLog
934	-file
935	-
936	-
937	-
938	-
939	-2007-01-23T03:22:49.000000Z
940	-22ca950d02f268938021beeec96766cd
941	-2007-01-23T03:11:18.497161Z
942	-285
943	-fabianx
944	-
945	-nxkeygen
946	-file
947	-
948	-
949	-
950	-
951	-2007-01-23T03:22:49.000000Z
952	-7425919c28a4b2c12f265abb038de44d
953	-2006-07-04T23:38:34.223782Z
954	-227
955	-fabianx
956	-has-props
957	-
958	-node.conf.sample
959	-file
960	-
961	-
962	-
963	-
964	-2007-01-23T03:22:50.000000Z
965	-deb96e5e83f22c26a31bfbeee0efad00
966	-2006-07-04T23:38:10.837293Z
967	-226
968	-fabianx
969	-has-props
970	-
971	-nxserver-helper
972	-dir
973	-
974	-nxnode
975	-file
976	-
977	-
978	-
979	-
980	-2007-01-23T03:22:50.000000Z
981	-847cb7a262f1f5ffaf2da9f05776e05f
982	-2006-07-05T18:09:17.792384Z
983	-237
984	-fabianx
985	-has-props
986	-
987	-CONTRIB
988	-file
989	-
990	-
991	-
992	-
993	-2007-01-23T03:22:50.000000Z
994	-3d8ec3ea8c6056b40a40777b586c9065
995	-2005-08-02T17:49:08.143420Z
996	-96
997	-fabianx
998	-
999	-gentoo-nomachine.diff
1000	-file
1001	-
1002	-
1003	-
1004	-
1005	-2007-01-23T03:22:50.000000Z
1006	-0f800aa685289fb60743a7c6227b9208
1007	-2006-03-11T11:51:05.207097Z
1008	-201
1009	-fabianx
1010	-
1011	-nxnode-login
1012	-file
1013	-
1014	-
1015	-
1016	-
1017	-2007-01-23T03:22:50.000000Z
1018	-381fca3c72099c5144647dc5aff9bb60
1019	-2006-07-05T02:03:45.602868Z
1020	-231
1021	-fabianx
1022	-has-props
1023	-
1024	-nxprint
1025	-file
1026	-
1027	-
1028	-
1029	-
1030	-2007-01-23T03:22:50.000000Z
1031	-2a3cba4849e8c8ad88c54857ba2d324c
1032	-2006-07-04T22:23:46.997510Z
1033	-222
1034	-fabianx
1035	-has-props
1036	-
1037	-nxcheckload.sample
1038	-file
1039	-
1040	-
1041	-
1042	-
1043	-2007-01-23T03:22:50.000000Z
1044	-b742cb8ed16d1841097d8c73c75e6647
1045	-2006-07-09T10:40:00.797581Z
1046	-239
1047	-fabianx
1048	-has-props
1049	-
1050	-nxsetup
1051	-file
1052	-
1053	-
1054	-
1055	-
1056	-2007-01-23T03:22:50.000000Z
1057	-4626c0664783246c7ba9ffa845058590
1058	-2006-07-04T23:38:53.876009Z
1059	-228
1060	-fabianx
1061	-has-props
1062	-
1063	-INSTALL
1064	-file
1065	-
1066	-
1067	-
1068	-
1069	-2007-01-23T03:22:50.000000Z
1070	-a91ae8009b55a0efa93b00c8a73d7302
1071	-2006-07-04T22:23:46.997510Z
1072	-222
1073	-fabianx
1074	-has-props
1075	-
1076	-COPYING
1077	-file
1078	-
1079	-
1080	-
1081	-
1082	-2007-01-23T03:22:50.000000Z
1083	-393a5ca445f6965873eca0259a17f833
1084	-2005-08-02T17:49:08.143420Z
1085	-96
1086	-fabianx
1087	-
1088	-nxloadconfig
1089	-file
1090	-
1091	-
1092	-
1093	-
1094	-2007-01-23T03:22:50.000000Z
1095	-cc3882a56aba4b09b955b9f92e034668
1096	-2007-01-23T02:15:28.869663Z
1097	-283
1098	-fabianx
1099	-has-props
1100	-
1101	-nxserver
1102	-file
1103	-
1104	-
1105	-
1106	-
1107	-2007-01-23T03:22:50.000000Z
1108	-c6ad9feba5cb2fb0cc7f2a3b37e52461
1109	-2006-07-09T14:40:18.317088Z
1110	-241
1111	-fabianx
1112	-has-props
1113	-
1114	+<?xml version="1.0" encoding="utf-8"?>
1115	+<wc-entries
1116	+ xmlns="svn:">
1117	+<entry
1118	+ committed-rev="333"
1119	+ name=""
1120	+ committed-date="2007-04-20T17:59:07.774037Z"
1121	+ url="http://svn.berlios.de/svnroot/repos/freenx/freenx-server/trunk"
1122	+ last-author="fabianx"
1123	+ kind="dir"
1124	+ uuid="80778403-ebee-0310-8e0a-e86a689f3fff"
1125	+ repos="http://svn.berlios.de/svnroot/repos/freenx"
1126	+ prop-time="2007-05-21T10:00:39.000000Z"
1127	+ revision="333"/>
1128	+<entry
1129	+ committed-rev="289"
1130	+ name="nxclient"
1131	+ text-time="2007-05-21T10:00:39.000000Z"
1132	+ committed-date="2007-01-24T15:51:37.382480Z"
1133	+ checksum="7a885869af223e3085a87e67292e484f"
1134	+ last-author="fabianx"
1135	+ kind="file"
1136	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1137	+<entry
1138	+ committed-rev="96"
1139	+ name="AUTHORS"
1140	+ text-time="2007-05-21T10:00:39.000000Z"
1141	+ committed-date="2005-08-02T17:49:08.143420Z"
1142	+ checksum="ca2f01e8b83619bba925899d9c51a4c0"
1143	+ last-author="fabianx"
1144	+ kind="file"
1145	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1146	+<entry
1147	+ committed-rev="333"
1148	+ name="ChangeLog"
1149	+ text-time="2007-05-21T10:00:39.000000Z"
1150	+ committed-date="2007-04-20T17:59:07.774037Z"
1151	+ checksum="439b17ffb89bd795b6cb73d109527541"
1152	+ last-author="fabianx"
1153	+ kind="file"
1154	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1155	+<entry
1156	+ committed-rev="227"
1157	+ name="nxkeygen"
1158	+ text-time="2007-05-21T10:00:39.000000Z"
1159	+ committed-date="2006-07-04T23:38:34.223782Z"
1160	+ checksum="7425919c28a4b2c12f265abb038de44d"
1161	+ last-author="fabianx"
1162	+ kind="file"
1163	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1164	+<entry
1165	+ committed-rev="306"
1166	+ name="node.conf.sample"
1167	+ text-time="2007-05-21T10:00:39.000000Z"
1168	+ committed-date="2007-01-26T06:27:47.341988Z"
1169	+ checksum="1c276e6b61d03bd851af7bd28ddf4199"
1170	+ last-author="fabianx"
1171	+ kind="file"
1172	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1173	+<entry
1174	+ name="nxserver-helper"
1175	+ kind="dir"/>
1176	+<entry
1177	+ committed-rev="306"
1178	+ name="nxcups-gethost"
1179	+ text-time="2007-05-21T10:00:39.000000Z"
1180	+ committed-date="2007-01-26T06:27:47.341988Z"
1181	+ checksum="1cd6773dda4792ba798a95e153ff3841"
1182	+ last-author="fabianx"
1183	+ kind="file"
1184	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1185	+<entry
1186	+ committed-rev="333"
1187	+ name="nxnode"
1188	+ text-time="2007-05-21T10:00:39.000000Z"
1189	+ committed-date="2007-04-20T17:59:07.774037Z"
1190	+ checksum="843883cfc5935b417d6a046d932908c8"
1191	+ last-author="fabianx"
1192	+ kind="file"
1193	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1194	+<entry
1195	+ committed-rev="96"
1196	+ name="CONTRIB"
1197	+ text-time="2007-05-21T10:00:39.000000Z"
1198	+ committed-date="2005-08-02T17:49:08.143420Z"
1199	+ checksum="3d8ec3ea8c6056b40a40777b586c9065"
1200	+ last-author="fabianx"
1201	+ kind="file"
1202	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1203	+<entry
1204	+ committed-rev="201"
1205	+ name="gentoo-nomachine.diff"
1206	+ text-time="2007-05-21T10:00:39.000000Z"
1207	+ committed-date="2006-03-11T11:51:05.207097Z"
1208	+ checksum="0f800aa685289fb60743a7c6227b9208"
1209	+ last-author="fabianx"
1210	+ kind="file"
1211	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1212	+<entry
1213	+ committed-rev="231"
1214	+ name="nxnode-login"
1215	+ text-time="2007-05-21T10:00:39.000000Z"
1216	+ committed-date="2006-07-05T02:03:45.602868Z"
1217	+ checksum="381fca3c72099c5144647dc5aff9bb60"
1218	+ last-author="fabianx"
1219	+ kind="file"
1220	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1221	+<entry
1222	+ committed-rev="289"
1223	+ name="nxprint"
1224	+ text-time="2007-05-21T10:00:39.000000Z"
1225	+ committed-date="2007-01-24T15:51:37.382480Z"
1226	+ checksum="564f36a057f9aee78222dca3e1059e0d"
1227	+ last-author="fabianx"
1228	+ kind="file"
1229	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1230	+<entry
1231	+ committed-rev="239"
1232	+ name="nxcheckload.sample"
1233	+ text-time="2007-05-21T10:00:39.000000Z"
1234	+ committed-date="2006-07-09T10:40:00.797581Z"
1235	+ checksum="b742cb8ed16d1841097d8c73c75e6647"
1236	+ last-author="fabianx"
1237	+ kind="file"
1238	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1239	+<entry
1240	+ committed-rev="330"
1241	+ name="nxsetup"
1242	+ text-time="2007-05-21T10:00:39.000000Z"
1243	+ committed-date="2007-02-24T00:17:15.999141Z"
1244	+ checksum="d38cb90f6e8bc81e8df46f7c7f11d14e"
1245	+ last-author="fabianx"
1246	+ kind="file"
1247	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1248	+<entry
1249	+ committed-rev="222"
1250	+ name="INSTALL"
1251	+ text-time="2007-05-21T10:00:39.000000Z"
1252	+ committed-date="2006-07-04T22:23:46.997510Z"
1253	+ checksum="a91ae8009b55a0efa93b00c8a73d7302"
1254	+ last-author="fabianx"
1255	+ kind="file"
1256	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1257	+<entry
1258	+ committed-rev="96"
1259	+ name="COPYING"
1260	+ text-time="2007-05-21T10:00:39.000000Z"
1261	+ committed-date="2005-08-02T17:49:08.143420Z"
1262	+ checksum="393a5ca445f6965873eca0259a17f833"
1263	+ last-author="fabianx"
1264	+ kind="file"
1265	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1266	+<entry
1267	+ committed-rev="307"
1268	+ name="nxloadconfig"
1269	+ text-time="2007-05-21T10:00:39.000000Z"
1270	+ committed-date="2007-01-29T18:50:50.533774Z"
1271	+ checksum="5d60ae47f0378e09a966dbc1cab9d0e8"
1272	+ last-author="fabianx"
1273	+ kind="file"
1274	+ prop-time="2007-05-21T10:00:38.000000Z"/>
1275	+<entry
1276	+ committed-rev="324"
1277	+ name="nxserver"
1278	+ text-time="2007-05-21T10:00:39.000000Z"
1279	+ committed-date="2007-02-12T04:15:10.132249Z"
1280	+ checksum="a69e4ca95ee3b965418276cf09921a6b"
1281	+ last-author="fabianx"
1282	+ kind="file"
1283	+ prop-time="2007-05-21T10:00:39.000000Z"/>
1284	+</wc-entries>
1285	diff -Naur freenx-0.6.0/.svn/format trunk/.svn/format
1286	--- freenx-0.6.0/.svn/format 2007-01-23 04:22:48.000000000 +0100
1287	+++ trunk/.svn/format 2007-05-21 12:00:32.000000000 +0200
1288	@@ -1 +1 @@
1289	-8
1290	+4
1291	diff -Naur freenx-0.6.0/.svn/prop-base/nxcups-gethost.svn-base trunk/.svn/prop-base/nxcups-gethost.svn-base
1292	--- freenx-0.6.0/.svn/prop-base/nxcups-gethost.svn-base 1970-01-01 01:00:00.000000000 +0100
1293	+++ trunk/.svn/prop-base/nxcups-gethost.svn-base 2007-05-21 12:00:38.000000000 +0200
1294	@@ -0,0 +1,5 @@
1295	+K 14
1296	+svn:executable
1297	+V 1
1298	+*
1299	+END
1300	diff -Naur freenx-0.6.0/.svn/props/INSTALL.svn-work trunk/.svn/props/INSTALL.svn-work
1301	--- freenx-0.6.0/.svn/props/INSTALL.svn-work 1970-01-01 01:00:00.000000000 +0100
1302	+++ trunk/.svn/props/INSTALL.svn-work 2007-05-21 12:00:38.000000000 +0200
1303	@@ -0,0 +1,5 @@
1304	+K 12
1305	+svn:keywords
1306	+V 2
1307	+Id
1308	+END
1309	diff -Naur freenx-0.6.0/.svn/props/node.conf.sample.svn-work trunk/.svn/props/node.conf.sample.svn-work
1310	--- freenx-0.6.0/.svn/props/node.conf.sample.svn-work 1970-01-01 01:00:00.000000000 +0100
1311	+++ trunk/.svn/props/node.conf.sample.svn-work 2007-05-21 12:00:38.000000000 +0200
1312	@@ -0,0 +1,5 @@
1313	+K 12
1314	+svn:keywords
1315	+V 2
1316	+Id
1317	+END
1318	diff -Naur freenx-0.6.0/.svn/props/nxcheckload.sample.svn-work trunk/.svn/props/nxcheckload.sample.svn-work
1319	--- freenx-0.6.0/.svn/props/nxcheckload.sample.svn-work 1970-01-01 01:00:00.000000000 +0100
1320	+++ trunk/.svn/props/nxcheckload.sample.svn-work 2007-05-21 12:00:38.000000000 +0200
1321	@@ -0,0 +1,5 @@
1322	+K 14
1323	+svn:executable
1324	+V 1
1325	+*
1326	+END
1327	diff -Naur freenx-0.6.0/.svn/props/nxclient.svn-work trunk/.svn/props/nxclient.svn-work
1328	--- freenx-0.6.0/.svn/props/nxclient.svn-work 1970-01-01 01:00:00.000000000 +0100
1329	+++ trunk/.svn/props/nxclient.svn-work 2007-05-21 12:00:38.000000000 +0200
1330	@@ -0,0 +1,9 @@
1331	+K 14
1332	+svn:executable
1333	+V 1
1334	+*
1335	+K 12
1336	+svn:keywords
1337	+V 2
1338	+Id
1339	+END
1340	diff -Naur freenx-0.6.0/.svn/props/nxcups-gethost.svn-work trunk/.svn/props/nxcups-gethost.svn-work
1341	--- freenx-0.6.0/.svn/props/nxcups-gethost.svn-work 1970-01-01 01:00:00.000000000 +0100
1342	+++ trunk/.svn/props/nxcups-gethost.svn-work 2007-05-21 12:00:38.000000000 +0200
1343	@@ -0,0 +1,5 @@
1344	+K 14
1345	+svn:executable
1346	+V 1
1347	+*
1348	+END
1349	diff -Naur freenx-0.6.0/.svn/props/nxkeygen.svn-work trunk/.svn/props/nxkeygen.svn-work
1350	--- freenx-0.6.0/.svn/props/nxkeygen.svn-work 1970-01-01 01:00:00.000000000 +0100
1351	+++ trunk/.svn/props/nxkeygen.svn-work 2007-05-21 12:00:38.000000000 +0200
1352	@@ -0,0 +1,9 @@
1353	+K 14
1354	+svn:executable
1355	+V 1
1356	+*
1357	+K 12
1358	+svn:keywords
1359	+V 2
1360	+Id
1361	+END
1362	diff -Naur freenx-0.6.0/.svn/props/nxloadconfig.svn-work trunk/.svn/props/nxloadconfig.svn-work
1363	--- freenx-0.6.0/.svn/props/nxloadconfig.svn-work 1970-01-01 01:00:00.000000000 +0100
1364	+++ trunk/.svn/props/nxloadconfig.svn-work 2007-05-21 12:00:38.000000000 +0200
1365	@@ -0,0 +1,9 @@
1366	+K 14
1367	+svn:executable
1368	+V 1
1369	+*
1370	+K 12
1371	+svn:keywords
1372	+V 2
1373	+Id
1374	+END
1375	diff -Naur freenx-0.6.0/.svn/props/nxnode-login.svn-work trunk/.svn/props/nxnode-login.svn-work
1376	--- freenx-0.6.0/.svn/props/nxnode-login.svn-work 1970-01-01 01:00:00.000000000 +0100
1377	+++ trunk/.svn/props/nxnode-login.svn-work 2007-05-21 12:00:38.000000000 +0200
1378	@@ -0,0 +1,9 @@
1379	+K 14
1380	+svn:executable
1381	+V 1
1382	+*
1383	+K 12
1384	+svn:keywords
1385	+V 2
1386	+Id
1387	+END
1388	diff -Naur freenx-0.6.0/.svn/props/nxnode.svn-work trunk/.svn/props/nxnode.svn-work
1389	--- freenx-0.6.0/.svn/props/nxnode.svn-work 1970-01-01 01:00:00.000000000 +0100
1390	+++ trunk/.svn/props/nxnode.svn-work 2007-05-21 12:00:38.000000000 +0200
1391	@@ -0,0 +1,9 @@
1392	+K 14
1393	+svn:executable
1394	+V 1
1395	+*
1396	+K 12
1397	+svn:keywords
1398	+V 2
1399	+Id
1400	+END
1401	diff -Naur freenx-0.6.0/.svn/props/nxprint.svn-work trunk/.svn/props/nxprint.svn-work
1402	--- freenx-0.6.0/.svn/props/nxprint.svn-work 1970-01-01 01:00:00.000000000 +0100
1403	+++ trunk/.svn/props/nxprint.svn-work 2007-05-21 12:00:38.000000000 +0200
1404	@@ -0,0 +1,9 @@
1405	+K 14
1406	+svn:executable
1407	+V 1
1408	+*
1409	+K 12
1410	+svn:keywords
1411	+V 2
1412	+Id
1413	+END
1414	diff -Naur freenx-0.6.0/.svn/props/nxserver.svn-work trunk/.svn/props/nxserver.svn-work
1415	--- freenx-0.6.0/.svn/props/nxserver.svn-work 1970-01-01 01:00:00.000000000 +0100
1416	+++ trunk/.svn/props/nxserver.svn-work 2007-05-21 12:00:39.000000000 +0200
1417	@@ -0,0 +1,9 @@
1418	+K 14
1419	+svn:executable
1420	+V 1
1421	+*
1422	+K 12
1423	+svn:keywords
1424	+V 2
1425	+Id
1426	+END
1427	diff -Naur freenx-0.6.0/.svn/props/nxsetup.svn-work trunk/.svn/props/nxsetup.svn-work
1428	--- freenx-0.6.0/.svn/props/nxsetup.svn-work 1970-01-01 01:00:00.000000000 +0100
1429	+++ trunk/.svn/props/nxsetup.svn-work 2007-05-21 12:00:38.000000000 +0200
1430	@@ -0,0 +1,9 @@
1431	+K 14
1432	+svn:executable
1433	+V 1
1434	+*
1435	+K 12
1436	+svn:keywords
1437	+V 2
1438	+Id
1439	+END
1440	diff -Naur freenx-0.6.0/.svn/README.txt trunk/.svn/README.txt
1441	--- freenx-0.6.0/.svn/README.txt 1970-01-01 01:00:00.000000000 +0100
1442	+++ trunk/.svn/README.txt 2007-05-21 12:00:32.000000000 +0200
1443	@@ -0,0 +1,2 @@
1444	+This is a Subversion working copy administrative directory.
1445	+Visit http://subversion.tigris.org/ for more information.
1446	diff -Naur freenx-0.6.0/.svn/text-base/ChangeLog.svn-base trunk/.svn/text-base/ChangeLog.svn-base
1447	--- freenx-0.6.0/.svn/text-base/ChangeLog.svn-base 2007-01-23 04:22:48.000000000 +0100
1448	+++ trunk/.svn/text-base/ChangeLog.svn-base 2007-05-21 12:00:38.000000000 +0200
1449	@@ -1,3 +1,42 @@
1450	+xx.xx.2007 FreeNX 0.6.1
1451	+ * Fixed the printing support for CUPS 1.2.
1452	+ Older versions of CUPS are no longer supported.
1453	+ * Note: You must do as root:
1454	+
1455	+ cp /usr/lib/cups/backend/ipp /usr/lib/cups/backend/nxipp
1456	+ chmod 755 /usr/lib/cups/backend/nxipp
1457	+
1458	+ Or alternatively re-run nxsetup.
1459	+
1460	+ * Added foomatic support.
1461	+ * Note: You might need to do: ln -s /usr/bin/foomatic-ppdfile
1462	+ /usr/lib/cups/driver/
1463	+ * Added setting of CUPS_SERVER environment var.
1464	+ * Added automatic downloading of PPDs, if the client supports it.
1465	+ * Added configuration vars to tweak the new behaviour.
1466	+ * Added cups seamless support with no "use this driver?" dialogs at all.
1467	+ * Note: You need nxcupsd-wrapper on the client side for CUPS 1.2
1468	+ clients.
1469	+
1470	+ Get it from nxutils repository.
1471	+
1472	+ * Fixed Support for "Running" sessions - again.
1473	+ * Made the NXAgent exited with exit code 1 message more verbose.
1474	+ * Added support for nxipp to nxnode and nxsetup.
1475	+ * Added nxcups-gethost script for automatic usage in KDE.
1476	+ * Fixed RDP/VNC sessions. No application should be started for that type.
1477	+ (Patch by Bernard Cafarelli <voyageur@operamail.com>)
1478	+ * Added backingstore fix for older clients from Gentoo.
1479	+ (http://bugs.gentoo.org/show_bug.cgi?id=149298)
1480	+ * Fixed VNC sessions.
1481	+ * Fixed fullscreen sessions.
1482	+ (Patch by Gentoo Bugtracker)
1483	+ * Fixed --broadcast.
1484	+ * Added "passwd -u nx" to nxsetup to fix slackware.
1485	+ * Fixed respecting of enconding settings in case of rootless mode.
1486	+ * Fixed smb mounting in case nxclient sends the wrong port.
1487	+ (Patch by Jan Lockenvitz <jan.lockenvitz.ext@siemens.com>)
1488	+
1489	23.01.2007 FreeNX 0.6.0 "Juliana birthday edition"
1490	* Opened the 0.6.0 branch.
1491	* Added nxnode slave mode.
1492	diff -Naur freenx-0.6.0/.svn/text-base/node.conf.sample.svn-base trunk/.svn/text-base/node.conf.sample.svn-base
1493	--- freenx-0.6.0/.svn/text-base/node.conf.sample.svn-base 2007-01-23 04:22:49.000000000 +0100
1494	+++ trunk/.svn/text-base/node.conf.sample.svn-base 2007-05-21 12:00:38.000000000 +0200
1495	@@ -247,11 +247,51 @@
1496	#ARTSD_BIN_PRELOAD="artsdsp"
1497
1498	# FreeNX with ENABLE_KDE_CUPS="1" will automatically write
1499	-# $KDE_PRINTRC and put the current used port into it.
1500	+# $KDE_PRINTRC and put the current used socket into it.
1501	+#
1502	+# If you additionally enable ENABLE_KDE_CUPS_DYNAMIC it will set the
1503	+# Host entry to the script nxcups-gethost, which dynamically tries all
1504	+# possible entries to find the current printing host.
1505	+#
1506	+# The order is: CUPS_SERVER (env var), ~/.cups/client.conf, $KDE_PRINTRC,
1507	+# $CUPS_DEFAULT_SOCK, localhost
1508	+#
1509	+# So this option is most useful with ENABLE_CUPS_SERVER_EXPORT="1".
1510	+#
1511	# $KDE_PRINTRC is automatically calculated if its not set.
1512
1513	#ENABLE_KDE_CUPS="0"
1514	+#ENABLE_KDE_CUPS_DYNAMIC="0"
1515	#KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
1516	+
1517	+# FreeNX with ENABLE_CUPS_SERVER_EXPORT="1" will automatically
1518	+# export the environment variable CUPS_SERVER.
1519	+
1520	+#ENABLE_CUPS_SERVER_EXPORT="1"
1521	+
1522	+# FreeNX with ENABLE_CUPS_SEAMLESS will automatically try to download the
1523	+# necessary ppds from the client.
1524	+#
1525	+# As the forwarding is just active as soon as nxagent is started,
1526	+# we need a small delay of $CUPS_SEAMLESS_DELAY.
1527	+#
1528	+# Note: You need to use a patched cupsd on client side.
1529	+
1530	+#ENABLE_CUPS_SEAMLESS="0"
1531	+#CUPS_SEAMLESS_DELAY="10"
1532	+
1533	+# FreeNX with ENABLE_FOOMATIC will integrate the foomatic db to the list
1534	+# of available ppd drivers via the $COMMAND_FOOMATIC command.
1535	+
1536	+#ENABLE_FOOMATIC="1"
1537	+#COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
1538	+
1539	+# CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS
1540	+# installation.
1541	+
1542	+#CUPS_BACKEND="/usr/lib/cups/backend"
1543	+#CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
1544	+#CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
1545	#CUPS_ETC="/etc/cups"
1546
1547	#########################################################################
1548	diff -Naur freenx-0.6.0/.svn/text-base/nxclient.svn-base trunk/.svn/text-base/nxclient.svn-base
1549	--- freenx-0.6.0/.svn/text-base/nxclient.svn-base 2007-01-23 04:22:48.000000000 +0100
1550	+++ trunk/.svn/text-base/nxclient.svn-base 2007-05-21 12:00:38.000000000 +0200
1551	@@ -98,6 +98,8 @@
1552	[ -n "$USER_FAKE_HOME" ] && UTILITY_DRIVERS_CACHE="$USER_FAKE_HOME/.nx/config/drivers.cache"
1553	UTILITY_NXPRINT="nxprint"
1554	[ -n "$PATH_BIN" ] && UTILITY_NXPRINT="$PATH_BIN/nxprint"
1555	+ # Export configuration vars for nxprint
1556	+ export ENABLE_FOOMATIC COMMAND_FOOMATIC
1557	case "$1" in
1558	get)
1559	grep "driver\|$2\|" "$UTILITY_DRIVERS_CACHE" 2>/dev/null
1560	@@ -251,7 +253,7 @@
1561	# xdialog_printer_configure_driver vendor old_driver
1562	xdialog_printer_configure_driver()
1563	{
1564	- IFS='\|' XDIALOG_LIST=( $(utility_printer getextdrvlist "$1" \| sed 's/$/\|off/g; /'"$2"'/ s/\|off/\|on/g' \| tr '\n' '\|') )
1565	+ IFS='\|' XDIALOG_LIST=( $(utility_printer getextdrvlist "$1" \| sed 's,$,\|off,g; /'"$(basename $2)"'/ s,\|off,\|on,g' \| tr '\n' '\|') )
1566	$DIALOG --stdout --title "$DIALOG_CAPTION" --radiolist "$DIALOG_MESSAGE" 0 0 6 "${XDIALOG_LIST[@]}"
1567	}
1568
1569	diff -Naur freenx-0.6.0/.svn/text-base/nxcups-gethost.svn-base trunk/.svn/text-base/nxcups-gethost.svn-base
1570	--- freenx-0.6.0/.svn/text-base/nxcups-gethost.svn-base 1970-01-01 01:00:00.000000000 +0100
1571	+++ trunk/.svn/text-base/nxcups-gethost.svn-base 2007-05-21 12:00:38.000000000 +0200
1572	@@ -0,0 +1,23 @@
1573	+#!/bin/sh
1574	+
1575	+# Read the config file
1576	+. $(PATH=$(cd $(dirname $0) && pwd):$PATH which nxloadconfig) --userconf
1577	+
1578	+CUPS_HOST=""
1579	+
1580	+# see if environment is helpful
1581	+[ -n "$CUPS_SERVER" ] && CUPS_HOST=$CUPS_SERVER
1582	+
1583	+# no, lets see if the user has a cups config file
1584	+[ -z "$CUPS_HOST" -a -f "$HOME/.cups/client.conf" ] && CUPS_HOST=$(grep "^ServerName " "$HOME/.cups/client.conf" \| sed 's/^ServerName //g; s/#.*//g')
1585	+
1586	+# not even close, so lets use the kdeprintrcs configuration key
1587	+[ -z "$CUPS_HOST" ] && CUPS_HOST=$(grep "^Host=" "$KDE_PRINTRC" \| cut -d'=' -f2)
1588	+
1589	+# Hm, perhaps there is a global cupsd running on this host
1590	+[ -z "$CUPS_HOST" -a -S "$CUPS_DEFAULT_SOCK" ] && CUPS_HOST="$CUPS_DEFAULT_SOCK"
1591	+
1592	+# no, no, no - so we fallback to localhost
1593	+[ -z "$CUPS_HOST" ] && CUPS_HOST="127.0.0.1"
1594	+
1595	+echo "$CUPS_HOST"
1596	diff -Naur freenx-0.6.0/.svn/text-base/nxloadconfig.svn-base trunk/.svn/text-base/nxloadconfig.svn-base
1597	--- freenx-0.6.0/.svn/text-base/nxloadconfig.svn-base 2007-01-23 04:22:49.000000000 +0100
1598	+++ trunk/.svn/text-base/nxloadconfig.svn-base 2007-05-21 12:00:38.000000000 +0200
1599	@@ -52,7 +52,7 @@
1600	# DO NOT TOUCH unless you REALLY know what you are doing
1601	#########################################################################
1602
1603	-NX_VERSION=1.5.0-60
1604	+NX_VERSION=1.5.0-61-SVN
1605	NX_LICENSE="OS (GPL)"
1606
1607	# Where can different nx components be found
1608	@@ -143,7 +143,18 @@
1609	ARTSD_BIN_PRELOAD="artsdsp"
1610
1611	ENABLE_KDE_CUPS="0"
1612	+ENABLE_KDE_CUPS_DYNAMIC="0"
1613	KDE_PRINTRC="" # Calculated
1614	+
1615	+ENABLE_CUPS_SERVER_EXPORT="1"
1616	+ENABLE_CUPS_SEAMLESS="0"
1617	+CUPS_SEAMLESS_DELAY="10"
1618	+ENABLE_FOOMATIC="1"
1619	+COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
1620	+
1621	+CUPS_BACKEND="/usr/lib/cups/backend"
1622	+CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
1623	+CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
1624	CUPS_ETC="/etc/cups/"
1625
1626	# Path directives
1627	@@ -271,7 +282,8 @@
1628	fi
1629
1630	[ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
1631	-[ -z "$KDE_PRINTRC" -a -z "$KDEHOME" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
1632	+[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
1633	+[ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
1634
1635	#########################################################################
1636	# Support for --check
1637	@@ -436,6 +448,17 @@
1638	ERROR="yes" && echo "Error: Invalid value \"ENABLE_KDE_CUPS=$ENABLE_KDE_CUPS\""
1639	[ "$ENABLE_KDE_CUPS" = "1" -a ! -e "$KDE_PRINTRC" ] && \
1640	ERROR="yes" && echo "Error: Invalid value \"KDE_PRINTRC=$KDE_PRINTRC\""
1641	+
1642	+
1643	+ [ "$ENABLE_FOOMATIC" = "1" ] && ! which "$COMMAND_FOOMATIC" >/dev/null 2>&1 && \
1644	+ WARNING="yes" && echo "Warning: Invalid value \"COMMAND_FOOMATIC=$COMMAND_FOOMATIC\"" \
1645	+ && echo " Users will not be able to use foomatic."
1646	+ [ ! -x "$CUPS_IPP_BACKEND" ] && \
1647	+ WARNING="yes" && echo "Warning: \"$CUPS_IPP_BACKEND\" is not executable." \
1648	+ && echo " Users will not be able to enable printing."
1649	+ [ ! -x "$CUPS_BACKEND/smb" ] && \
1650	+ WARNING="yes" && echo "Warning: \"$CUPS_BACKEND/smb\" is not executable." \
1651	+ && echo " Users will not be able to enable printing."
1652	[ ! -e "$CUPS_ETC/mime.types" -o ! -e "$CUPS_ETC/mime.convs" ] && \
1653	WARNING="yes" && echo "Warning: Invalid value \"CUPS_ETC=$CUPS_ETC\"" \
1654	&& echo " Users will not be able to enable printing."
1655	@@ -483,6 +506,9 @@
1656	! which "$COMMAND_CUPSD" >/dev/null 2>&1 && \
1657	WARNING="yes" && echo "Warning: Invalid value \"COMMAND_CUPSD=$COMMAND_CUPSD\"" \
1658	&& echo " Users will not be able to enable printing."
1659	+ [ -z "$(strings $COMMAND_CUPSD \| egrep 'CUPS\/1.2')" ] && \
1660	+ WARNING="yes" && echo "Warning: Invalid cupsd version of \"$COMMAND_CUPSD\". Need version 1.2." \
1661	+ && echo " Users will not be able to enable printing."
1662	! which "$COMMAND_MD5SUM" >/dev/null 2>&1 && \
1663	ERROR="yes" && echo "Error: Invalid value \"COMMAND_MD5SUM=$COMMAND_MD5SUM\""
1664
1665	diff -Naur freenx-0.6.0/.svn/text-base/nxnode.svn-base trunk/.svn/text-base/nxnode.svn-base
1666	--- freenx-0.6.0/.svn/text-base/nxnode.svn-base 2007-01-23 04:22:49.000000000 +0100
1667	+++ trunk/.svn/text-base/nxnode.svn-base 2007-05-21 12:00:38.000000000 +0200
1668	@@ -252,6 +252,9 @@
1669	#
1670
1671	NODE_APPLICATION=$(node_find_application "$type")
1672	+
1673	+ # For rdesktop/VNC, there is no application to start
1674	+ [ -n "$NODE_APPLICATION" ] \|\| return
1675
1676	#
1677	# Check if we want to use a mediahelper
1678	@@ -283,6 +286,8 @@
1679	fi
1680	fi
1681
1682	+ [ "$cups" = "1" -a "$ENABLE_CUPS_SERVER_EXPORT" = "1" ] && export CUPS_SERVER="$USER_FAKE_HOME/.nx/C-$sess_id/cups/cups.sock"
1683	+
1684	#
1685	# Do we need to PRELOAD any libraries?
1686	#
1687	@@ -407,7 +412,11 @@
1688	# backingstore
1689
1690	B=""
1691	- [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ] && B="-bs $backingstore"
1692	+ if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ]
1693	+ then
1694	+ [ "$backingstore" != 1 ] && B="-bs $backingstore"
1695	+ [ "$backingstore" = 1 ] && B="+bs"
1696	+ fi
1697
1698	# geometry
1699
1700	@@ -495,7 +504,8 @@
1701	NODE_FAILED=""
1702	if [ $NODE_AGENT_EXIT_STATUS -ne 0 ]
1703	then
1704	- echo "NX> 1004 Error: NX Agent exited with exit status 1."
1705	+ echo "NX> 1004 Error: NX Agent exited with exit status 1. To troubleshoot set SESSION_LOG_CLEAN=0 in node.conf and investigate \"$USER_FAKE_HOME/.nx/F-C-$sess_id/session\". You might also want to try: ssh -X myserver; $PATH_BIN/nxnode --agent to test the basic functionality. Session log follows:"
1706	+ cat "$USER_FAKE_HOME/.nx/C-$sess_id/session" 1>&2
1707	NODE_FAILED="failed"
1708	fi
1709	echo "NX> 1006 Session status: closed"
1710	@@ -551,12 +561,13 @@
1711	let NODE_CUPSD_PORT=$display+9000 # offset 9000 for userspace cupsd's
1712	export NODE_CUPSD_PORT
1713
1714	+ export NODE_CUPSD_SOCKET="$USER_FAKE_HOME/.nx/C-$sess_id/cups/cups.sock"
1715	+
1716	mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/pids/"
1717	[ -e "$USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd" ] && return
1718	touch "$USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd"
1719
1720	- mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/tmp" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/certs" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/ppd"
1721	- ln -sf spool/certs "$USER_FAKE_HOME/.nx/C-$sess_id/cups/certs"
1722	+ mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/tmp" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/certs" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/ppd" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cache"
1723
1724	cat <<EOF > $USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf
1725	AccessLog /dev/null
1726	@@ -566,15 +577,27 @@
1727	TempDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/spool/tmp
1728	RequestRoot $USER_FAKE_HOME/.nx/C-$sess_id/cups/spool
1729	ServerRoot $USER_FAKE_HOME/.nx/C-$sess_id/cups/
1730	-Port $NODE_CUPSD_PORT
1731	+StateDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/
1732	+CacheDir $USER_FAKE_HOME/.nx/C-$sess_id/cups/cache
1733	+
1734	+Listen $NODE_CUPSD_SOCKET
1735	Browsing Off
1736	ServerName localhost
1737	+PidFile $USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd
1738
1739	<Location />
1740	Order Deny,Allow
1741	Deny From All
1742	Allow from 127.0.0.1
1743	</Location>
1744	+
1745	+# Allow everything for anonymous, because we are protected through UNIX socket
1746	+<Policy default>
1747	+ <Limit All>
1748	+ AuthType None
1749	+ Order deny,allow
1750	+ </Limit>
1751	+</Policy>
1752	EOF
1753
1754	touch "$USER_FAKE_HOME/.nx/C-$sess_id/cups/printers.conf" "$USER_FAKE_HOME/.nx/C-$sess_id/cups/classes.conf"
1755	@@ -583,20 +606,19 @@
1756	cp -af "$CUPS_ETC"/mime.* "$USER_FAKE_HOME/.nx/C-$sess_id/cups/"
1757
1758	# start cupsd
1759	- $COMMAND_CUPSD -f -c "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf" &>/dev/null </dev/null &
1760	- NODE_CUPSD_PID=$!
1761	- sleep 3
1762	- echo $NODE_CUPSD_PID >"$USER_FAKE_HOME/.nx/C-$sess_id/pids/cupsd"
1763	+ $COMMAND_CUPSD -c "$USER_FAKE_HOME/.nx/C-$sess_id/cups/cupsd.conf" &>/dev/null </dev/null
1764
1765	# setup KDE
1766	if [ "$ENABLE_KDE_CUPS" = "1" -a -e "$KDE_PRINTRC" ]
1767	then
1768	- if egrep -q "^Port=" "$KDE_PRINTRC"
1769	+ if egrep -q "^Host=" "$KDE_PRINTRC"
1770	then
1771	- perl -pi -e 's/^Port=.*/Port='"$NODE_CUPSD_PORT"'/g' "$KDE_PRINTRC"
1772	+ [ "$ENABLE_KDE_CUPS_DYNAMIC" = "1" ] && perl -pi -e 's,^Host=.*,Host[\$ie]=\$\('"$PATH_BIN/nxcups-gethost"'),g' "$KDE_PRINTRC"
1773	+ [ "$ENABLE_KDE_CUPS_DYNAMIC" != "1" ] && perl -pi -e 's,^Host=.*,Host='"$NODE_CUPSD_SOCKET"',g' "$KDE_PRINTRC"
1774	else
1775	echo "[CUPS]" >> "$KDE_PRINTRC"
1776	- echo "Port=$NODE_CUPSD_PORT" >> "$KDE_PRINTRC"
1777	+ [ "$ENABLE_KDE_CUPS_DYNAMIC" = "1" ] && echo "Host[\$ie]=\$($PATH_BIN/nxcups-gethost)" >> "$KDE_PRINTRC"
1778	+ [ "$ENABLE_KDE_CUPS_DYNAMIC" != "1" ] && echo "Host=$NODE_CUPSD_SOCKET" >> "$KDE_PRINTRC"
1779	fi
1780	fi
1781	}
1782	@@ -614,10 +636,10 @@
1783	[ -n "$NODE_CUPSD_PID" ] && kill -0 $NODE_CUPSD_PID && kill -HUP $NODE_CUPSD_PID
1784	}
1785
1786	-node_cupsd_get_port()
1787	+node_cupsd_get_socket()
1788	{
1789	node_cupsd_setup
1790	- echo $NODE_CUPSD_PORT
1791	+ echo $NODE_CUPSD_SOCKET
1792	}
1793
1794	node_umount_smb()
1795	@@ -670,6 +692,16 @@
1796	fi
1797
1798	#
1799	+ # Catch NXAGENT SMB Port (sometimes the port differs from what we got from nxserver)
1800	+ #
1801	+
1802	+ if stringinstring "Info: Listening for SMB connections on port" "$line"
1803	+ then
1804	+ SMBMOUNT_PORT=$(echo $line \| cut -d"'" -f2)
1805	+ echo "$SMBMOUNT_PORT" >"$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mport"
1806	+ fi
1807	+
1808	+ #
1809	# Session messages
1810	#
1811
1812	@@ -947,7 +979,7 @@
1813	sync=$(getparam sync)
1814	samba=$(getparam samba)
1815	cups=$(getparam cups)
1816	- agent_server=$(getparam agent_server)
1817	+ agent_server=$(getparam agent_server \| sed 's/%3A/:/g')
1818	agent_user=$(getparam agent_user)
1819	agent_password=$(getparam agent_password)
1820	agent_domain=$(getparam agent_domain)
1821	@@ -969,13 +1001,17 @@
1822	rootless=0
1823	# Its still the clients decision
1824	[ "$ENABLE_ROOTLESS_MODE" = "1" ] && rootless=$(getparam rootless)
1825	+
1826	+ # Rootless fix from 2x nxserver 1.5.0
1827	+ realtype=$type
1828	+ [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop"
1829
1830	# FreeNX specific variables
1831	clientproto=$(getparam clientproto)
1832	status=$(getparam status)
1833	host=$(getparam host)
1834
1835	- fullscreen=""
1836	+ fullscreen=$(getparam fullscreen)
1837	[ "$geometry" = "fullscreen" ] && fullscreen="1"
1838
1839	[ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
1840	@@ -1016,7 +1052,8 @@
1841
1842	proxy_cookie=$(echo $[$RANDOM*$RANDOM] \| $COMMAND_MD5SUM \| cut -d" " -f1)
1843
1844	- if [ "$clientproto" = "1.5.0" ]
1845	+ # all newer clients support fake cookie authentication
1846	+ if [ "$clientproto" != "1.4.0" ]
1847	then
1848	# enable fake cookie authentication
1849	cookie=$proxy_cookie
1850	@@ -1039,7 +1076,7 @@
1851	umask 0077
1852
1853	cat << EOF > $USER_FAKE_HOME/.nx/C-$sess_id/options
1854	-${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$type,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}:$display
1855	+${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}:$display
1856	EOF
1857	umask $OLD_UMASK
1858	#samba=$samba,
1859	@@ -1150,16 +1187,24 @@
1860	share=$(getparam share)
1861	computername=$(getparam computername)
1862	dir=$(getparam dir \| sed 's\|$(SHARES)\|MyShares\|g')
1863	- rdir=$(getparam dir \| sed 's\|$(SHARES)/\|\|g')
1864	+ # rdir=$(getparam dir \| sed 's\|$(SHARES)/\|\|g')
1865	display=$(cd $USER_FAKE_HOME/.nx/; echo C-$SERVER_NAME-*-$sessionid \| rev\|cut -d"-" -f2\| rev)
1866	mkdir -p "$HOME/$dir"
1867	- error=$(PASSWD="$password" "$COMMAND_SMBMOUNT" "//$computername/$rdir" "$HOME/$dir" -o username="$username,ip=127.0.0.1,port=$port" 2>&1)
1868	+ # wait up to 30 sec until nxagent has opened the listener port for samba connections
1869	+ for (( i=30; $i; --i ))
1870	+ do
1871	+ [ -f "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mport" ] && break
1872	+ sleep 1
1873	+ done
1874	+ # sometimes the samba port we get from nxserver is not the right one, so let's get it from nxagent
1875	+ port=$(cat "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mport")
1876	+ error=$(PASSWD="$password" "$COMMAND_SMBMOUNT" "//$computername/$share" "$HOME/$dir" -o username="$username,ip=127.0.0.1,port=$port" 2>&1)
1877	if [ $? -eq 0 ]
1878	then
1879	- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display &
1880	+ $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$share' mounted on: '$HOME/$dir'" -noautokill -display :$display &
1881	echo "$HOME/$dir" >> "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mpoint"
1882	else
1883	- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' failed to mount: $error" -noautokill -display :$display &
1884	+ $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$share' failed to mount: $error" -noautokill -display :$display &
1885	fi
1886	}
1887
1888	@@ -1180,25 +1225,53 @@
1889	sess_id="$SERVER_NAME-$display-$sessionid"
1890
1891	# this will also setup the userspace cupsd
1892	- IPP_PORT=$(node_cupsd_get_port)
1893	- export IPP_PORT
1894	+ export CUPS_SERVER=$(node_cupsd_get_socket)
1895
1896	if [ "$type" = "smb" ]
1897	then
1898	- DEVICE_URI="smb://$username:$password@localhost:$port/$share"
1899	+ DEVICE_URI="smb://$username:$password@127.0.0.1:$port/$share"
1900	NAME="$share"
1901	+ ENABLE_CUPS_SEAMLESS="0"
1902	else
1903	- DEVICE_URI="ipp://$username:$password@localhost:$port/printers/$printer"
1904	+ DEVICE_URI="nxipp://$username:$password@127.0.0.1:$port/printers/$printer"
1905	NAME="$printer"
1906	fi
1907	-
1908	- MODEL=$($PATH_BIN/nxclient -printer "$NAME" -noautokill -display :$display)
1909	- [ -z "$MODEL" -o "$MODEL" = "cancel: aborted" ] && return
1910	+ export PATH_BIN
1911	+
1912	+ if [ "$ENABLE_CUPS_SEAMLESS" != "1" ]
1913	+ then
1914	+ MODEL=$($PATH_BIN/nxclient -printer "$NAME" -noautokill -display :$display)
1915	+ [ -z "$MODEL" -o "$MODEL" = "cancel: aborted" ] && return
1916	+ else
1917	+ sleep $CUPS_SEAMLESS_DELAY
1918	+ MODEL="download_cached"
1919	+ fi
1920
1921	PUBLIC="-u allow:$USER"
1922	[ "$public" == "1" ] && PUBLIC=""
1923	- lpadmin -p "$NAME" -E -v "$DEVICE_URI" -m "$MODEL" $PUBLIC
1924	- [ "$defaultPrinter" = "1" ] && lpadmin -d "$NAME"
1925	+
1926	+ if [ "$MODEL" = "download_new" -o "$MODEL" = "download_cached" ]
1927	+ then
1928	+ mkdir -p "$USER_FAKE_HOME/.nx/config/ppd/"
1929	+ if [ "$MODEL" = "download_new" -o ! -r "$USER_FAKE_HOME/.nx/config/ppd/$printer.ppd" ]
1930	+ then
1931	+ curl --digest -o "$USER_FAKE_HOME/.nx/config/ppd/$printer.ppd" "http://$username:$password@127.0.0.1:$port/ppd/${printer}_nxdl.ppd" >>$USER_FAKE_HOME/.nx/C-$sess_id/cups/curl.log 2>&1
1932	+ RC=$?
1933	+ [ $RC -eq 0 -a "$ENABLE_CUPS_SEAMLESS" != "1" ] && $PATH_BIN/nxclient --message "Download successful." -noautokill -display :$display
1934	+ [ $RC -ne 0 -a "$ENABLE_CUPS_SEAMLESS" != "1" ] && $PATH_BIN/nxclient --message "Download failed. Log is: $USER_FAKE_HOME/.nx/C-$sess_id/cups/curl.log" -noautokill -display :$display
1935	+ fi
1936	+ MODEL="$USER_FAKE_HOME/.nx/config/ppd/$printer.ppd"
1937	+ fi
1938	+
1939	+ if [ ! -r "$MODEL" ]
1940	+ then
1941	+ # Foomatic and co
1942	+ /usr/sbin/lpadmin -p "$NAME" -E -v "$DEVICE_URI" -m "$MODEL" $PUBLIC
1943	+ else
1944	+ /usr/sbin/lpadmin -p "$NAME" -E -v "$DEVICE_URI" -P "$MODEL" $PUBLIC
1945	+ fi
1946	+
1947	+ [ "$defaultPrinter" = "1" ] && /usr/sbin/lpadmin -d "$NAME"
1948	}
1949
1950	nxnode_func()
1951	diff -Naur freenx-0.6.0/.svn/text-base/nxprint.svn-base trunk/.svn/text-base/nxprint.svn-base
1952	--- freenx-0.6.0/.svn/text-base/nxprint.svn-base 2007-01-23 04:22:49.000000000 +0100
1953	+++ trunk/.svn/text-base/nxprint.svn-base 2007-05-21 12:00:38.000000000 +0200
1954	@@ -9,9 +9,6 @@
1955	# SVN: $Id: nxserver-freenx-0.6.1-svn333-update.patch,v 1.1 2007-05-21 12:07:25 niro Exp $
1956	#
1957
1958	-# disable foomatic by default
1959	-FOOMATIC="no"
1960	-
1961	HELP="no"
1962	DRIVERS="no"
1963	PRINTERS="no"
1964	@@ -35,7 +32,7 @@
1965	echo ""
1966	echo "Syntax: nxprint --help"
1967	echo " nxprint --drivers"
1968	- echo " nxprint --printes"
1969	+ echo " nxprint --printers"
1970	echo
1971	echo " --drivers prints a list of available CUPS drivers"
1972	echo " --printers prints a list of available CUPS printers"
1973	@@ -45,21 +42,23 @@
1974	if [ "$DRIVERS" = "yes" ]
1975	then
1976	echo "driver\|Raw\|Raw Queue\|raw"
1977	+ echo "driver\|Download (CUPS)\|Download from CUPS server (cached)\|download_cached"
1978	+ echo "driver\|Download (CUPS)\|Download from CUPS server (redownload)\|download_new"
1979	{
1980	- cd /usr/share/cups/model
1981	- awk -F '"' '/*Manufacturer:/ { a[FILENAME]=$2 }
1982	- /*NickName:/ { b[FILENAME]=$2 }
1983	+ cd /usr/share/ppd/
1984	+ awk -F '"' '/\*Manufacturer:/ { a[FILENAME]=$2 }
1985	+ /\*NickName:/ { b[FILENAME]=$2 }
1986	END {
1987	for (i in a)
1988	- print "driver\|" (a[i]=="ESP"?substr(b[i],0,index(b[i]," ")-1):a[i]) "\|"b[i]"\|"i
1989	- }' *.ppd
1990	- } \| sort
1991	+ print "driver\|" (a[i]=="ESP"?substr(b[i],0,index(b[i]," ")-1):a[i]) "\|"b[i]"\|"i"\|en"
1992	+ }' $(find -name "*.ppd")
1993
1994	- if [ $FOOMATIC="yes" ]
1995	+ if [ "$ENABLE_FOOMATIC" = "1" ]
1996	then
1997	- # TODO: Add support for foomatic-style ppds
1998	- :
1999	+ [ -z "$COMMAND_FOOMATIC" ] && COMMAND_FOOMATIC="foomatic-ppdfile"
2000	+ $COMMAND_FOOMATIC list \| awk -F'"' '{ A=""; if ($4 == "HP") { B=substr($6,index($6," ")+1); A=" "substr(B,0,index(B," ")); } printf("driver\|%s%s\|%s\|%s\|%s\n",$4,A,$6,$2,substr($3,2)) } '
2001	fi
2002	+ } \| sort
2003	fi
2004
2005	if [ "$PRINTERS" = "yes" ]
2006	diff -Naur freenx-0.6.0/.svn/text-base/nxserver.svn-base trunk/.svn/text-base/nxserver.svn-base
2007	--- freenx-0.6.0/.svn/text-base/nxserver.svn-base 2007-01-23 04:22:49.000000000 +0100
2008	+++ trunk/.svn/text-base/nxserver.svn-base 2007-05-21 12:00:39.000000000 +0200
2009	@@ -798,6 +798,7 @@
2010
2011	server_nxnode_echo()
2012	{
2013	+ log 6 "server_nxnode_echo: $@"
2014	[ "$SERVER_CHANNEL" = "1" ] && echo "$@"
2015	[ "$SERVER_CHANNEL" = "2" ] && echo "$@" >&2
2016	}
2017	@@ -839,18 +840,30 @@
2018	running)
2019	[ "$KILL_WAIT_PID" = "1" ] && kill $SERVER_WAIT_PID
2020	KILL_WAIT_PID=0
2021	+ log 6 session_status $uniqueid "Running"
2022	session_status $uniqueid "Running"
2023	[ "$SERVER_CHANNEL" = "1" ] && SERVER_CHANNEL=2
2024	;;
2025	closed)
2026	+ log 6 session_close $uniqueid
2027	session_close $uniqueid
2028	;;
2029	suspended)
2030	[ "$KILL_WAIT_PID" = "1" ] && kill $SERVER_WAIT_PID
2031	KILL_WAIT_PID=0
2032	+ log 6 session_suspend $uniqueid
2033	session_suspend $uniqueid
2034	;;
2035	+ suspending)
2036	+ log 6 session_status $uniqueid "Suspending"
2037	+ session_status $uniqueid "Suspending"
2038	+ # we need to stop sending to client as it will have already
2039	+ # closed his side of the channel and this will lead to not
2040	+ # closed sessions.
2041	+ SERVER_CHANNEL=0
2042	+ ;;
2043	terminating)
2044	+ log 6 session_status $uniqueid "Terminating"
2045	session_status $uniqueid "Terminating"
2046	# we need to stop sending to client as it will have already
2047	# closed his side of the channel and this will lead to not
2048	@@ -1340,6 +1353,7 @@
2049	PARAMS=$SERVER_PARAMS
2050	# TODO: This redirecion is crap here.
2051	server_nxnode_start --addprinter "$USER" "$PARAMS" >/dev/null 2>&1 \| log_error >/dev/null
2052	+ echo_x "NX> 719 CUPS printer: running"
2053	;;
2054	*)
2055	# disabled for 1.4.0-5 snapshot client
2056	@@ -1630,9 +1644,9 @@
2057	else
2058	CMD_PARAMS=$(cmd_parse_3_params "$2")
2059	[ -z "$CMD_PARAMS" ] && exit 1
2060	+ shift
2061	fi
2062	shift
2063	- shift
2064	for i in $CMD_PARAMS;
2065	do
2066	CMDLINE=$(session_get_cmdline $i)
2067	diff -Naur freenx-0.6.0/.svn/text-base/nxsetup.svn-base trunk/.svn/text-base/nxsetup.svn-base
2068	--- freenx-0.6.0/.svn/text-base/nxsetup.svn-base 2007-01-23 04:22:49.000000000 +0100
2069	+++ trunk/.svn/text-base/nxsetup.svn-base 2007-05-21 12:00:38.000000000 +0200
2070	@@ -193,6 +193,9 @@
2071
2072
2073	fi
2074	+
2075	+ # the nx user account might be locked, so unlock it.
2076	+ passwd -u nx
2077	}
2078
2079	install_nx()
2080	@@ -326,7 +329,16 @@
2081	chown -R nx:root $NX_ETC_DIR
2082	chown -R nx:root $NX_HOME_DIR
2083	chown nx:root "$NX_LOGFILE"
2084	+
2085	echo "done"
2086	+
2087	+ if [ -d "$CUPS_BACKEND" ]
2088	+ then
2089	+ echo -n "Setting up cups nxipp backend ..."
2090	+ cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND"
2091	+ chmod 755 "$CUPS_IPP_BACKEND"
2092	+ echo "done"
2093	+ fi
2094	}
2095
2096	test_nx()
2097	diff -Naur freenx-0.6.0/.svn/wcprops/AUTHORS.svn-work trunk/.svn/wcprops/AUTHORS.svn-work
2098	--- freenx-0.6.0/.svn/wcprops/AUTHORS.svn-work 1970-01-01 01:00:00.000000000 +0100
2099	+++ trunk/.svn/wcprops/AUTHORS.svn-work 2007-05-21 12:00:39.000000000 +0200
2100	@@ -0,0 +1,5 @@
2101	+K 25
2102	+svn:wc:ra_dav:version-url
2103	+V 61
2104	+/svnroot/repos/freenx/!svn/ver/96/freenx-server/trunk/AUTHORS
2105	+END
2106	diff -Naur freenx-0.6.0/.svn/wcprops/ChangeLog.svn-work trunk/.svn/wcprops/ChangeLog.svn-work
2107	--- freenx-0.6.0/.svn/wcprops/ChangeLog.svn-work 1970-01-01 01:00:00.000000000 +0100
2108	+++ trunk/.svn/wcprops/ChangeLog.svn-work 2007-05-21 12:00:39.000000000 +0200
2109	@@ -0,0 +1,5 @@
2110	+K 25
2111	+svn:wc:ra_dav:version-url
2112	+V 64
2113	+/svnroot/repos/freenx/!svn/ver/333/freenx-server/trunk/ChangeLog
2114	+END
2115	diff -Naur freenx-0.6.0/.svn/wcprops/CONTRIB.svn-work trunk/.svn/wcprops/CONTRIB.svn-work
2116	--- freenx-0.6.0/.svn/wcprops/CONTRIB.svn-work 1970-01-01 01:00:00.000000000 +0100
2117	+++ trunk/.svn/wcprops/CONTRIB.svn-work 2007-05-21 12:00:39.000000000 +0200
2118	@@ -0,0 +1,5 @@
2119	+K 25
2120	+svn:wc:ra_dav:version-url
2121	+V 61
2122	+/svnroot/repos/freenx/!svn/ver/96/freenx-server/trunk/CONTRIB
2123	+END
2124	diff -Naur freenx-0.6.0/.svn/wcprops/COPYING.svn-work trunk/.svn/wcprops/COPYING.svn-work
2125	--- freenx-0.6.0/.svn/wcprops/COPYING.svn-work 1970-01-01 01:00:00.000000000 +0100
2126	+++ trunk/.svn/wcprops/COPYING.svn-work 2007-05-21 12:00:39.000000000 +0200
2127	@@ -0,0 +1,5 @@
2128	+K 25
2129	+svn:wc:ra_dav:version-url
2130	+V 61
2131	+/svnroot/repos/freenx/!svn/ver/96/freenx-server/trunk/COPYING
2132	+END
2133	diff -Naur freenx-0.6.0/.svn/wcprops/gentoo-nomachine.diff.svn-work trunk/.svn/wcprops/gentoo-nomachine.diff.svn-work
2134	--- freenx-0.6.0/.svn/wcprops/gentoo-nomachine.diff.svn-work 1970-01-01 01:00:00.000000000 +0100
2135	+++ trunk/.svn/wcprops/gentoo-nomachine.diff.svn-work 2007-05-21 12:00:39.000000000 +0200
2136	@@ -0,0 +1,5 @@
2137	+K 25
2138	+svn:wc:ra_dav:version-url
2139	+V 76
2140	+/svnroot/repos/freenx/!svn/ver/201/freenx-server/trunk/gentoo-nomachine.diff
2141	+END
2142	diff -Naur freenx-0.6.0/.svn/wcprops/INSTALL.svn-work trunk/.svn/wcprops/INSTALL.svn-work
2143	--- freenx-0.6.0/.svn/wcprops/INSTALL.svn-work 1970-01-01 01:00:00.000000000 +0100
2144	+++ trunk/.svn/wcprops/INSTALL.svn-work 2007-05-21 12:00:39.000000000 +0200
2145	@@ -0,0 +1,5 @@
2146	+K 25
2147	+svn:wc:ra_dav:version-url
2148	+V 62
2149	+/svnroot/repos/freenx/!svn/ver/222/freenx-server/trunk/INSTALL
2150	+END
2151	diff -Naur freenx-0.6.0/.svn/wcprops/node.conf.sample.svn-work trunk/.svn/wcprops/node.conf.sample.svn-work
2152	--- freenx-0.6.0/.svn/wcprops/node.conf.sample.svn-work 1970-01-01 01:00:00.000000000 +0100
2153	+++ trunk/.svn/wcprops/node.conf.sample.svn-work 2007-05-21 12:00:39.000000000 +0200
2154	@@ -0,0 +1,5 @@
2155	+K 25
2156	+svn:wc:ra_dav:version-url
2157	+V 71
2158	+/svnroot/repos/freenx/!svn/ver/306/freenx-server/trunk/node.conf.sample
2159	+END
2160	diff -Naur freenx-0.6.0/.svn/wcprops/nxcheckload.sample.svn-work trunk/.svn/wcprops/nxcheckload.sample.svn-work
2161	--- freenx-0.6.0/.svn/wcprops/nxcheckload.sample.svn-work 1970-01-01 01:00:00.000000000 +0100
2162	+++ trunk/.svn/wcprops/nxcheckload.sample.svn-work 2007-05-21 12:00:39.000000000 +0200
2163	@@ -0,0 +1,5 @@
2164	+K 25
2165	+svn:wc:ra_dav:version-url
2166	+V 73
2167	+/svnroot/repos/freenx/!svn/ver/239/freenx-server/trunk/nxcheckload.sample
2168	+END
2169	diff -Naur freenx-0.6.0/.svn/wcprops/nxclient.svn-work trunk/.svn/wcprops/nxclient.svn-work
2170	--- freenx-0.6.0/.svn/wcprops/nxclient.svn-work 1970-01-01 01:00:00.000000000 +0100
2171	+++ trunk/.svn/wcprops/nxclient.svn-work 2007-05-21 12:00:39.000000000 +0200
2172	@@ -0,0 +1,5 @@
2173	+K 25
2174	+svn:wc:ra_dav:version-url
2175	+V 63
2176	+/svnroot/repos/freenx/!svn/ver/289/freenx-server/trunk/nxclient
2177	+END
2178	diff -Naur freenx-0.6.0/.svn/wcprops/nxcups-gethost.svn-work trunk/.svn/wcprops/nxcups-gethost.svn-work
2179	--- freenx-0.6.0/.svn/wcprops/nxcups-gethost.svn-work 1970-01-01 01:00:00.000000000 +0100
2180	+++ trunk/.svn/wcprops/nxcups-gethost.svn-work 2007-05-21 12:00:39.000000000 +0200
2181	@@ -0,0 +1,5 @@
2182	+K 25
2183	+svn:wc:ra_dav:version-url
2184	+V 69
2185	+/svnroot/repos/freenx/!svn/ver/306/freenx-server/trunk/nxcups-gethost
2186	+END
2187	diff -Naur freenx-0.6.0/.svn/wcprops/nxkeygen.svn-work trunk/.svn/wcprops/nxkeygen.svn-work
2188	--- freenx-0.6.0/.svn/wcprops/nxkeygen.svn-work 1970-01-01 01:00:00.000000000 +0100
2189	+++ trunk/.svn/wcprops/nxkeygen.svn-work 2007-05-21 12:00:39.000000000 +0200
2190	@@ -0,0 +1,5 @@
2191	+K 25
2192	+svn:wc:ra_dav:version-url
2193	+V 63
2194	+/svnroot/repos/freenx/!svn/ver/227/freenx-server/trunk/nxkeygen
2195	+END
2196	diff -Naur freenx-0.6.0/.svn/wcprops/nxloadconfig.svn-work trunk/.svn/wcprops/nxloadconfig.svn-work
2197	--- freenx-0.6.0/.svn/wcprops/nxloadconfig.svn-work 1970-01-01 01:00:00.000000000 +0100
2198	+++ trunk/.svn/wcprops/nxloadconfig.svn-work 2007-05-21 12:00:39.000000000 +0200
2199	@@ -0,0 +1,5 @@
2200	+K 25
2201	+svn:wc:ra_dav:version-url
2202	+V 67
2203	+/svnroot/repos/freenx/!svn/ver/307/freenx-server/trunk/nxloadconfig
2204	+END
2205	diff -Naur freenx-0.6.0/.svn/wcprops/nxnode-login.svn-work trunk/.svn/wcprops/nxnode-login.svn-work
2206	--- freenx-0.6.0/.svn/wcprops/nxnode-login.svn-work 1970-01-01 01:00:00.000000000 +0100
2207	+++ trunk/.svn/wcprops/nxnode-login.svn-work 2007-05-21 12:00:39.000000000 +0200
2208	@@ -0,0 +1,5 @@
2209	+K 25
2210	+svn:wc:ra_dav:version-url
2211	+V 67
2212	+/svnroot/repos/freenx/!svn/ver/231/freenx-server/trunk/nxnode-login
2213	+END
2214	diff -Naur freenx-0.6.0/.svn/wcprops/nxnode.svn-work trunk/.svn/wcprops/nxnode.svn-work
2215	--- freenx-0.6.0/.svn/wcprops/nxnode.svn-work 1970-01-01 01:00:00.000000000 +0100
2216	+++ trunk/.svn/wcprops/nxnode.svn-work 2007-05-21 12:00:39.000000000 +0200
2217	@@ -0,0 +1,5 @@
2218	+K 25
2219	+svn:wc:ra_dav:version-url
2220	+V 61
2221	+/svnroot/repos/freenx/!svn/ver/333/freenx-server/trunk/nxnode
2222	+END
2223	diff -Naur freenx-0.6.0/.svn/wcprops/nxprint.svn-work trunk/.svn/wcprops/nxprint.svn-work
2224	--- freenx-0.6.0/.svn/wcprops/nxprint.svn-work 1970-01-01 01:00:00.000000000 +0100
2225	+++ trunk/.svn/wcprops/nxprint.svn-work 2007-05-21 12:00:39.000000000 +0200
2226	@@ -0,0 +1,5 @@
2227	+K 25
2228	+svn:wc:ra_dav:version-url
2229	+V 62
2230	+/svnroot/repos/freenx/!svn/ver/289/freenx-server/trunk/nxprint
2231	+END
2232	diff -Naur freenx-0.6.0/.svn/wcprops/nxserver.svn-work trunk/.svn/wcprops/nxserver.svn-work
2233	--- freenx-0.6.0/.svn/wcprops/nxserver.svn-work 1970-01-01 01:00:00.000000000 +0100
2234	+++ trunk/.svn/wcprops/nxserver.svn-work 2007-05-21 12:00:39.000000000 +0200
2235	@@ -0,0 +1,5 @@
2236	+K 25
2237	+svn:wc:ra_dav:version-url
2238	+V 63
2239	+/svnroot/repos/freenx/!svn/ver/324/freenx-server/trunk/nxserver
2240	+END
2241	diff -Naur freenx-0.6.0/.svn/wcprops/nxsetup.svn-work trunk/.svn/wcprops/nxsetup.svn-work
2242	--- freenx-0.6.0/.svn/wcprops/nxsetup.svn-work 1970-01-01 01:00:00.000000000 +0100
2243	+++ trunk/.svn/wcprops/nxsetup.svn-work 2007-05-21 12:00:39.000000000 +0200
2244	@@ -0,0 +1,5 @@
2245	+K 25
2246	+svn:wc:ra_dav:version-url
2247	+V 62
2248	+/svnroot/repos/freenx/!svn/ver/330/freenx-server/trunk/nxsetup
2249	+END