Version bump for bugs #198927, #198929, #198934

Package-Manager: portage-2.1.4_rc6

7 files changed, 252 insertions, 5 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 1316d70481f0..360f3d317c9d 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,16 @@
 # 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.38 2007/11/26 12:50:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.39 2007/12/03 20:00:26 voyageur Exp $
+
+*nxserver-freenx-0.7.1-r1 (03 Dec 2007)
+
+  03 Dec 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-freenx-0.7.1-nxserver_fixes.patch,
+  +files/nxserver-freenx-0.7.1-usession_fixes.patch, +files/nxserver.init,
+  +nxserver-freenx-0.7.1-r1.ebuild:
+  Add init script (bug #198929), usession support (bug #198934)
+  Force update for bug #198927
+  Thanks to Bruno Redondi <bruno@altarisoluzione.com>
 
   26 Nov 2007; Bernard Cafarelli <voyageur@gentoo.org>
   files/nxserver-freenx-0.7.1-nxloadconfig.patch:
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index c16e62361b66..291d84b07925 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -30,20 +30,36 @@ AUX nxserver-freenx-0.7.1-nxloadconfig.patch 2994 RMD160 2cf6468787eeb84f4f991e5
 MD5 4d0e8941b85a03d3d4ba502250ddd82c files/nxserver-freenx-0.7.1-nxloadconfig.patch 2994
 RMD160 2cf6468787eeb84f4f991e51e94bb815af497d4e files/nxserver-freenx-0.7.1-nxloadconfig.patch 2994
 SHA256 85f309c54c372c230ba19c9904e3f51ab985289ea7b91e1e748b57195818f56e files/nxserver-freenx-0.7.1-nxloadconfig.patch 2994
+AUX nxserver-freenx-0.7.1-nxserver_fixes.patch 469 RMD160 8a94d5d5768085347fc9a5ed1fed5b0440917a02 SHA1 d9ab96e4303b054c335d2ed4eda86604f1bc3375 SHA256 a9f3e1e98214c86aaf7cd2d302f19b621d55a727cb16799aa9519877e9519efa
+MD5 dbb3e37be27719a4018f80e53bdc2aa1 files/nxserver-freenx-0.7.1-nxserver_fixes.patch 469
+RMD160 8a94d5d5768085347fc9a5ed1fed5b0440917a02 files/nxserver-freenx-0.7.1-nxserver_fixes.patch 469
+SHA256 a9f3e1e98214c86aaf7cd2d302f19b621d55a727cb16799aa9519877e9519efa files/nxserver-freenx-0.7.1-nxserver_fixes.patch 469
+AUX nxserver-freenx-0.7.1-usession_fixes.patch 1435 RMD160 c3fa000e1996402afd1feefed3d73285c910c387 SHA1 80f53a93be35acab564c6454a1dbf6596078ffd7 SHA256 5cf226e31f3b7f26f6fa749d971e25cbc08c570657c668f7f45d9bfc0ffaa532
+MD5 305686acdf5236696891538a6a07049a files/nxserver-freenx-0.7.1-usession_fixes.patch 1435
+RMD160 c3fa000e1996402afd1feefed3d73285c910c387 files/nxserver-freenx-0.7.1-usession_fixes.patch 1435
+SHA256 5cf226e31f3b7f26f6fa749d971e25cbc08c570657c668f7f45d9bfc0ffaa532 files/nxserver-freenx-0.7.1-usession_fixes.patch 1435
+AUX nxserver.init 511 RMD160 8be8036e4c4c6ee73e22e5020cf8ce54635885d6 SHA1 6eb11e6f2d1b50faf5fe961e673388b65fda5fa0 SHA256 000494af12de06d60669eef1c4f1f28000aae7923b1ea39eca8bc94de971239a
+MD5 daaca34c4e3cc3ae8f0f8ebb2116f021 files/nxserver.init 511
+RMD160 8be8036e4c4c6ee73e22e5020cf8ce54635885d6 files/nxserver.init 511
+SHA256 000494af12de06d60669eef1c4f1f28000aae7923b1ea39eca8bc94de971239a files/nxserver.init 511
 DIST freenx-0.7.0.tar.gz 57614 RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 SHA1 243f0c98f02b1c84c59e5b324a5a7e6d3d3d8db3 SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9
 DIST freenx-0.7.1.tar.gz 63637 RMD160 853380a482243ccf7c5a4a2f51739248b6a382db SHA1 bceefe6910e54af662f5311ee3cb24d354b2f724 SHA256 7e846a288506353a78c2535d2b66b93ffe2f70c9c2868365f83c29ab71150cb6
 EBUILD nxserver-freenx-0.7.0-r1.ebuild 3237 RMD160 00c106a37557322e79ce43f84844c3a53d6b4c16 SHA1 11692d3f677dbc10eb4900e313b2fe588eb9c7d5 SHA256 65c960edac88635d8f1402325c5aec7b87259a919ccfdb313da6d2eb6717a0ab
 MD5 1a8fff42fab47a41d5854ae6cb333b01 nxserver-freenx-0.7.0-r1.ebuild 3237
 RMD160 00c106a37557322e79ce43f84844c3a53d6b4c16 nxserver-freenx-0.7.0-r1.ebuild 3237
 SHA256 65c960edac88635d8f1402325c5aec7b87259a919ccfdb313da6d2eb6717a0ab nxserver-freenx-0.7.0-r1.ebuild 3237
+EBUILD nxserver-freenx-0.7.1-r1.ebuild 3899 RMD160 e843123577ed25cbdd890a929a9a011cff8cdda2 SHA1 8d90855e16ad058a7881bcd8a22186efccd91e3d SHA256 d12cd9a20540ce885b8a8c1533521ec983e45b70f71c66d7c3eba37edccf5180
+MD5 e62d063fb949127e01ebaae09ba2855c nxserver-freenx-0.7.1-r1.ebuild 3899
+RMD160 e843123577ed25cbdd890a929a9a011cff8cdda2 nxserver-freenx-0.7.1-r1.ebuild 3899
+SHA256 d12cd9a20540ce885b8a8c1533521ec983e45b70f71c66d7c3eba37edccf5180 nxserver-freenx-0.7.1-r1.ebuild 3899
 EBUILD nxserver-freenx-0.7.1.ebuild 3627 RMD160 a106d5b2fca655e2700b66cacd7e0017647659da SHA1 7138c4960fc4c213c4276b38248a8a9d4f865667 SHA256 51e8fad24f5819411df48be694b4169ce6ff8418ec6d67c9e2674c92acd03076
 MD5 c3b94dee52df7e377240c7bf9b1e1b9c nxserver-freenx-0.7.1.ebuild 3627
 RMD160 a106d5b2fca655e2700b66cacd7e0017647659da nxserver-freenx-0.7.1.ebuild 3627
 SHA256 51e8fad24f5819411df48be694b4169ce6ff8418ec6d67c9e2674c92acd03076 nxserver-freenx-0.7.1.ebuild 3627
-MISC ChangeLog 8778 RMD160 d38f4919d91b4a2b49ad593ce239c97ae20b6aaf SHA1 941b7eb44ef0bc5241fb7e3be71881aac645d9aa SHA256 473a9448001e3db5b91db1fceaf210fe307244cf4726fc03fd7a62684cc09865
-MD5 de103b732134d5b623600133f31ade39 ChangeLog 8778
-RMD160 d38f4919d91b4a2b49ad593ce239c97ae20b6aaf ChangeLog 8778
-SHA256 473a9448001e3db5b91db1fceaf210fe307244cf4726fc03fd7a62684cc09865 ChangeLog 8778
+MISC ChangeLog 9188 RMD160 34d5adfa883fdc916070479175945882f0427829 SHA1 79a6b14aa4eee0c54cf59bc3705fbfedc083f552 SHA256 4a29760acf274af55e294330f22ca90b5790169441201c2de8a4d8352010f459
+MD5 52a2ad8a012f8f932e97484a03261dfb ChangeLog 9188
+RMD160 34d5adfa883fdc916070479175945882f0427829 ChangeLog 9188
+SHA256 4a29760acf274af55e294330f22ca90b5790169441201c2de8a4d8352010f459 ChangeLog 9188
 MISC metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d SHA1 591b43c9210782070d5d9b30317b1cef3975ab7e SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e
 MD5 433fa8974d44bd11845f96eb0be88ae7 metadata.xml 350
 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d metadata.xml 350
@@ -54,3 +70,6 @@ SHA256 9d184ea648e7ffe72fb0394f2887fad339e972a4857607c41415b9116018ae56 files/di
 MD5 efb81b3a243f38c1393b93d118b3745f files/digest-nxserver-freenx-0.7.1 235
 RMD160 f8c7d17d303422e1bbd252fa107d60f626e536f8 files/digest-nxserver-freenx-0.7.1 235
 SHA256 3d943fb223cc3963b8d10b34490ea347cdfb5264f37af98ec5bad4ce3910b70b files/digest-nxserver-freenx-0.7.1 235
+MD5 efb81b3a243f38c1393b93d118b3745f files/digest-nxserver-freenx-0.7.1-r1 235
+RMD160 f8c7d17d303422e1bbd252fa107d60f626e536f8 files/digest-nxserver-freenx-0.7.1-r1 235
+SHA256 3d943fb223cc3963b8d10b34490ea347cdfb5264f37af98ec5bad4ce3910b70b files/digest-nxserver-freenx-0.7.1-r1 235
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1-r1 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1-r1
new file mode 100644
index 000000000000..aad19a87b1b6
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1-r1
@@ -0,0 +1,3 @@
+MD5 80e7a57f787daabd0f80dfe8f58e67d3 freenx-0.7.1.tar.gz 63637
+RMD160 853380a482243ccf7c5a4a2f51739248b6a382db freenx-0.7.1.tar.gz 63637
+SHA256 7e846a288506353a78c2535d2b66b93ffe2f70c9c2868365f83c29ab71150cb6 freenx-0.7.1.tar.gz 63637
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxserver_fixes.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxserver_fixes.patch
new file mode 100644
index 000000000000..c5b985f70c4e
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxserver_fixes.patch
@@ -0,0 +1,12 @@
+diff -ruN freenx-0.7.0.orig/nxserver freenx-0.7.0/nxserver
+--- freenx-0.7.0.orig/nxserver	2007-05-29 17:27:07.000000000 +0200
++++ freenx-0.7.0/nxserver	2007-08-23 15:32:38.387208694 +0200
+@@ -399,7 +399,7 @@
+ # Main nxserver <-> nxclient communication module
+ #
+ 
+-if [ $USER = "nxfree" -o "$USER" = "nx" -o "$ENABLE_USERMODE_AUTHENTICATION" = "1" ]
++if [ "$USER" = "nxfree" -o "$USER" = "nx" -o "$ENABLE_USERMODE_AUTHENTICATION" = "1" ]
+ then
+ 
+ setup_usermode_auth()
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-usession_fixes.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-usession_fixes.patch
new file mode 100644
index 000000000000..2daffb9535ca
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-usession_fixes.patch
@@ -0,0 +1,41 @@
+diff -Naur freenx-0.7.1.orig/node.conf freenx-0.7.1/node.conf
+--- freenx-0.7.1.orig/node.conf	2007-12-03 20:12:36.000000000 +0100
++++ freenx-0.7.1/node.conf	2007-12-03 20:14:49.000000000 +0100
+@@ -469,7 +469,7 @@
+ # Note: You have to make sure that you add the nx user to the
+ #       utmp or tty group or how its called on your system
+ #       before this directive works.
+-#ENABLE_USESSION="0"
++#ENABLE_USESSION="1"
+ #COMMAND_SESSREG="sessreg"
+ 
+ # Extra options sent to the different nx agents. See !M documentation
+diff -Naur freenx-0.7.1.orig/nxloadconfig freenx-0.7.1/nxloadconfig
+--- freenx-0.7.1.orig/nxloadconfig	2007-12-03 20:12:36.000000000 +0100
++++ freenx-0.7.1/nxloadconfig	2007-12-03 20:14:33.000000000 +0100
+@@ -202,7 +202,7 @@
+ EXPORT_SESSIONID="1"
+ NODE_AUTOSTART=""
+ ENABLE_ROOTLESS_MODE="1"
+-ENABLE_USESSION="0"
++ENABLE_USESSION="1"
+ COMMAND_SESSREG="sessreg"
+ AGENT_EXTRA_OPTIONS_RFB=""
+ AGENT_EXTRA_OPTIONS_RDP=""
+diff -Naur freenx-0.7.1.orig/nxsetup freenx-0.7.1/nxsetup
+--- freenx-0.7.1.orig/nxsetup	2007-12-03 20:12:36.000000000 +0100
++++ freenx-0.7.1/nxsetup	2007-12-03 20:12:50.000000000 +0100
+@@ -263,6 +263,13 @@
+ 		echo "done"
+ 	fi
+ 	
++	if [ "$ENABLE_USESSION" = "1" ]
++	then
++		echo -n "Adding user \"nx\" to group \"utmp\" ..."
++		usermod -G utmp nx
++		echo "done"
++	fi
++	
+ 	if [ "$ENABLE_NOMACHINE_FORWARD_PORT" = "1" -a -x "$NOMACHINE_SERVER" ]
+ 	then
+ 		echo -n "Setting up NoMachine forwarding ..."
diff --git a/net-misc/nxserver-freenx/files/nxserver.init b/net-misc/nxserver-freenx/files/nxserver.init
new file mode 100644
index 000000000000..5b0d87550ada
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver.init
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# 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/files/nxserver.init,v 1.1 2007/12/03 20:00:26 voyageur Exp $
+
+depend() {
+	before sshd
+}
+
+start() {
+	ebegin "Starting FreeNX server"
+	/usr/bin/nxserver --cleanup &>/dev/null
+	/usr/bin/nxserver --start &>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping FreeNX server"
+	/usr/bin/nxserver --stop &>/dev/null
+	eend 0
+}
+
+# vim:ts=4
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..389db8ee63c3
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r1.ebuild
@@ -0,0 +1,139 @@
+# 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.7.1-r1.ebuild,v 1.1 2007/12/03 20:00:26 voyageur Exp $
+
+inherit multilib eutils
+
+MY_PN="freenx"
+DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
+HOMEPAGE="http://freenx.berlios.de/"
+SRC_URI="http://download.berlios.de/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+IUSE="arts cups esd nxclient"
+DEPEND="virtual/ssh
+	dev-tcltk/expect
+	sys-apps/gawk
+	net-analyzer/gnu-netcat
+	nxclient? ( net-misc/nxclient )
+	!nxclient? ( !net-misc/nxclient
+				 || ( x11-misc/xdialog
+					  x11-apps/xmessage ) )
+	>=net-misc/nx-2.1.0
+	arts? ( kde-base/arts )
+	cups? ( net-print/cups )
+	esd? ( media-sound/esound )
+	!net-misc/nxserver-freeedition
+	!net-misc/nxserver-2xterminalserver"
+
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-apps/xauth
+	x11-apps/xrdb
+	x11-apps/sessreg"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+export NX_HOME_DIR=/var/lib/nxserver/home
+
+pkg_setup () {
+	enewuser nx -1 -1 ${NX_HOME_DIR}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	mv node.conf.sample node.conf || die
+
+	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
+	epatch "${FILESDIR}"/${P}-cups.patch
+	epatch "${FILESDIR}"/${P}-nxdialog.patch
+	epatch "${FILESDIR}"/${P}-nscd.patch
+	epatch "${FILESDIR}"/${P}-usession_fixes.patch
+	epatch "${FILESDIR}"/${P}-nxserver_fixes.patch
+
+	sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die
+	sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die
+
+	# Change the defaults in nxloadconfig to meet the users needs.
+	if use arts ; then
+		einfo "Enabling arts support."
+		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf || die
+	fi
+	if use esd ; then
+		einfo "Enabling esd support."
+		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf || die
+	fi
+	if use cups ; then
+		einfo "Enabling cups support."
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf || die
+	fi
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	NX_ETC_DIR=/etc/nxserver
+	NX_SESS_DIR=/var/lib/nxserver/db
+
+	dobin nxserver
+	dobin nxnode
+	dobin nxnode-login
+	dobin nxkeygen
+	dobin nxloadconfig
+	dobin nxsetup
+	dobin nxcups-gethost
+	dobin nxdialog
+	dobin nxdesktop_helper
+	dobin nxviewer_helper
+
+	# This should be renamed to remove the blocker on net-misc/nxclient
+	use nxclient || dobin nxprint
+
+	dodir ${NX_ETC_DIR}
+	for x in passwords passwords.orig ; do
+		touch "${D}"${NX_ETC_DIR}/$x
+		chmod 600 "${D}"${NX_ETC_DIR}/$x
+	done
+
+	insinto ${NX_ETC_DIR}
+	doins node.conf
+
+	dodir ${NX_HOME_DIR}
+
+	for x in closed running failed ; do
+		keepdir ${NX_SESS_DIR}/$x
+		fperms 0700 ${NX_SESS_DIR}/$x
+	done
+
+	newinitd "${FILESDIR}"/nxserver.init nxserver
+}
+
+pkg_postinst () {
+	# Other NX servers ebuilds may have already created the nx account
+	# However they use different login shell/home directory paths
+	if [[ ${ROOT} == "/" ]]; then
+		usermod -s /usr/bin/nxserver nx || die "Unable to set login shell of nx user!!"
+		usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
+		usermod -G utmp nx || die "Unable to add nx user to utmp group!!"
+	else
+		elog "If you had another NX server installed before, please make sure"
+		elog "the nx user account is correctly set to:"
+		elog " * login shell: /usr/bin/nxserver"
+		elog " * home directory: ${NX_HOME_DIR}"
+		elog " * supplementary groups: utmp"
+	fi
+
+	elog "To complete the installation, run:"
+	elog " nxsetup --install --setup-nomachine-key --clean --purge"
+	elog "This will use the default Nomachine SSH key"
+}