Version bump

6 files changed, 134 insertions, 6 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 8a9909449ba8..f101337dd7c9 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.1 2004/08/30 20:25:09 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.2 2004/09/07 19:28:31 stuart Exp $
+
+*nxserver-freenx-0.2 (07 Sep 2004)
+
+  07 Sep 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/freenx-0.2-gentoo.patch, nxserver-freenx-0.1.ebuild,
+  +nxserver-freenx-0.2.ebuild:
+  Version bump; more compatibility fixes to the ebuild
 
 *nxserver-freenx-0.1 (30 Aug 2004)
 
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 11bc751cbaa8..9c0a8f8b886b 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,5 +1,8 @@
-MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
-MD5 81fe9e0820ad4f0f04f86b399dd6e176 nxserver-freenx-0.1.ebuild 2090
 MD5 ab76a28a98ef81a73bd4082566904a5e ChangeLog 474
+MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
+MD5 cfcb26f5251c7a80bd7faffb9328851c nxserver-freenx-0.1.ebuild 2265
+MD5 5d9646bcebe1cc9c6cc572e0d8f3816c nxserver-freenx-0.2.ebuild 2799
 MD5 00eb0a54ca1f6c92c78f076b5dfe8e30 files/digest-nxserver-freenx-0.1 67
 MD5 51446469a3dc970b28b816487003ab9f files/freenx-0.1-gentoo.patch 2749
+MD5 5b10cd6429812bc5db1fba2dd45bdd48 files/digest-nxserver-freenx-0.2 61
+MD5 31c1525d41a0503e50d849466edbc386 files/freenx-0.2-gentoo.patch 693
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2
new file mode 100644
index 000000000000..cb2a65a5f790
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2
@@ -0,0 +1 @@
+MD5 3d3e37c7b4409160926d8af82b4eada7 freenx-0.2.tar.gz 21676
diff --git a/net-misc/nxserver-freenx/files/freenx-0.2-gentoo.patch b/net-misc/nxserver-freenx/files/freenx-0.2-gentoo.patch
new file mode 100644
index 000000000000..b67d1009bbd1
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/freenx-0.2-gentoo.patch
@@ -0,0 +1,25 @@
+--- nxserver.orig	2004-09-07 19:47:02.567669824 +0100
++++ nxserver	2004-09-07 19:47:17.755360944 +0100
+@@ -334,11 +334,6 @@
+ # Start!
+ log "-- NX SERVER START: $@"
+ 
+-if [ $# -gt 1 ]
+-then
+-	exit 0
+-fi
+-
+ echo_x "HELLO NXSERVER - Version $NX_VERSION $NX_LICENSE"
+ 
+ # Login stage
+--- nxserver.orig	2004-09-07 20:23:19.257762632 +0100
++++ nxserver	2004-09-07 20:23:31.000977392 +0100
+@@ -116,7 +116,7 @@
+ 	cp -f $NX_ETC_DIR/passwords $NX_ETC_DIR/passwords.orig
+ 	echo "$PASSDB_CHUSER:*" >> $NX_ETC_DIR/passwords
+ 	# deactivated to avoid problems with comm-server
+-	su - $PASSDB_CHUSER -c "$NX_DIR/nxnode --setkey"
++	su - $PASSDB_CHUSER -c "$NX_DIR/bin/nxnode --setkey"
+ }
+ 
+ passdb_list_user()
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.1.ebuild
index 1b49f8b0dfde..885c0b85d7ae 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1.ebuild,v 1.1 2004/08/30 20:25:09 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.1.ebuild,v 1.2 2004/09/07 19:28:31 stuart Exp $
 
 # although we inherit from nxserver eclass, we override a lot of the
 # functions, because that eclass is really designed to work with the
@@ -43,12 +43,16 @@ src_install() {
 	dobin nxserver
 	dobin nxnode
 
+	diropts -m 0755
+	dodir /usr/NX/home
+
 	diropts -m 0700
 	dodir /usr/NX/home/nx/.ssh
 
-	cat << EOF >${D}/usr/NX/home/nx/.ssh/authorized_keys2
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
+	cat << EOF >${D}/usr/NX/home/nx/.ssh/server.id_dsa.pub.key
+no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="nxserver",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 /usr/NX/home/nx/.ssh/server.id_dsa.pub.key
 
 	for x in closed running failed ; do
 		dodir /usr/NX/var/db/$x
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.ebuild
new file mode 100644
index 000000000000..7d00155362d7
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 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.ebuild,v 1.1 2004/09/07 19:28:31 stuart Exp $
+
+# although we inherit from nxserver eclass, we override a lot of the
+# functions, because that eclass is really designed to work with the
+# commercial NX server
+
+inherit eutils
+
+DESCRIPTION="X11 protocol compression library"
+HOMEPAGE="http://www.kalyxo.org/twiki/bin/view/Main/FreeNX"
+SRC_URI="http://debian.tu-bs.de/knoppix/nx/freenx-0.2.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="net-misc/nx-x11
+		>=net-misc/nxclient-1.4
+		>=net-misc/nxssh-1.4.0
+		dev-tcltk/expect"
+
+S=${WORKDIR}/freenx-0.2
+
+pkg_setup () {
+	enewuser nx -1 /usr/NX/bin/nxserver /usr/NX/home/nx
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch gentoo-nomachine.diff
+	epatch ${FILESDIR}/freenx-0.2-gentoo.patch
+}
+
+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
+
+	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 0701 ${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
+}