Fixed rootless mode image compression

svn path=/testing/; revision=132

4 files changed, 49 insertions, 33 deletions

diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index dd693bc..94b6be1 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,7 +1,3 @@
-AUX nxserver-freenx-0.6.0-fullscreen.patch 752 RMD160 206ac906a4bbac650f6408f6c74d67fcc73a7cec SHA1 1608700493319bf6d8a019fb8440d82c087862ed SHA256 7247807b1e7775f6d2e072dc95634cd622a68b54b7a3de4a488ffdf8fc5c76a6
-MD5 079512120f28b48334604fb710130f47 files/nxserver-freenx-0.6.0-fullscreen.patch 752
-RMD160 206ac906a4bbac650f6408f6c74d67fcc73a7cec files/nxserver-freenx-0.6.0-fullscreen.patch 752
-SHA256 7247807b1e7775f6d2e072dc95634cd622a68b54b7a3de4a488ffdf8fc5c76a6 files/nxserver-freenx-0.6.0-fullscreen.patch 752
 AUX nxserver-freenx-0.6.0-nxloadconfig.patch 2823 RMD160 e3f4a7f32e3962690ba2704c612220f8dc99cb44 SHA1 58ea968770e729a029e05ce6934eb16339d0955c SHA256 660f3bf731114f9ea9cf0129649d95a3b1ac0dd219541ddf6866ed2ede725179
 MD5 8f0661a55bfdfef0c29c4b9df82e9857 files/nxserver-freenx-0.6.0-nxloadconfig.patch 2823
 RMD160 e3f4a7f32e3962690ba2704c612220f8dc99cb44 files/nxserver-freenx-0.6.0-nxloadconfig.patch 2823
@@ -10,11 +6,15 @@ AUX nxserver-freenx-0.6.0-rdesktop.patch 321 RMD160 27b3ea1ac16fe20f0a516151ca05
 MD5 103110225d1c3c695cf6619f4c00c294 files/nxserver-freenx-0.6.0-rdesktop.patch 321
 RMD160 27b3ea1ac16fe20f0a516151ca057c5ad965d48a files/nxserver-freenx-0.6.0-rdesktop.patch 321
 SHA256 b6cf0b897fbbcfa535c09ba87221b8930276970202dadf662f134bb0dc01acc6 files/nxserver-freenx-0.6.0-rdesktop.patch 321
+AUX nxserver-freenx-0.6.0-rootless-mode.patch 1999 RMD160 58e9377f80bb3db572aaf106c81248b760800420 SHA1 7fefa92c0bfdd64813e938f9a3825e66d42f903e SHA256 725095ce655285780fb413fac2c89f8925c1fa5a458af8c19efdcf4427fb33ec
+MD5 ed8aa2546babafe902fd99bcb3823ff9 files/nxserver-freenx-0.6.0-rootless-mode.patch 1999
+RMD160 58e9377f80bb3db572aaf106c81248b760800420 files/nxserver-freenx-0.6.0-rootless-mode.patch 1999
+SHA256 725095ce655285780fb413fac2c89f8925c1fa5a458af8c19efdcf4427fb33ec files/nxserver-freenx-0.6.0-rootless-mode.patch 1999
 DIST freenx-0.6.0.tar.gz 110758 RMD160 6000d5fed4d11dbb4c750b43c81626991460ccbb SHA1 c43ce0462fa6c7fe84d5c7db8e5c14dc8ab2feed SHA256 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca
-EBUILD nxserver-freenx-0.6.0.ebuild 2950 RMD160 1518345419e27d71297b9bfe2fba4fb44a4e1138 SHA1 b52d8f21db1c731ba00d34a8acf258ed62e1e073 SHA256 a5cecbc9ecc2fe0ab45bbdca497667d7c9ff3c74d26dde84acb1f9b6e8165a4c
-MD5 fbc173f1af40225539aa18922700af83 nxserver-freenx-0.6.0.ebuild 2950
-RMD160 1518345419e27d71297b9bfe2fba4fb44a4e1138 nxserver-freenx-0.6.0.ebuild 2950
-SHA256 a5cecbc9ecc2fe0ab45bbdca497667d7c9ff3c74d26dde84acb1f9b6e8165a4c nxserver-freenx-0.6.0.ebuild 2950
+EBUILD nxserver-freenx-0.6.0.ebuild 2973 RMD160 e51468d79266039b63ace805b6a5937c543147dc SHA1 a06b3a122910eb3a5f5d34cfea88f425ccf223f0 SHA256 28942664520e50183c7331c769d14a99ba9bb819590057b04e7bf7817b4441d4
+MD5 e527817a88340f56227ac2e15fd57e98 nxserver-freenx-0.6.0.ebuild 2973
+RMD160 e51468d79266039b63ace805b6a5937c543147dc nxserver-freenx-0.6.0.ebuild 2973
+SHA256 28942664520e50183c7331c769d14a99ba9bb819590057b04e7bf7817b4441d4 nxserver-freenx-0.6.0.ebuild 2973
 MD5 4ea9feb54f34954f8d43c80f44a2cd9a files/digest-nxserver-freenx-0.6.0 238
 RMD160 4d8159168dc51338e9ab715840a060628a0234b2 files/digest-nxserver-freenx-0.6.0 238
 SHA256 1d10b1f32814e055aa8289983618c869f3b5a7cc1718c5b943fe32e2e8bfd509 files/digest-nxserver-freenx-0.6.0 238
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-fullscreen.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-fullscreen.patch
deleted file mode 100644
index a8bdc45..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-fullscreen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- freenx-0.6.0/nxnode	2006-10-05 21:24:20.000000000 +0200
-+++ freenx-0.6.0/nxnode	2006-10-05 21:21:11.000000000 +0200
-@@ -629,6 +629,10 @@
- 	imagecompressionmethod=$(getparam imagecompressionmethod)
- 	imagecompressionlevel=$(getparam imagecompressionlevel)
- 	geometry=$(getparam geometry)
-+	
-+	# fullscreen variable added to fix fullscreen on client login
-+	fullscreen=$(getparam fullscreen)
-+	
- 	keyboard=$(getparam keyboard)
- 	kbtype=$(getparam kbtype)
- 	media=$(getparam media)
-@@ -664,7 +668,8 @@
- 	status=$(getparam status)
- 	host=$(getparam host)
- 
--	fullscreen=""
-+#	commented out to fix fullscreen on client login
-+#	fullscreen=""
- 	[ "$geometry" = "fullscreen" ] && fullscreen="1"
- 
- 	[ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch
new file mode 100644
index 0000000..eb30df2
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch
@@ -0,0 +1,39 @@
+--- freenx-server/trunk/nxnode	2007/02/04 01:05:52	313
++++ freenx-server/trunk/nxnode	2007/02/25 23:50:49	331
+@@ -969,7 +969,7 @@
+ 	sync=$(getparam sync)
+ 	samba=$(getparam samba)
+ 	cups=$(getparam cups)
+-	agent_server=$(getparam agent_server)
++	agent_server=$(getparam agent_server | sed 's/%3A/:/g')
+ 	agent_user=$(getparam agent_user)
+ 	agent_password=$(getparam agent_password)
+ 	agent_domain=$(getparam agent_domain)
+@@ -991,13 +991,17 @@
+ 	rootless=0
+ 	# Its still the clients decision
+ 	[ "$ENABLE_ROOTLESS_MODE" = "1" ] &&  rootless=$(getparam rootless)
++
++	# Rootless fix from 2x nxserver 1.5.0
++	realtype=$type
++	[ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop"
+ 	
+ 	# FreeNX specific variables
+ 	clientproto=$(getparam clientproto)
+ 	status=$(getparam status)
+ 	host=$(getparam host)
+ 
+-	fullscreen=""
++	fullscreen=$(getparam fullscreen)
+ 	[ "$geometry" = "fullscreen" ] && fullscreen="1"
+ 
+ 	[ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
+@@ -1061,7 +1065,7 @@
+ 	umask 0077
+ 
+ cat << EOF > $USER_FAKE_HOME/.nx/C-$sess_id/options
+-${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
++${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
+ EOF
+ 	umask $OLD_UMASK
+ #samba=$samba,
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.6.0.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.6.0.ebuild
index 21fc614..7f0997c 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.6.0.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.6.0.ebuild
@@ -39,8 +39,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# fix fullscreen support; see bug 150200
-	epatch ${FILESDIR}/${P}-fullscreen.patch
+	# fix fullscreen support and rootless mode image compression
+	epatch ${FILESDIR}/${P}-rootless-mode.patch
 	# fix rdesktop/vnc proxying
 	epatch ${FILESDIR}/${P}-rdesktop.patch