Rev bump; fix known bugs on x86

(Portage version: 2.1.2_pre2-r9)

6 files changed, 161 insertions, 1 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 56d28daed044..86e7ead0b590 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.17 2006/04/30 19:38:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.18 2006/11/08 21:46:59 stuart Exp $
+
+*nxserver-freenx-0.5.0-r1 (08 Nov 2006)
+
+  08 Nov 2006; Stuart Herbert <stuart@gentoo.org>
+  +files/freenx-0.5.0-fullscreen.patch, +files/freenx-0.5.0-startup.patch,
+  +nxserver-freenx-0.5.0-r1.ebuild:
+  Version bump; fix known bugs on x86
 
 *nxserver-freenx-0.5.0.20060311-r1 (30 Apr 2006)
 *nxserver-freenx-0.4.4-r1 (30 Apr 2006)
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-r1
new file mode 100644
index 000000000000..183d59abfc16
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r1
@@ -0,0 +1,3 @@
+MD5 eb90747bb64cbdb5079dd28c8086b511 freenx-0.5.0-5.fc5.i386.rpm 62859
+RMD160 1c7bef90d5610ab265d9a66253d2bda1663e6e1a freenx-0.5.0-5.fc5.i386.rpm 62859
+SHA256 8d5224e825191d330e85996815f1b2ecb8b733853c24e7704cf0ea7b52237016 freenx-0.5.0-5.fc5.i386.rpm 62859
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0.20060311-r1 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0.20060311-r1
index 09651dd99504..6352416f21c5 100644
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0.20060311-r1
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0.20060311-r1
@@ -1 +1,3 @@
 MD5 b627433904cd6eed38b14524d3b45cbd freenx-0.5.0-test-2006-03-11-7.tar.gz 50703
+RMD160 28c4fde550ecb2b6a25bbfb56e16b763ee02b6a3 freenx-0.5.0-test-2006-03-11-7.tar.gz 50703
+SHA256 89e63681955d98382e04798d5a9f8d8d0064ca999bbb155907b4a262c59a4f0e freenx-0.5.0-test-2006-03-11-7.tar.gz 50703
diff --git a/net-misc/nxserver-freenx/files/freenx-0.5.0-fullscreen.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-fullscreen.patch
new file mode 100644
index 000000000000..c3ad210a2169
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/freenx-0.5.0-fullscreen.patch
@@ -0,0 +1,23 @@
+--- usr/bin/nxnode	2006-10-05 21:24:20.000000000 +0200
++++ usr/bin/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/freenx-0.5.0-startup.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch
new file mode 100644
index 000000000000..3cad86620d59
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/freenx-0.5.0-startup.patch
@@ -0,0 +1,13 @@
+--- usr/bin/nxloadconfig.orig  2006-11-02 08:08:36.000000000 +0000
++++ usr/bin/nxloadconfig       2006-11-05 01:18:16.000000000 +0000
+@@ -157,8 +157,8 @@
+ KILL_DEFAULT_X_WM="1"
+ USER_X_STARTUP_SCRIPT=.Xclients
+ DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
+-COMMAND_START_KDE="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/startkde"
+-COMMAND_START_GNOME="/usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/gnome-session"
++COMMAND_START_KDE="startkde"
++COMMAND_START_GNOME="/etc/X11/Sessions/Gnome"
+ COMMAND_START_CDE=cdwm
+ COMMAND_XTERM=xterm
+ COMMAND_XAUTH=/usr/X11R6/bin/xauth
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..eb207cd7fa05
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2006 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 $
+
+inherit multilib eutils rpm
+
+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="ftp://ftp.pbone.net/mirror/download.fedora.redhat.com/pub/fedora/linux/extras/5/i386/freenx-0.5.0-5.fc5.i386.rpm"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+RESTRICT="strip"
+IUSE="arts cups esd nxclient"
+DEPEND="virtual/ssh
+	dev-tcltk/expect
+	sys-apps/gawk
+	net-analyzer/gnu-netcat
+	x86? ( nxclient? ( =net-misc/nxclient-1.5* )
+	      !nxclient? ( !net-misc/nxclient ) )
+	amd64? ( nxclient? ( =net-misc/nxclient-1.5* )
+	        !nxclient? ( !net-misc/nxclient ) )
+	!x86? ( !amd64? ( !net-misc/nxclient ) )
+	=net-misc/nx-1.5*
+	arts? ( kde-base/arts )
+	cups? ( net-print/cups )
+	esd? ( media-sound/esound )
+	!net-misc/nxserver-personal
+	!net-misc/nxserver-business
+	!net-misc/nxserver-enterprise"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+export NX_HOME_DIR=/var/lib/nxserver/home
+
+pkg_setup () {
+	enewuser nx -1 -1 ${NX_HOME_DIR}
+}
+
+src_unpack() {
+	rpm_unpack ${DISTDIR}/${A}
+	cd ${S}
+
+	# fix the start commands
+	epatch ${FILESDIR}/freenx-0.5.0-startup.patch
+	# fix fullscreen support; see bug 150200
+	epatch ${FILESDIR}/freenx-0.5.0-fullscreen.patch
+
+	mv etc/nxserver/node.conf.sample etc/nxserver/node.conf || die
+
+	sed -e 's|^PATH_LIB=.*$|PATH_LIB=$NX_DIR/lib/NX/lib|;' -i usr/bin/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"/' usr/bin/nxloadconfig || die
+		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' etc/nxserver/node.conf || die
+	fi
+	if use esd ; then
+		einfo "Enabling esd support."
+		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' usr/bin/nxloadconfig || die
+		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' etc/nxserver/node.conf || die
+	fi
+	if use cups ; then
+		einfo "Enabling cups support."
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' usr/bin/nxloadconfig || die
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' etc/nxserver/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 usr/bin/nxserver
+	dobin usr/bin/nxnode
+	dobin usr/bin/nxnode-login
+	dobin usr/bin/nxkeygen
+	dobin usr/bin/nxloadconfig
+	dobin usr/bin/nxsetup
+	( ( use x86 || use amd64 ) && use nxclient ) || dobin usr/bin/nxprint
+	( ( use x86 || use amd64 ) && use nxclient ) || dobin usr/bin/nxclient
+
+	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 etc/nxserver/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
+}
+
+pkg_postinst () {
+	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!!"
+
+	elog "Run nxsetup --override --install to complete the installation"
+}