freenx 0.5 support for NX 2.x clients

Package-Manager: portage-2.1.2.2

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 317ed7748409afe76256c0e818859035411fa21c..54589c55d74f0ef8354dc01e7445e5d7a3d6887b 100644 (file)
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.20 2007/03/21 10:15:49 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.21 2007/03/21 12:18:15 voyageur Exp $
+
+*nxserver-freenx-0.5.0-r2 (21 Mar 2007)
+
+  21 Mar 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/freenx-0.5.0-backingstore.patch, -nxserver-freenx-0.5.0-r1.ebuild,
+  +nxserver-freenx-0.5.0-r2.ebuild:
+  Added support for 2.x NX clients, closes bug #155063
 
 *nxserver-freenx-0.6.0 (21 Mar 2007)
 

diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index eb30bd9021feca2175fd063e047e10f15fbe842f..7c5a33690663bd8c67d4f966acda2d963551bce1 100644 (file)
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -2,6 +2,10 @@ AUX 50nxserver 80 RMD160 204c4cffc4832609451e69a78a75d0572b74b0f1 SHA1 02c98a293
 MD5 41f95f92c9e230d7cd356504a8e56269 files/50nxserver 80
 RMD160 204c4cffc4832609451e69a78a75d0572b74b0f1 files/50nxserver 80
 SHA256 7572b8195b5b1ba83f429ddc11be44b3496810e05adbc1c233788085bcf8e365 files/50nxserver 80
+AUX freenx-0.5.0-backingstore.patch 1505 RMD160 bb046ea3641a3d3f4479b2a705a042142214cef2 SHA1 cf946f07cdbce3c3e150647c5761e64e1f37cd12 SHA256 8165b0acaec15da98e90aaf630dfdef654e0f2271e1a19a2dbc67fc4f717ba88
+MD5 7dd1722a45fa03e0b64d02aa5abba53c files/freenx-0.5.0-backingstore.patch 1505
+RMD160 bb046ea3641a3d3f4479b2a705a042142214cef2 files/freenx-0.5.0-backingstore.patch 1505
+SHA256 8165b0acaec15da98e90aaf630dfdef654e0f2271e1a19a2dbc67fc4f717ba88 files/freenx-0.5.0-backingstore.patch 1505
 AUX freenx-0.5.0-fullscreen.patch 742 RMD160 051282cd14faa40a8dffed131aaaee7b9a786dde SHA1 982c4494dab50270c52ecb37ee82703dcf70e6d0 SHA256 5b207a3282fb5dee52f271668af306df82cd2f14593f48497a895fec397e0e45
 MD5 46aacff8b2ed5e40ae9545fc51f7c72c files/freenx-0.5.0-fullscreen.patch 742
 RMD160 051282cd14faa40a8dffed131aaaee7b9a786dde files/freenx-0.5.0-fullscreen.patch 742
@@ -24,25 +28,25 @@ RMD160 58e9377f80bb3db572aaf106c81248b760800420 files/nxserver-freenx-0.6.0-root
 SHA256 725095ce655285780fb413fac2c89f8925c1fa5a458af8c19efdcf4427fb33ec files/nxserver-freenx-0.6.0-rootless-mode.patch 1999
 DIST freenx-0.5.0-5.fc5.i386.rpm 62859 RMD160 1c7bef90d5610ab265d9a66253d2bda1663e6e1a SHA1 b8845b592ee3818f028b3201b17912ce1820d45b SHA256 8d5224e825191d330e85996815f1b2ecb8b733853c24e7704cf0ea7b52237016
 DIST freenx-0.6.0.tar.gz 110758 RMD160 6000d5fed4d11dbb4c750b43c81626991460ccbb SHA1 c43ce0462fa6c7fe84d5c7db8e5c14dc8ab2feed SHA256 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca
-EBUILD nxserver-freenx-0.5.0-r1.ebuild 3281 RMD160 da387b20eec64a774892491c812b02b938835cfd SHA1 bdc06a17c9eede06363d6641d8baee9a58594edf SHA256 007a69d29ee824849b1b2f50b15c65aa66910c4c3abb47cec9e90de62a296ff7
-MD5 e5ae77e91d1a3026f9f3a5ae9d188da1 nxserver-freenx-0.5.0-r1.ebuild 3281
-RMD160 da387b20eec64a774892491c812b02b938835cfd nxserver-freenx-0.5.0-r1.ebuild 3281
-SHA256 007a69d29ee824849b1b2f50b15c65aa66910c4c3abb47cec9e90de62a296ff7 nxserver-freenx-0.5.0-r1.ebuild 3281
+EBUILD nxserver-freenx-0.5.0-r2.ebuild 3376 RMD160 0863cda0e555c9fe94e1b3a80269ce614fe65be2 SHA1 cf3bd4b8717760e9f5a386d39ee819ff27f7bea7 SHA256 d8ad205870bae2557be3fcfa2feb0ee734fb16a0b70b9242ed244e07c4c29b7f
+MD5 69bd19d864646d0ce85719cd197830c6 nxserver-freenx-0.5.0-r2.ebuild 3376
+RMD160 0863cda0e555c9fe94e1b3a80269ce614fe65be2 nxserver-freenx-0.5.0-r2.ebuild 3376
+SHA256 d8ad205870bae2557be3fcfa2feb0ee734fb16a0b70b9242ed244e07c4c29b7f nxserver-freenx-0.5.0-r2.ebuild 3376
 EBUILD nxserver-freenx-0.6.0.ebuild 3144 RMD160 0b0517293bb4e61dac00bab97c5b2ec7c1aaa686 SHA1 51d28cd37fda851f3c5412ec59e0b4a2dd8487b4 SHA256 89eedb19f833994ef4c3097666183760597e243df919796c71286e84bb887005
 MD5 35741335731014f7d447722002359a64 nxserver-freenx-0.6.0.ebuild 3144
 RMD160 0b0517293bb4e61dac00bab97c5b2ec7c1aaa686 nxserver-freenx-0.6.0.ebuild 3144
 SHA256 89eedb19f833994ef4c3097666183760597e243df919796c71286e84bb887005 nxserver-freenx-0.6.0.ebuild 3144
-MISC ChangeLog 5474 RMD160 d0c42745979d82e7dee5a82378ba82573c3ab94d SHA1 53f807e14a221c75d29cad346044ea9a472bb8fc SHA256 3728f7a16c9a0d462880dc1157bf7500cc13990516bca400f5db3ecf56dca9c0
-MD5 a49ccd0d51635603646065c6ad1f086c ChangeLog 5474
-RMD160 d0c42745979d82e7dee5a82378ba82573c3ab94d ChangeLog 5474
-SHA256 3728f7a16c9a0d462880dc1157bf7500cc13990516bca400f5db3ecf56dca9c0 ChangeLog 5474
+MISC ChangeLog 5738 RMD160 6232b5a38b0e748069d228176a9dc1140ddcd39f SHA1 b3ca1eccc03186211fc029e3e28cf9d5fdb99ff8 SHA256 9c0903f26d4e7bf3662eacca2d77bdd870f865892c32cc401a9ecd6e13eb787f
+MD5 ef0ca070702a1174ca22a2d4619ba4dd ChangeLog 5738
+RMD160 6232b5a38b0e748069d228176a9dc1140ddcd39f ChangeLog 5738
+SHA256 9c0903f26d4e7bf3662eacca2d77bdd870f865892c32cc401a9ecd6e13eb787f ChangeLog 5738
 MISC metadata.xml 408 RMD160 e5193193aa6b11401022a5305d40e4e5ae02c2ff SHA1 b199e3103229679f5ed7d67dc6905829c72c3cd8 SHA256 6e556018a6e5ccaf89964e0c15ac17b003b28be6a1fdaecb1248a0e327d1c913
 MD5 46ff6527382760d6e09477269567bba5 metadata.xml 408
 RMD160 e5193193aa6b11401022a5305d40e4e5ae02c2ff metadata.xml 408
 SHA256 6e556018a6e5ccaf89964e0c15ac17b003b28be6a1fdaecb1248a0e327d1c913 metadata.xml 408
-MD5 6c95395d73159a977cb252ca79283e16 files/digest-nxserver-freenx-0.5.0-r1 259
-RMD160 e40911d7dbe507a6946045b0edf6adae50b6aea7 files/digest-nxserver-freenx-0.5.0-r1 259
-SHA256 32a053208d0c362191602daff58fecb0fae0fa297ff75ad39686e42de35b18d5 files/digest-nxserver-freenx-0.5.0-r1 259
+MD5 6c95395d73159a977cb252ca79283e16 files/digest-nxserver-freenx-0.5.0-r2 259
+RMD160 e40911d7dbe507a6946045b0edf6adae50b6aea7 files/digest-nxserver-freenx-0.5.0-r2 259
+SHA256 32a053208d0c362191602daff58fecb0fae0fa297ff75ad39686e42de35b18d5 files/digest-nxserver-freenx-0.5.0-r2 259
 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/digest-nxserver-freenx-0.5.0-r1 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r2
similarity index 100%
rename from net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r1
rename to net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r2

diff --git a/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch
new file mode 100644 (file)
index 0000000..2abef89
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch
@@ -0,0 +1,37 @@
+diff -ruN freenx~/etc/nxserver/node.conf.sample freenx/etc/nxserver/node.conf.sample
+--- freenx~/etc/nxserver/node.conf.sample      2006-09-29 17:46:03.000000000 +0200
++++ freenx/etc/nxserver/node.conf.sample       2006-11-21 12:12:03.254604158 +0100
+@@ -346,7 +346,7 @@
+ #########################################################################
+ 
+ # When you installed a 2.0.0 NX Backend, set this to 1.
+-#ENABLE_2_0_0_BACKEND="1"
++#ENABLE_2_0_0_BACKEND="0"
+ 
+ # When set to 1 this will automatically resume started sessions
+ #ENABLE_AUTORECONNECT="0"
+diff -ruN freenx~/usr/bin/nxloadconfig freenx/usr/bin/nxloadconfig
+--- freenx~/usr/bin/nxloadconfig       2006-09-29 17:46:03.000000000 +0200
++++ freenx/usr/bin/nxloadconfig        2006-11-21 12:11:48.400187438 +0100
+@@ -173,7 +173,7 @@
+ 
+ # Misc directives
+ 
+-ENABLE_2_0_0_BACKEND="1"
++ENABLE_2_0_0_BACKEND="0"
+ ENABLE_AUTORECONNECT="0"
+ ENABLE_AUTORECONNECT_BEFORE_140="1"
+ EXPORT_USERIP="0"
+diff -ruN freenx~/usr/bin/nxnode freenx/usr/bin/nxnode
+--- freenx~/usr/bin/nxnode     2006-09-29 17:46:03.000000000 +0200
++++ freenx/usr/bin/nxnode      2006-11-21 12:11:01.696589165 +0100
+@@ -252,7 +252,8 @@
+       [ -n "$keyboard" ] && K="-keyboard $keyboard"
+       [ -n "$kbtype" ] && K="-kbtype $kbtype"
+       B=""
+-      [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ] && B="-bs $backingstore"
++      [ -n "$backingstore" -a "$backingstore" = "1" ] && B="+bs"
++      [ -n "$backingstore" -a "$backingstore" != "1" ] && B="-bs $backingstore"
+       G=""
+       [ -n "$geometry" ] && G="-geometry $geometry"
+       R="-D"

diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild
similarity index 94%
rename from net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
rename to net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild
index eb207cd7fa050a7c5cefd3c32d1e74babdd861a6..b1b0c8082300e01174b527459ccd2e0c1ef0db71 100644 (file)
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild,v 1.1 2006/11/08 21:46:59 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild,v 1.1 2007/03/21 12:18:15 voyageur Exp $
 
 inherit multilib eutils rpm
 
@@ -47,6 +47,8 @@ src_unpack() {
        epatch ${FILESDIR}/freenx-0.5.0-startup.patch
        # fix fullscreen support; see bug 150200
        epatch ${FILESDIR}/freenx-0.5.0-fullscreen.patch
+       # fix newer clients support; bug 155063
+       epatch ${FILESDIR}/freenx-0.5.0-backingstore.patch
 
        mv etc/nxserver/node.conf.sample etc/nxserver/node.conf || die