[FreeNX-kNX] [PATCH] 1.5.0 Client compatibility

[Tim Jordan]

Fabian Franz wrote:

>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>Hi,
>
>sorry that it took so long, but I was busy with private stuff.
>
>Anyway, here is a patch which fixes reconnection with 1.5.0 clients and should 
>also work with 1.4.0 clients.
>
>The error came as the 1.4.0 client was a bit more lazier than the 1.5.0 client 
>is, so we now need to send the exact format expected by the client. Anyways 
>the format line in the patch should also help nxclient / kNX developers to 
>make reconnection with free clients possible.
>
>cu
>
>Fabian
>-----BEGIN PGP SIGNATURE-----
>Version: GnuPG v1.2.4 (GNU/Linux)
>
>iD8DBQFC5l7CI0lSH7CXz7MRAiMBAJ0WARNKfS2QoEXdC3pnS4mWXSzCrACeIbeU
>mIGWqpd2gq6TVAGwz3Q8OQk=
>=YsOw
>-----END PGP SIGNATURE-----
>  
>
>------------------------------------------------------------------------
>
>Index: nxserver
>===================================================================
>RCS file: /cvsroot/freenx/freenx/nxserver,v
>retrieving revision 1.64
>diff -u -u -r1.64 nxserver
>--- nxserver	16 Jul 2005 15:45:37 -0000	1.64
>+++ nxserver	26 Jul 2005 15:57:30 -0000
>@@ -223,7 +223,7 @@
> 		echo "------- ---------------- -------------------------------- -------- ----- -------------- --------- ----------------------" >> $TMPFILE
> 	else
> 		echo "Display Type             Session ID                       Options  Depth Screen         Status      Session Name" >> $TMPFILE
>-		echo " ------- ---------------- -------------------------------- -------- ----- -------------- ----------- ------------------------------" >> $TMPFILE
>+		echo "------- ---------------- -------------------------------- -------- ----- -------------- ----------- ------------------------------" >> $TMPFILE
> 	fi
> 	for i in $NX_SESS_DIR/running/*
> 	do
>@@ -249,7 +249,7 @@
> 			then
> 				available="Yes"
> 			fi
>-			echo -e "$(getparam display)\t$(getparam type)\t$(getparam sessionId)\t$options\t$depth\t$geom\t$available\t$(getparam sessionName)" >> $TMPFILE
>+			printf "%-7s %-16s %32s %8s %5s %-14s %-11s %s" "$(getparam display)" "$(getparam type)" "$(getparam sessionId)" "$options" "$depth" "$geom" "$available" "$(getparam sessionName)" >> $TMPFILE
> 		fi
> 		egrep -q "^userName=$1$" $i && let SESSION_COUNT_USER=$SESSION_COUNT_USER+1
> 	done
>@@ -894,6 +894,9 @@
> 			then
> 				# disabled due to problems with 1.4.0-5 client
> 				#session_list_user_suspended "$USER" 'Suspended$|^status=Running$' "$(getparam geometry)" "$(getparam type)" | log_tee
>+				session_list_user_suspended "$USER" 'Suspended' "$(getparam geometry)" "$(getparam type)" | log_tee
>+			elif [ "$status" = "suspended,running" -o "$status" = "suspended" ] # since 1.5.0
>+			then
> 				session_list_user_suspended "$USER" 'Suspended' "$(getparam geometry)" "$(getparam type)" | log_tee
> 			else
> 				session_list_user "$USER" | log_tee
>  
>
>------------------------------------------------------------------------
>
>_______________________________________________
>FreeNX-kNX mailing list
>FreeNX-kNX at kde.org
>https://mail.kde.org/mailman/listinfo/freenx-knx
>  
>
How do I apply this patch to my freenx server?  I read the man page for 
patch and I'm still not positive on how this should work.  I understand 
the idea - its the syntax I'm stuck on.

patch -p0 < nxserver



I'm running Debian, Package: freenx Version: 0.4.2-0a1.

Thanks,
Tim