Version bump

5 files changed, 133 insertions, 1 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 83d3aa32497a..adbc088f03e4 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.10 2005/01/02 10:40:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.11 2005/02/19 10:18:31 stuart Exp $
+
+*nxserver-freenx-0.2.8 (19 Feb 2005)
+
+  19 Feb 2005; Stuart Herbert <stuart@gentoo.org> +files/fixes.diff,
+  +nxserver-freenx-0.2.8.ebuild:
+  Version bump; Bug 76449: shell script loop patch; Neil Wilson
+  <neil@aldur.co.uk> Bug 76449: support for session names with spaces; Neil
+  Wilson <neil@aldur.co.uk> New USE flag 'commercial' if you want to use freenx
+  w/ NoMachine's nxclient
+  stable on x86
 
   02 Jan 2005; Stuart Herbert <stuart@gentoo.org>
   -nxserver-freenx-0.2.1.ebuild, -nxserver-freenx-0.2.2.ebuild,
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 0d81b83c5a63..94ae922ff847 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,5 +1,8 @@
 MD5 369725ed617f11cbecbddc5b1bba82ce ChangeLog 2220
 MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
+MD5 92dae8a396b4b30bea6ef75b6cb1325e nxserver-freenx-0.2.8.ebuild 2928
 MD5 a9da729db290ea402aad4a9b78102809 nxserver-freenx-0.2.7.ebuild 2749
+MD5 68fcece75aaa5f55ad36a18960a56806 files/digest-nxserver-freenx-0.2.8 63
+MD5 8f0fb766970dd9dce29e468cec2e796e files/fixes.diff 1078
 MD5 f58cf7014a645ce96afd27989a893c2f files/nxserver-path.diff 718
 MD5 3210d19111775fb0cf59fb578879c5c2 files/digest-nxserver-freenx-0.2.7 63
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.8 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.8
new file mode 100644
index 000000000000..19a96542d005
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.8
@@ -0,0 +1 @@
+MD5 db4c4a9f91619f4d9ac30fdea10925e8 freenx-0.2.8.tar.gz 26180
diff --git a/net-misc/nxserver-freenx/files/fixes.diff b/net-misc/nxserver-freenx/files/fixes.diff
new file mode 100644
index 000000000000..b82e9ce63580
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/fixes.diff
@@ -0,0 +1,26 @@
+diff -u --recursive freenx-0.2.8-orig/nxclient freenx-0.2.8/nxclient
+--- freenx-0.2.8-orig/nxclient	2005-02-17 20:03:15.000000000 +0000
++++ freenx-0.2.8/nxclient	2005-02-18 18:59:20.843775240 +0000
+@@ -8,7 +8,9 @@
+ #       it does check it someday.
+ 
+ # First check if the commercial nxclient is available and use it
+-[ -x /usr/NX/bin/nxclient ] && exec /usr/NX/bin/nxclient "$@"
++# but check that it isn't this script to prevent a loop!
++NXCLIENT="/usr/NX/bin/nxclient"
++[ -x ${NXCLIENT} -a "`file -bi ${NXCLIENT}`" != 'application/x-shellscript' ] && exec ${NXCLIENT} "$@"
+ 
+ TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display: -n $(basename $0) -- "$@"`
+ 
+diff -u --recursive freenx-0.2.8-orig/nxserver freenx-0.2.8/nxserver
+--- freenx-0.2.8-orig/nxserver	2005-02-17 20:03:15.000000000 +0000
++++ freenx-0.2.8/nxserver	2005-02-18 19:01:54.465015048 +0000
+@@ -495,7 +495,7 @@
+ 
+ server_nxnode_start_wait()
+ {
+-	server_nxnode_start $@ | while read CMD
++	server_nxnode_start "$@" | while read CMD
+ 	do
+ 		case "$CMD" in 
+ 			"NX> 1006"*|"NX> 1005"*)
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.8.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.8.ebuild
new file mode 100644
index 000000000000..f60c81f400b0
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.2.8.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 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.2.8.ebuild,v 1.1 2005/02/19 10:18:31 stuart Exp $
+
+inherit eutils
+
+DESCRIPTION="Windows Remote Desktop for X11"
+HOMEPAGE="http://www.kalyxo.org/twiki/bin/view/Main/FreeNX"
+SRC_URI="http://debian.tu-bs.de/knoppix/nx/freenx-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE="commercial"
+DEPEND="net-misc/nx-x11
+		!ppc? ( commercial? ( =net-misc/nxclient-1.4* ) )
+		!commercial? ( =net-misc/nxssh-1.4* =net-misc/nxproxy-1.4* !net-misc/nxclient )
+		dev-tcltk/expect
+		net-analyzer/gnu-netcat"
+
+S=${WORKDIR}/freenx-${PV}
+
+pkg_setup () {
+	enewuser nx -1 /bin/false /usr/NX/home/nx
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch gentoo-nomachine.diff
+	epatch ${FILESDIR}/nxserver-path.diff
+	epatch ${FILESDIR}/fixes.diff
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+
+	NX_ROOT_DIR="/usr/NX"
+	NX_BIN_DIR=${NX_ROOT_DIR}/bin
+	NX_ETC_DIR=${NX_ROOT_DIR}/etc
+	NX_HOME_ROOT=${NX_ROOT_DIR}/home
+	NX_HOME_DIR=${NX_HOME_ROOT}/nx
+	NX_SSH_DIR=${NX_HOME_DIR}/.ssh
+	NX_SESS_DIR=${NX_ROOT_DIR}/var/db
+
+	# our job here is to make this package look as much like the commercial
+	# nxserver as possible
+	#
+	# this means we only have to maintain the one pkg_postinst() function
+	# for both the commercial and gpl'd servers :)
+
+	into $NX_ROOT_DIR
+	dobin nxserver
+	dobin nxnode
+	dobin nxnode-login
+	dobin nxkeygen
+	useq commercial ||  dobin 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
+
+	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
+
+	for x in closed running failed ; do
+		keepdir ${NX_SESS_DIR}/$x
+		fperms 0700 ${NX_SESS_DIR}/$x
+	done
+
+	dodir ${NX_SSH_DIR}
+	fperms 0700 ${NX_HOME_DIR}
+	fperms 0700 ${NX_SSH_DIR}
+
+	cat << EOF >${D}${NX_SSH_DIR}/server.id_dsa.pub.key
+ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
+EOF
+	fperms 0600 ${NX_SSH_DIR}/server.id_dsa.pub.key
+	cp ${D}${NX_SSH_DIR}/server.id_dsa.pub.key ${D}${NX_SSH_DIR}/authorized_keys2
+	fperms 0600 ${NX_SSH_DIR}/authorized_keys2
+
+	echo -n "127.0.0.1" ${D}${NX_SSH_DIR}/known_hosts
+
+	chown -R nx:root ${D}/usr/NX
+}
+
+pkg_postinst () {
+	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
+}