Maintenance release bump, fix security issue on nxconfigure.sh script and may fix bug #282117. Drop obsolete net-misc/vnc dependency

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

7 files changed, 137 insertions, 21 deletions

diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index 510d638be361..bec8d818383d 100644
--- a/net-misc/nxnode/ChangeLog
+++ b/net-misc/nxnode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.62 2011/05/22 14:03:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.63 2011/08/08 14:41:53 voyageur Exp $
+
+*nxnode-3.5.0.4 (08 Aug 2011)
+
+  08 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> nxnode-3.4.0.6.ebuild,
+  nxnode-3.4.0.16-r1.ebuild, nxnode-3.5.0.3.ebuild, +nxnode-3.5.0.4.ebuild:
+  Maintenance release bump, fix security issue on nxconfigure.sh script and may
+  fix bug #282117. Drop obsolete net-misc/vnc dependency
 
 *nxnode-3.5.0.3 (22 May 2011)
 
diff --git a/net-misc/nxnode/Manifest b/net-misc/nxnode/Manifest
index 42f293d59565..6f5e13c7aa8f 100644
--- a/net-misc/nxnode/Manifest
+++ b/net-misc/nxnode/Manifest
@@ -11,15 +11,18 @@ DIST nxnode-3.4.0-6.i386.tar.gz 5927490 RMD160 741e3052caad883fb9a316a17896702f4
 DIST nxnode-3.4.0-6.x86_64.tar.gz 6619533 RMD160 066546cccced079390d2847a37f42de6c03c4630 SHA1 d3a82497dd0343f8a67888e34caa4b76d2c87b84 SHA256 8b7a0df68d1065f0e2b961886f7e29de2e06c225b5711fcbeffa226ca68ae8ce
 DIST nxnode-3.5.0-3.i386.tar.gz 6030430 RMD160 1f17a751cda469837d9082334879d86e53eef95e SHA1 32610826c99e3bb245cfb8241b24d46dff7788fa SHA256 92c50e78cbe1fe74d39d0319aed91439456d5f33b4dd3dd296c8647f65fe4b54
 DIST nxnode-3.5.0-3.x86_64.tar.gz 6734448 RMD160 b42cafde023f735e40f6531e50343d2a4f76a3c3 SHA1 242edd17454316dbd62686b3fd1848bc4633bf60 SHA256 60734d26f7d893b5edd6a5dc565bcab7a2ce23dee5732ef7e586d66e4cf6a0ad
-EBUILD nxnode-3.4.0.16-r1.ebuild 2843 RMD160 990a47b4c5b0eb16beeabce1e83d8bd98024385a SHA1 dd8bc5ddb00e9e40f14133b72ae77eb7617b38e4 SHA256 fc31c145991efc9ca616d9c41b65724bac02520968515b4ba3dd281a2267f3a6
-EBUILD nxnode-3.4.0.6.ebuild 2780 RMD160 01fabc95defb6958181fad5d505bb2c33f953a85 SHA1 085081fec99501469858dd1ee0e5571ceeb669d1 SHA256 bd1ab1f6d741034c7eee6543acaf1ad43697d1ebfd7d36a9d391cfc1c94bf1f5
-EBUILD nxnode-3.5.0.3.ebuild 2839 RMD160 5b3146eb185088ed36ff848420db59a9a19fe9c8 SHA1 d151841086f4340201a76a7523ab98f93a9a921c SHA256 588c90cd5db33b6bc3c3727b225e2d2aec071db8501d069465ea148f502982ef
-MISC ChangeLog 9930 RMD160 aa04ac750b225fb62e7f90f467d68c4a1e6d92e3 SHA1 fcc2374f5ae59cd26a8567ba2dee510c3d30b821 SHA256 ddb327f75cb57e1a8b213292e54c6f1f159019c4c7dcdecdd943bb884a61cb19
+DIST nxnode-3.5.0-4.i386.tar.gz 6028752 RMD160 b9b181c125bd8afc7632b0ecd0108c1f902ade4a SHA1 171a4a79679b42d84dcd6289e1ffbbe27182cec2 SHA256 d18adf64db1ddc76891af037547e2de67c31c510a9f03d5635cb8a853ded4d11
+DIST nxnode-3.5.0-4.x86_64.tar.gz 6730467 RMD160 e2098ed9ecfc90ad253a0746724c01d66695538b SHA1 535c6998bad25163408efee0987cfbc9039a569f SHA256 3c1ba5416c3e526bf7e7844d218e7dd6b9c6ced14334da874ed0c22a8f8b8b53
+EBUILD nxnode-3.4.0.16-r1.ebuild 2823 RMD160 5e5fb988792526fdea04ae7ef4c2a79c214805f3 SHA1 56d6e4e3639d6973d53ef3a0c45de7b4b1196371 SHA256 bb300caf31cbb5a86fc33d78886345ded545bd69e88aed5da53fe32d4c41d7a7
+EBUILD nxnode-3.4.0.6.ebuild 2760 RMD160 ed1b57b41e6cddc429b94e1f3e2c090ae5b7c7b5 SHA1 6199c25e114b54cdf3b3bdd700dc39b4ae0feda6 SHA256 13db51bfd55685bc89b4854cd41ba4517a4c88d07af39b9a051e2e9513806878
+EBUILD nxnode-3.5.0.3.ebuild 2819 RMD160 98e30083f0f810bd40c0a1c68df4cf310d844872 SHA1 0174f97be7aaa128fc93d212bd91b3508fad3237 SHA256 3c1c04aa766e4caf3733c0a5d7a7538a9e7d84b78f924ba3e09462f499fc4ce9
+EBUILD nxnode-3.5.0.4.ebuild 2819 RMD160 19f7f248c873f06908c444f98354220d3e268d63 SHA1 c80a4a1eb8eb1137b9fb5a95823fb57b98864798 SHA256 bed4fe696c9d3a7573ad1272047f1f895d905f38180fd45b95ac435f68b6951a
+MISC ChangeLog 10253 RMD160 2952f41628573c85c319689eef5612686d3adc19 SHA1 72bc5304e6364070806e4c45863f62152720bae7 SHA256 62adc4e891ec530b55dca8a018d09446df56a5615ead1aca2839931bb51f3f88
 MISC metadata.xml 264 RMD160 3b4f53808aa9f3ce8bf86bdc8e08bda3fc181219 SHA1 89e785afdbf6b2c6968649c91dc17910066728eb SHA256 3eaf6b268d16ec374617534bf70f0e96d2c6399ca1b0d4ffa3eeee619d775171
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk3ZF8cACgkQFYEBGcdFJfIRkQD/eiD8U7G1QwSVFXVLeG/mcLq6
-5QoNXsRgDXQ9yi3H0psA/0GhhQGRO5XkEQme8Exo/f9yz7drvHaueV/VglV2j6BZ
-=XzZl
+iF4EAREIAAYFAk4/9cEACgkQFYEBGcdFJfL4gwD/QzmDxFOMPq/NfSUgmiZ2CH+8
+oUmCpETDvDeWymLdAdIA/ApHOpj/P5YaTGZzEWioAGOZqmlRaBp5l0f3sK8e8mdM
+=Xuqm
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild b/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild
index 37a98a3566b4..09f9c9fbfd52 100644
--- a/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild
+++ b/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild,v 1.1 2011/03/13 23:20:03 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.4.0.16-r1.ebuild,v 1.2 2011/08/08 14:41:53 voyageur Exp $
 
 EAPI="2"
 
@@ -31,7 +31,7 @@ RDEPEND="=net-misc/nxclient-${MAJOR_PV}*[cups]
 	x11-apps/xrdb
 	rdesktop? ( net-misc/rdesktop )
 	vnc? ( x11-misc/x11vnc
-		   || ( net-misc/tightvnc net-misc/vnc ) )"
+		   net-misc/tightvnc )"
 
 S=${WORKDIR}/NX
 
diff --git a/net-misc/nxnode/nxnode-3.4.0.6.ebuild b/net-misc/nxnode/nxnode-3.4.0.6.ebuild
index 504b44546999..82ac801d22f3 100644
--- a/net-misc/nxnode/nxnode-3.4.0.6.ebuild
+++ b/net-misc/nxnode/nxnode-3.4.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.4.0.6.ebuild,v 1.5 2010/01/18 15:05:53 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.4.0.6.ebuild,v 1.6 2011/08/08 14:41:53 voyageur Exp $
 
 EAPI="2"
 
@@ -31,7 +31,7 @@ RDEPEND="=net-misc/nxclient-${MAJOR_PV}*
 	x11-apps/xrdb
 	rdesktop? ( net-misc/rdesktop )
 	vnc? ( x11-misc/x11vnc
-		   || ( net-misc/tightvnc net-misc/vnc ) )"
+		   net-misc/tightvnc )"
 
 S=${WORKDIR}/NX
 
diff --git a/net-misc/nxnode/nxnode-3.5.0.3.ebuild b/net-misc/nxnode/nxnode-3.5.0.3.ebuild
index fece35518165..5831a7391bdc 100644
--- a/net-misc/nxnode/nxnode-3.5.0.3.ebuild
+++ b/net-misc/nxnode/nxnode-3.5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.5.0.3.ebuild,v 1.1 2011/05/22 14:03:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.5.0.3.ebuild,v 1.2 2011/08/08 14:41:53 voyageur Exp $
 
 EAPI="2"
 
@@ -31,7 +31,7 @@ RDEPEND="=net-misc/nxclient-${MAJOR_PV}*[cups]
 	x11-apps/xrdb
 	rdesktop? ( net-misc/rdesktop )
 	vnc? ( x11-misc/x11vnc
-		   || ( net-misc/tightvnc net-misc/vnc ) )"
+		   net-misc/tightvnc )"
 
 S=${WORKDIR}/NX
 
diff --git a/net-misc/nxnode/nxnode-3.5.0.4.ebuild b/net-misc/nxnode/nxnode-3.5.0.4.ebuild
new file mode 100644
index 000000000000..816c1b910fa8
--- /dev/null
+++ b/net-misc/nxnode/nxnode-3.5.0.4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.5.0.4.ebuild,v 1.1 2011/08/08 14:41:53 voyageur Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="shared components between the different editions of NoMachine's NX Servers"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxnode-${FULL_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxnode-${FULL_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="rdesktop vnc"
+RESTRICT="strip"
+
+DEPEND="!<net-misc/nxserver-freeedition-3.0.0"
+RDEPEND="=net-misc/nxclient-${MAJOR_PV}*[cups]
+	sys-process/lsof
+	x11-libs/libICE
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-apps/xrdb
+	rdesktop? ( net-misc/rdesktop )
+	vnc? ( x11-misc/x11vnc
+		   net-misc/tightvnc )"
+
+S=${WORKDIR}/NX
+
+pkg_preinst()
+{
+	enewuser nx -1 -1 /usr/NX/home/nx
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}"/nxnode-3.4.0-setup.patch
+	epatch "${FILESDIR}"/nxnode-3.4.0-cups_path.patch
+}
+
+src_install()
+{
+	# we install nxnode into /usr/NX, to make sure it doesn't clash
+	# with libraries installed for FreeNX
+
+	into /usr/NX
+	for x in nxagent nxnode nxsensor nxspool nxuexec ; do
+		dobin bin/$x
+	done
+
+	dodir /usr/NX/etc
+	cp etc/node-debian.cfg.sample "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die
+	sed -e 's|COMMAND_FUSER = .*|COMMAND_FUSER = "/usr/bin/fuser"|;' -i "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die
+	cp etc/node.lic.sample "${D}"/usr/NX/etc/node.lic.sample || die
+
+	dodir /usr/NX/lib
+	cp -R lib "${D}"/usr/NX || die
+
+	dodir /usr/NX/scripts
+	cp -R scripts "${D}"/usr/NX || die
+
+	dodir /usr/NX/share
+	cp -R share "${D}"/usr/NX || die
+
+	dodir /usr/NX/var
+	cp -R var "${D}"/usr/NX || die
+
+	dodir /etc/init.d
+	newinitd "${FILESDIR}"/nxnode-3.0.0-init nxsensor
+}
+
+pkg_postinst()
+{
+	# Only install license file if none is found
+	if [ ! -f /usr/NX/etc/node.lic ]; then
+		cp "${ROOT}"/usr/NX/etc/node.lic.sample "${ROOT}"/usr/NX/etc/node.lic || die
+		chmod 0400 "${ROOT}"/usr/NX/etc/node.lic
+		chown nx:0 "${ROOT}"/usr/NX/etc/node.lic
+	fi
+
+	# only run install on the first time
+	if [ -f /usr/NX/etc/node.cfg ]; then
+		einfo "Running NoMachine's update script"
+		"${ROOT}"/usr/NX/scripts/setup/nxnode --update
+	else
+		einfo "Running NoMachine's setup script"
+		"${ROOT}"/usr/NX/scripts/setup/nxnode --install
+	fi
+
+	elog "If you want server statistics, please add nxsensor to your default runlevel"
+	elog
+	elog "  rc-update add nxsensor default"
+	elog
+	elog "You will also need to change EnableSensor to 1 in /usr/NX/etc/node.cfg"
+}
diff --git a/net-misc/nxserver-freeedition/Manifest b/net-misc/nxserver-freeedition/Manifest
index d34c451c1394..0f8f3cb9446a 100644
--- a/net-misc/nxserver-freeedition/Manifest
+++ b/net-misc/nxserver-freeedition/Manifest
@@ -10,15 +10,18 @@ DIST nxserver-3.4.0-8.i386.tar.gz 6844221 RMD160 b31094f7a57f03f9ccf04a7692a888e
 DIST nxserver-3.4.0-8.x86_64.tar.gz 7870310 RMD160 4281ece7b1750242309b2b022fc243c1b461108b SHA1 5844c769e06930138fa3ee9482512d4938cf0561 SHA256 73681799874fb99db2532de3c4e8c66e36ed978d6d4f78ed6073d59ec4f5df54
 DIST nxserver-3.5.0-4.i386.tar.gz 6858498 RMD160 98f78e9f3f1a425ac3dcb994ec78dfd9f1957e26 SHA1 3366c37b8ce4c05cbbdba2bdb880d3ee75494489 SHA256 61af854ae846d7ee1d793aea5dc0f72391254fc0fcf157024b984c82293a3b9b
 DIST nxserver-3.5.0-4.x86_64.tar.gz 7893511 RMD160 081c28187a89165f1de3b9f99563afc988e6be49 SHA1 695e9a22865455523fd262462895ea853269379f SHA256 6634a8306a90fb69c0bb24d59bf29179d37c97bb1250234707d2876897b35494
+DIST nxserver-3.5.0-5.i386.tar.gz 6858520 RMD160 8b96c7c8168ca57ac512b0904a53a610aad9616b SHA1 be3807fd5c0727006f1592b7d4bf1b61bbc02558 SHA256 2d7aeeedafc45b26df3d736e171c2939cee10938a590b6702ec9602d0e898633
+DIST nxserver-3.5.0-5.x86_64.tar.gz 7893612 RMD160 b07ee1833f3811e8a94db524dbddccb065328fc7 SHA1 5bb35d8f4ee4cbe6e669448fb491b14f595bda5a SHA256 530742c1df514c288155a626da20e2222873468734c1be51de59e43ada007520
 EBUILD nxserver-freeedition-3.4.0.17.ebuild 3133 RMD160 355ac1dc2c9b47b8ced07ecd8755232f708060af SHA1 16cf6d54ed8bda25f67c964bc538840a246f47a9 SHA256 ca96211111541ecd935bbcebcbc4f0925073b5f42fbba6e236ae2234abcd6501
 EBUILD nxserver-freeedition-3.4.0.8.ebuild 3148 RMD160 bc91e8734e177fedd1cb2c8d7459b5112c69f257 SHA1 1aa824464d08ab033c5403444e5a0b60136fc250 SHA256 4258675d6a8712ae4da11fcd5d057232115eca9ee8b1ca5e2ed9a3e21af69666
 EBUILD nxserver-freeedition-3.5.0.4.ebuild 3132 RMD160 179ef1b604af3fd7fec2f992ac802242d1088c24 SHA1 63334219465a4c5d22b4a0e820e66060e7a58a2e SHA256 2320a1282a8b028582d0228bde17905d2ad1a3b52492dbf71a06505a20e96dab
-MISC ChangeLog 9984 RMD160 cb5bc71a4573849672980b6427de30a738de13f6 SHA1 af74f0d23da9c09c3611fe9f36aa28d67f3771f6 SHA256 e30e28cae5452b910b6053848d6263387e1a1d93537aece0f939e61746119197
+EBUILD nxserver-freeedition-3.5.0.5.ebuild 3132 RMD160 54e1a43a5d7fa98c8bae767eed102f56861478a3 SHA1 099c56449bdf00535edbddd62eb02ece94d10782 SHA256 9ff48a90fd0e61e011e0a773f225055af7ec14650a4268b12ae607f5cae44edb
+MISC ChangeLog 10223 RMD160 64ae0bf5925edc7f37ba3f9c6c411a4c9de3cfd5 SHA1 6d544ebbf58afa3a2eddd74b3186c11ea987151a SHA256 3e9c3d16f2a08a8219271e3e1a384a6dbd60ee4011b7dc0c83d390738df035dd
 MISC metadata.xml 229 RMD160 36b4bf7d904838e36addc9c65e276eba42746844 SHA1 713c86b664acaa5ddaa5551907f76eb0ea9209d3 SHA256 445516ce54a07930b5cf708034023dddbc5fd8125be710709912ef849e623bc5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk3ZGCoACgkQFYEBGcdFJfKx9QEAjoHXOvciL5Ae27wmF1K4U2q3
-dZ6QunPuh66bShmK2RkA/0a9PRN/O41Z2OJqet9EWw95GjElpCFQzAbOzwOVUX7U
-=YEfm
+iF4EAREIAAYFAk4/9eUACgkQFYEBGcdFJfI99QD+MFg2PDlihW/5o7cucixZnDAv
+mCknE3lhd5rrlvJwaB0A+wW7obXnlEiTQsKFCP31U90wIiTJQCoPBTCg8EPP4Ks/
+=jHxE
 -----END PGP SIGNATURE-----