Version bump

9 files changed, 124 insertions, 25 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 32a4d01f2eff..321663b86e0b 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nxserver-freenx
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.8 2004/11/24 21:59:15 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.9 2005/01/02 10:00:05 stuart Exp $
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> +files/nxserver-path.diff,
+  nxserver-freenx-0.2.4.ebuild:
+  Version bump; thanks to Christian Oyarzun for the patch; see bug #71694
 
   24 Nov 2004; Sven Wegener <swegener@gentoo.org>
   nxserver-freenx-0.2.2.ebuild:
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index d09b01ecd360..7fad53f93aa0 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 f52d233fb520a987d0c4ed7993850724 ChangeLog 1831
+MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
 MD5 e684976f004645589624749b7fccc283 nxserver-freenx-0.2.3.ebuild 2712
 MD5 9e12b6be0d05f8d0b93d9362942c1e95 nxserver-freenx-0.2.2.ebuild 2711
-MD5 007196bbd26b88873495e95edb2f525c nxserver-freenx-0.2.4.ebuild 2713
-MD5 f52d233fb520a987d0c4ed7993850724 ChangeLog 1831
 MD5 40aa90acfc38b06ac68d0dfd7b10a04a nxserver-freenx-0.2.1.ebuild 2693
-MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
-MD5 d388064e3dc5e12382a5df38d2963a7b files/digest-nxserver-freenx-0.2.1 63
+MD5 547614b7cfc4989a4eb3d61930d50ca8 nxserver-freenx-0.2.4.ebuild 2710
+MD5 9bb49731f7a9ccb2f39318bc42d20600 nxserver-freenx-0.2.7.ebuild 2749
 MD5 80e15c6c222aaea0ade019d2b0070d2e files/digest-nxserver-freenx-0.2.2 63
 MD5 bc6040cb8843d3061568b6a06fec8b98 files/digest-nxserver-freenx-0.2.3 63
 MD5 1d9408c6273fb71e5cb06519db691598 files/digest-nxserver-freenx-0.2.4 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpQQ5I1lqEGTUzyQRAl2OAKCaXz7X7MJ1KJRaMVfhRtwyW1nsuACfSyOc
-QkkzV7vWuW8qRmju2Zfkbts=
-=TRHd
------END PGP SIGNATURE-----
+MD5 d388064e3dc5e12382a5df38d2963a7b files/digest-nxserver-freenx-0.2.1 63
+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.7 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.7
new file mode 100644
index 000000000000..33779085b20a
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.7
@@ -0,0 +1 @@
+MD5 982a4828417d15bce0b0096c22f85ec3 freenx-0.2.7.tar.gz 26013
diff --git a/net-misc/nxserver-freenx/files/nxserver-path.diff b/net-misc/nxserver-freenx/files/nxserver-path.diff
new file mode 100644
index 000000000000..1e734c9cc36a
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-path.diff
@@ -0,0 +1,11 @@
+--- nxserver.orig	2004-12-12 15:51:12.283474376 -0500
++++ nxserver	2004-12-12 15:51:46.385290112 -0500
+@@ -487,7 +487,7 @@
+ 	# Use nxnode-login?
+ 	if [ "$PAM_LOGIN_METHOD" = "1" ]
+ 	then
+-	  echo $PAM_PASS | nxnode-login "$USER" 127.0.0.1 "-p$SSHD_AUTH_PORT" "$CMD" "$@" 2>&1 | log_tee
++	  echo $PAM_PASS | $NX_DIR/bin/nxnode-login "$USER" 127.0.0.1 "-p$SSHD_AUTH_PORT" "$CMD" "$@" 2>&1 | log_tee
+ 	else
+ 	  echo "$@" | ssh -l "$USER" 127.0.0.1 -p $SSHD_AUTH_PORT -x -2 -i $NX_ETC_DIR/users.id_dsa -o 'PubkeyAuthentication yes' -o 'RSAAuthentication yes' -o 'RhostsAuthentication no' -o 'PasswordAuthentication no' -o 'RhostsRSAAuthentication no' -o 'StrictHostKeyChecking no' $NX_DIR/bin/nxnode "$CMD" | log_tee
+ 	fi
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.1.ebuild
index 64be3c8401f3..db7680c35028 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.2.1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.1.ebuild,v 1.2 2004/09/08 19:54:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.2.1.ebuild,v 1.3 2005/01/02 10:00:05 stuart Exp $
 
 inherit eutils
 
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.2.ebuild
index c62a2ea1af87..301f5890021e 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.2.2.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.ebuild,v 1.2 2004/11/24 21:59:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.2.2.ebuild,v 1.3 2005/01/02 10:00:05 stuart Exp $
 
 inherit eutils
 
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.3.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.3.ebuild
index 383221b4cef6..20719947c599 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.2.3.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3.ebuild,v 1.1 2004/09/12 20:07:16 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.2.3.ebuild,v 1.2 2005/01/02 10:00:05 stuart Exp $
 
 inherit eutils
 
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.4.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.4.ebuild
index e0c907bc0ac9..604f6dc345f5 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.2.4.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.4.ebuild,v 1.2 2004/09/13 09:58:01 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.2.4.ebuild,v 1.3 2005/01/02 10:00:05 stuart Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 DEPEND="net-misc/nx-x11
-		<=net-misc/nxclient-1.3.99
+		=net-misc/nxclient-1.4*
 		dev-tcltk/expect
 		net-analyzer/gnu-netcat"
 
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.7.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.7.ebuild
new file mode 100644
index 000000000000..a0d30877c544
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.2.7.ebuild
@@ -0,0 +1,90 @@
+# 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.7.ebuild,v 1.1 2005/01/02 10:00:05 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"
+IUSE=""
+DEPEND="net-misc/nx-x11
+		=net-misc/nxclient-1.4*
+		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
+}
+
+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
+
+	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!!"
+}