WIP freenx 0.7 with NX 3.0 support

svn path=/testing/; revision=192

3 files changed, 82 insertions, 1 deletions

diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 6973843..3ce21d4 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,5 +1,6 @@
 AUX nxserver-freenx-0.6.0-nxloadconfig.patch 2823 RMD160 e3f4a7f32e3962690ba2704c612220f8dc99cb44 SHA1 58ea968770e729a029e05ce6934eb16339d0955c SHA256 660f3bf731114f9ea9cf0129649d95a3b1ac0dd219541ddf6866ed2ede725179
 AUX nxserver-freenx-0.7.0-kdecups.patch 1373 RMD160 34227f429683b4d718321fb696faf5e05ed665dc SHA1 181797315f96fc9b2af32f975d6401deaa169023 SHA256 ad010a7b5d4f1874d9f4e60f18de370eb4a0b1e4ca78aff225918302b00d1ad2
+AUX nxserver-freenx-0.7.0-nx3support.patch 3980 RMD160 6a77fb0f0ba4bc5fd13fc3138109074611216994 SHA1 9f792653cc0827432d90b5bb65b95864db8277b0 SHA256 ebc083d044978ffbb3fc5aba471a4248823657659e5cb780640a8ea0dfa763cc
 AUX nxserver-freenx-0.7.0-xfsfonts.patch 583 RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 SHA1 8d33b566cc23e52f25b356c4ce9a8675661fc440 SHA256 d5bc41d43d46728d770be26680970e8f1608b1aa97e1e0bb2f0cf34bd6c591df
 DIST freenx-0.7.0.tar.gz 57614 RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 SHA1 243f0c98f02b1c84c59e5b324a5a7e6d3d3d8db3 SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9
-EBUILD nxserver-freenx-0.7.0-r1.ebuild 3178 RMD160 69d10be5b57868eeb151b7f816ff7789bebc6cd0 SHA1 b60f03933e1b2e8b74a07f3212782defc903654b SHA256 de9dead7531334ae8f159d121863cf6283471b2aa4191a2c9ded6b2bf7b76408
+EBUILD nxserver-freenx-0.7.0-r1.ebuild 3220 RMD160 04072c9dd47831f50ca1c9944d734f56679c238a SHA1 5a44b63d94284af9b832acf125ab6adcbfafd13b SHA256 11e346cdacd10ad18d4c59d7c0862d1edf2bd7981b516296bd5a21e8c1c8c584
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
new file mode 100644
index 0000000..d8d06a4
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
@@ -0,0 +1,79 @@
+diff -Naur freenx-0.7.0.orig/node.conf freenx-0.7.0/node.conf
+--- freenx-0.7.0.orig/node.conf	2007-09-17 14:11:10.000000000 +0200
++++ freenx-0.7.0/node.conf	2007-09-17 14:13:39.000000000 +0200
+@@ -378,6 +378,9 @@
+ # When you installed a 2.0.0 NX Backend, set this to 1.
+ #ENABLE_2_0_0_BACKEND="0"
+ 
++# When you installed a 3.0.0 NX Backend, set this to 1.
++#ENABLE_3_0_0_BACKEND="0"
++
+ # When set to 1 this will automatically resume started sessions
+ #ENABLE_AUTORECONNECT="0"
+ 
+diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
+--- freenx-0.7.0.orig/nxloadconfig	2007-09-17 14:11:10.000000000 +0200
++++ freenx-0.7.0/nxloadconfig	2007-09-17 14:19:00.000000000 +0200
+@@ -184,6 +184,7 @@
+ # Misc directives
+ 
+ ENABLE_2_0_0_BACKEND=""
++ENABLE_3_0_0_BACKEND=""
+ ENABLE_AUTORECONNECT="0"
+ ENABLE_AUTORECONNECT_BEFORE_140="1"
+ EXPORT_USERIP="0"
+@@ -275,13 +276,19 @@
+ [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
+ [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
+ [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
+-[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
++[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXcompshad.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
+ if [ -z "$ENABLE_2_0_0_BACKEND" ]
+ then
+ 	ENABLE_2_0_0_BACKEND="1"
+ 	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
+ fi 
+ 
++if [ -z "$ENABLE_3_0_0_BACKEND" ]
++then
++	ENABLE_3_0_0_BACKEND="1"
++	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 3.[01].0')" ] && ENABLE_3_0_0_BACKEND="0"
++fi
++
+ [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
+ [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+ 
+@@ -535,8 +542,8 @@
+ 	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
+ 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
+ 
+-	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
+-		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
++	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
++		ERROR="yes" && echo "Error: Could not find 1.5.0, 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 to 3.0.0 backend is needed for this version of FreeNX."
+ 		
+ 	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
+ 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
+diff -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
+--- freenx-0.7.0.orig/nxnode	2007-09-17 14:11:10.000000000 +0200
++++ freenx-0.7.0/nxnode	2007-09-17 14:20:34.000000000 +0200
+@@ -414,7 +414,7 @@
+ 	# backingstore
+ 	
+ 	B=""
+-	if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ]
++	if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" -a "$ENABLE_3_0_0_BACKEND" != "1" ]
+ 	then
+ 		[ "$backingstore" != 1 ] && B="-bs $backingstore"
+ 		[ "$backingstore" = 1 ] && B="+bs"
+@@ -942,8 +942,8 @@
+ 
+ node_start_monitor()
+ {
+-	[ "$ENABLE_2_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
+-	[ "$ENABLE_2_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
++	[ "$ENABLE_2_0_0_BACKEND" = "1" || "$ENABLE_3_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
++	[ "$ENABLE_2_0_0_BACKEND" = "1" || "$ENABLE_3_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
+ }
+ 
+ #
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
index dcb26b5..c146fdc 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
@@ -51,6 +51,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.6.0-nxloadconfig.patch
 	epatch ${FILESDIR}/${P}-kdecups.patch
 	epatch ${FILESDIR}/${P}-xfsfonts.patch
+	epatch ${FILESDIR}/${P}-nx3support.patch
 
 	# Fix DISPLAY for XCB-enabled systems
 	sed -i "s/unix:/:/g" nxnode || die