Maintenance release and nxsensor script fix

Package-Manager: portage-2.1.3_rc6

5 files changed, 207 insertions, 5 deletions

diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index dfacd3374eaa..ee5a83d0c140 100644
--- a/net-misc/nxnode/ChangeLog
+++ b/net-misc/nxnode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.9 2007/07/02 21:25:53 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.10 2007/07/02 21:44:25 voyageur Exp $
+
+*nxnode-3.0.0-r1 (02 Jul 2007)
+
+  02 Jul 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxnode-3.0.0-init, +nxnode-3.0.0-r1.ebuild:
+  Maintenance release and nxsensor script fix
 
   02 Jul 2007; Bernard Cafarelli <voyageur@gentoo.org> nxnode-3.0.0.ebuild:
   Fixed error message typo
diff --git a/net-misc/nxnode/Manifest b/net-misc/nxnode/Manifest
index fedbaad8e805..1838cb8259a5 100644
--- a/net-misc/nxnode/Manifest
+++ b/net-misc/nxnode/Manifest
@@ -6,6 +6,10 @@ AUX nxnode-2.1.0-setup.patch 1357 RMD160 f5af6e093ecdb45551b95b1d047065f5f3aa9b5
 MD5 82a440e1c0f91809ad5cca32066b4fd0 files/nxnode-2.1.0-setup.patch 1357
 RMD160 f5af6e093ecdb45551b95b1d047065f5f3aa9b54 files/nxnode-2.1.0-setup.patch 1357
 SHA256 ee95f966f0598e966d2cef3d8fff0888ec7880afded8d275e2f415939b1508c3 files/nxnode-2.1.0-setup.patch 1357
+AUX nxnode-3.0.0-init 1344 RMD160 fc4c8ed911bf79634537f0567f374688791f482d SHA1 78a9e356c053e1ece469332dd016a0efe425595f SHA256 d0da14f4dac0b3c325086a5b4b1929456681822011b0996d48cee5265e10cce5
+MD5 bafa050702f78b7a1a56ecd9858d3617 files/nxnode-3.0.0-init 1344
+RMD160 fc4c8ed911bf79634537f0567f374688791f482d files/nxnode-3.0.0-init 1344
+SHA256 d0da14f4dac0b3c325086a5b4b1929456681822011b0996d48cee5265e10cce5 files/nxnode-3.0.0-init 1344
 AUX nxnode-3.0.0-setup.patch 1353 RMD160 85c7938126000b10fa6e05aa5501e2affc6d0ec6 SHA1 4d12a2857db5a6d073ceab88bb2e58d0ee93a322 SHA256 04dccdc5eb73df861995e866c0875496b3b893ab43caaa8bdd854a69a74ae17a
 MD5 35393ef1238a0aa70768d2d83130ca45 files/nxnode-3.0.0-setup.patch 1353
 RMD160 85c7938126000b10fa6e05aa5501e2affc6d0ec6 files/nxnode-3.0.0-setup.patch 1353
@@ -13,18 +17,24 @@ SHA256 04dccdc5eb73df861995e866c0875496b3b893ab43caaa8bdd854a69a74ae17a files/nx
 DIST nxnode-2.1.0-22.i386.tar.gz 5185601 RMD160 dc25e4c2ef8b05cedac1b5cb78ec06f4b2263e5e SHA1 dcd5ec104e0e4a6b7eac1f6a86ead73c696f28f8 SHA256 a333ef9efc80c6346e0646b2298f4c113276c44325aff095882da420454b21e7
 DIST nxnode-3.0.0-70.i386.tar.gz 6229996 RMD160 a0b3b7ccf65e7dbd118385876c3f2d088c4b0682 SHA1 a6c811767673d806a243c6b8c3f397878edc96a5 SHA256 8c4b68df24907a3d00723d5eb8cb102d10eb8173d17c7e73ad7a95479f8b34d2
 DIST nxnode-3.0.0-70.x86_64.tar.gz 6906520 RMD160 68b17972c09d4d5b51b181116dd2546710482215 SHA1 6a3af5556950f9bbc88f31eddeb9d81888bb8e8f SHA256 000ae1d6d6e6fb2bd8b73ef8fd1c869a3e02daa25ba3865304b94fc78927c618
+DIST nxnode-3.0.0-71.i386.tar.gz 6232314 RMD160 86f14e369040695d6679d833e53b2df2bd620406 SHA1 ba3c32f75aa8083953915a5f79c7366dcac87a53 SHA256 74bf1b56b3b57cc17429c46a24e8d6597dbdb8275aabb945af77b33360d507c8
+DIST nxnode-3.0.0-71.x86_64.tar.gz 6902680 RMD160 092c350f82a736a36230079de395773ebf955750 SHA1 a6e273d81e2cf2b5fa788352b07d8de52ac8dd06 SHA256 d2cff4be636c0d1e8dd5fff344d1fb3c680eb3bc88f39655f78fefa9b3a3126c
 EBUILD nxnode-2.1.0.ebuild 2450 RMD160 25c7ad49ebd7a0683390ee0735c697772c5cb45e SHA1 640a70d3b675828d26c6159ab72c48f64ba33ec9 SHA256 43aa57dbb0b652e35c15221ec505cf7e2aaf35625bfc1c264ebcb88e3ae2ff81
 MD5 37199819e6d76d32503f6ca2518bc329 nxnode-2.1.0.ebuild 2450
 RMD160 25c7ad49ebd7a0683390ee0735c697772c5cb45e nxnode-2.1.0.ebuild 2450
 SHA256 43aa57dbb0b652e35c15221ec505cf7e2aaf35625bfc1c264ebcb88e3ae2ff81 nxnode-2.1.0.ebuild 2450
+EBUILD nxnode-3.0.0-r1.ebuild 2961 RMD160 9705d1e8c035a35972c64dc1a40f2ec97a2dd3c3 SHA1 d8dcb00b9d873a0a47f4638baf722f5d3c04631f SHA256 2a504950edeb5d8e0adefd76ab4c353099c59e28840e284fe10b84ddadb84103
+MD5 a3800674bc3d284e1da546348176c8ce nxnode-3.0.0-r1.ebuild 2961
+RMD160 9705d1e8c035a35972c64dc1a40f2ec97a2dd3c3 nxnode-3.0.0-r1.ebuild 2961
+SHA256 2a504950edeb5d8e0adefd76ab4c353099c59e28840e284fe10b84ddadb84103 nxnode-3.0.0-r1.ebuild 2961
 EBUILD nxnode-3.0.0.ebuild 2959 RMD160 cdcc864d58650d35b98c2c36d72402326d93d45e SHA1 89c0b6b993d6a8cb3272f2581ab2203f91a46009 SHA256 f92e99f01a8c454b99367e97b2bdb0215a2f92812fde0debde23fcdeb5267b98
 MD5 b039fe62a6e61471eed9b7f6422d3599 nxnode-3.0.0.ebuild 2959
 RMD160 cdcc864d58650d35b98c2c36d72402326d93d45e nxnode-3.0.0.ebuild 2959
 SHA256 f92e99f01a8c454b99367e97b2bdb0215a2f92812fde0debde23fcdeb5267b98 nxnode-3.0.0.ebuild 2959
-MISC ChangeLog 1436 RMD160 2d5f822b7abbb5f64fb539fb6829f9a9b760414d SHA1 04129ff35e9a5f1e389474c36262b8f10851cdaa SHA256 04e643ffd9e95116ab3b36250ab8df7a630d9c364817c3bb7653ad7d797a8647
-MD5 2686b1978b143f9ef0166cf5383e226c ChangeLog 1436
-RMD160 2d5f822b7abbb5f64fb539fb6829f9a9b760414d ChangeLog 1436
-SHA256 04e643ffd9e95116ab3b36250ab8df7a630d9c364817c3bb7653ad7d797a8647 ChangeLog 1436
+MISC ChangeLog 1624 RMD160 83aa09ce4c08619b2892397db8832892d3701f52 SHA1 de31082a7609176c0b214bbcb2063b053bf85c13 SHA256 ce2928f81bfd8d971607140804746ca684724da86ab490c8bfc13232ff0e0d67
+MD5 f06a6d68f6dca63ea158fc5092619ad1 ChangeLog 1624
+RMD160 83aa09ce4c08619b2892397db8832892d3701f52 ChangeLog 1624
+SHA256 ce2928f81bfd8d971607140804746ca684724da86ab490c8bfc13232ff0e0d67 ChangeLog 1624
 MISC metadata.xml 264 RMD160 3b4f53808aa9f3ce8bf86bdc8e08bda3fc181219 SHA1 89e785afdbf6b2c6968649c91dc17910066728eb SHA256 3eaf6b268d16ec374617534bf70f0e96d2c6399ca1b0d4ffa3eeee619d775171
 MD5 f90b3b63a5eb737fdf7e3a0470f6488d metadata.xml 264
 RMD160 3b4f53808aa9f3ce8bf86bdc8e08bda3fc181219 metadata.xml 264
@@ -35,3 +45,6 @@ SHA256 4cea482554e6c133df5abc846205059cebf96bb3e7ac1ad720ceb88b5a9f6a33 files/di
 MD5 51c862dfe6df17cb54bf179d12f7fdbe files/digest-nxnode-3.0.0 536
 RMD160 74e20c2ff8a1c8f4ba5a8f7b2e3cacee4185983e files/digest-nxnode-3.0.0 536
 SHA256 a444d7534c506a67465e23d06466bbfe2c088339c50bb53cc926c87c264bc596 files/digest-nxnode-3.0.0 536
+MD5 1377093e4e7951482faae1ff8450f568 files/digest-nxnode-3.0.0-r1 536
+RMD160 88757220b5fc77f0ab5533185cdc0b2a6b75eb0d files/digest-nxnode-3.0.0-r1 536
+SHA256 8d3bdf1346dccf45384710e621c8813773c14a88543c382b18be4f08f4efacc4 files/digest-nxnode-3.0.0-r1 536
diff --git a/net-misc/nxnode/files/digest-nxnode-3.0.0-r1 b/net-misc/nxnode/files/digest-nxnode-3.0.0-r1
new file mode 100644
index 000000000000..3be2b997a637
--- /dev/null
+++ b/net-misc/nxnode/files/digest-nxnode-3.0.0-r1
@@ -0,0 +1,6 @@
+MD5 c708996f1840d7330c4d29807f3e5fce nxnode-3.0.0-71.i386.tar.gz 6232314
+RMD160 86f14e369040695d6679d833e53b2df2bd620406 nxnode-3.0.0-71.i386.tar.gz 6232314
+SHA256 74bf1b56b3b57cc17429c46a24e8d6597dbdb8275aabb945af77b33360d507c8 nxnode-3.0.0-71.i386.tar.gz 6232314
+MD5 20ca631bdc58ec96bc0e1fd351c8493a nxnode-3.0.0-71.x86_64.tar.gz 6902680
+RMD160 092c350f82a736a36230079de395773ebf955750 nxnode-3.0.0-71.x86_64.tar.gz 6902680
+SHA256 d2cff4be636c0d1e8dd5fff344d1fb3c680eb3bc88f39655f78fefa9b3a3126c nxnode-3.0.0-71.x86_64.tar.gz 6902680
diff --git a/net-misc/nxnode/files/nxnode-3.0.0-init b/net-misc/nxnode/files/nxnode-3.0.0-init
new file mode 100644
index 000000000000..8b897db7c88b
--- /dev/null
+++ b/net-misc/nxnode/files/nxnode-3.0.0-init
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+NX_NODE_CFG="/usr/NX/etc/node.cfg"
+NX_SENSOR_CMD="/usr/NX/bin/nxsensor"
+NX_SENSOR_PID="/usr/NX/var/run/nxsensor.pid"
+NX_SENSOR_HOST="127.0.0.1"
+NX_SENSOR_PORT="19250"
+
+depend() 
+{
+	need net
+}
+
+is_enabled() 
+{
+	local tmp
+
+	if ! [[ -x $NX_SENSOR_CMD ]] ; then
+		eerror "$NX_SENSOR_CMD not found"
+		return 1
+	fi
+
+	tmp=`/usr/bin/awk -F'"' '/^EnableSensor/ {print $2}' $NX_NODE_CFG`
+	if [[ $tmp != "1" ]]; then
+		eerror "nxsensor is disabled in $NX_NODE_CFG"
+		return 1
+	fi
+
+	tmp=`/usr/bin/awk -F'"' '/^StatisticsHost/ {print $2}' $NX_NODE_CFG`
+	if [[ -n $tmp ]] ; then
+		NX_SENSOR_HOST="$tmp"
+	fi
+
+	tmp=`/usr/bin/awk -F'"' '/^NodeSensorPort/ {print $2}' $NX_NODE_CFG`
+	if [[ -n $tmp ]] ; then
+		NX_SENSOR_PORT="$tmp"
+	fi
+
+	return 0
+}
+
+start() {
+	is_enabled || return 1
+	ebegin "Starting nxsensor"
+	$NX_SENSOR_CMD -a $NX_SENSOR_HOST -a "::ffff:$NX_SENSOR_HOST" -P $NX_SENSOR_PORT -d
+	PID=`ps -ef | grep $NX_SENSOR_CMD | grep -v grep | awk '{print $2}'`
+	if [[ -z $PID ]] ; then
+		eend 1
+	else
+		echo $PID > $NX_SENSOR_PID
+		eend 0
+	fi
+}
+
+stop() {
+	ebegin "Stopping nxsensor"
+	PID=`cat $NX_SENSOR_PID`
+	if [[ -z $PID ]] ; then
+		eerror "nxsensor not started"
+		eend 1
+	else
+		kill $PID
+		rm -f $NX_SENSOR_PID
+		eend 0
+	fi
+}
diff --git a/net-misc/nxnode/nxnode-3.0.0-r1.ebuild b/net-misc/nxnode/nxnode-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..bf58a7dbd53b
--- /dev/null
+++ b/net-misc/nxnode/nxnode-3.0.0-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.0.0-r1.ebuild,v 1.1 2007/07/02 21:44:25 voyageur Exp $
+
+inherit eutils
+
+DESCRIPTION="nxnode provides the components that are shared between the different editions of NoMachine's NX Server"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/3.0.0/Linux/nxnode-${PV}-71.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/3.0.0/Linux/nxnode-${PV}-71.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rdesktop vnc"
+RESTRICT="strip"
+
+DEPEND="!net-misc/nxserver-freenx
+	!<net-misc/nxserver-freeedition-3.0.0"
+
+RDEPEND="=net-misc/nxclient-3*
+	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? ( || ( net-misc/vnc net-misc/tightvnc ) )"
+
+S=${WORKDIR}/NX
+
+pkg_setup() {
+	if use vnc; then
+		if has_version net-misc/vnc && ! built_with_use net-misc/vnc server;
+		then
+			die "net-misc/vnc needs to be built with USE=\"server\" for VNC support"
+		fi
+
+		if has_version net-misc/tightvnc && ! built_with_use net-misc/tightvnc server;
+		then
+			die "net-misc/tightvnc needs to be built with USE=\"server\" for VNC support"
+		fi
+	fi
+}
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/nxnode-3.0.0-setup.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:root ${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"
+}