Version bump, with some ebuild changes: dropped arts/cups/esd USE flags, better to manually enable them in configuration if needed; change recommanded nxsetup line, warn users without PAM that they need to unlock the nx account (bug #262496); add patch to support pam_ssh (i.e pambase with USE=ssh), bugs #142694 and #266572

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 142 insertions, 1 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 1c19d5fd3e46..22efb3556b1b 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.61 2009/03/20 16:39:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.62 2009/04/20 15:21:15 voyageur Exp $
+
+*nxserver-freenx-0.7.3_p104 (20 Apr 2009)
+
+  20 Apr 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-freenx-0.7.3_p104-pam_ssh.patch,
+  +nxserver-freenx-0.7.3_p104.ebuild:
+  Version bump, with some ebuild changes: dropped arts/cups/esd USE flags,
+  better to manually enable them in configuration if needed; change
+  recommanded nxsetup line, warn users without PAM that they need to unlock
+  the nx account (bug #262496); add patch to support pam_ssh (i.e pambase
+  with USE=ssh), bugs #142694 and #266572
 
   20 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
   nxserver-freenx-0.7.3_p102.ebuild:
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch
new file mode 100644
index 000000000000..71a3177601ba
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch
@@ -0,0 +1,10 @@
+--- ./nxnode-login	2009-04-20 16:54:24.000000000 +0200
++++ /usr/bin/nxnode-login	2009-04-20 16:54:27.000000000 +0200
+@@ -73,6 +73,7 @@
+ 	expect {
+ 		"Are you sure you want to continue connecting (yes/no)?" { send "yes\r" }
+ 		"assword*:"  { sleep 0.3; send "$password\r" }
++		"SSH passphrase:"  { sleep 0.3; send "$password\r" }
+ 		"Permission denied*" { exit 1 }
+ 		"su: Authentication failure" { exit 1 }
+ 		"NX> 1000 NXNODE - Version" { 
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104.ebuild
new file mode 100644
index 000000000000..359762b74f11
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2009 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.3_p104.ebuild,v 1.1 2009/04/20 15:21:15 voyageur Exp $
+
+EAPI=1
+
+inherit multilib eutils toolchain-funcs versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+PATCH_VER="$(get_version_component_range 4)"
+MY_PN="freenx-server"
+
+DESCRIPTION="Free Software Implementation of the NX Server"
+HOMEPAGE="http://freenx.berlios.de/ https://launchpad.net/~freenx-team"
+SRC_URI="http://ppa.launchpad.net/freenx-team/ppa/ubuntu/pool/main/f/${MY_PN}/freenx-server_${MAJOR_PV}+teambzr${PATCH_VER/p}.orig.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nxclient rdesktop vnc"
+
+DEPEND="x11-misc/gccmakedep
+	x11-misc/imake"
+RDEPEND="dev-tcltk/expect
+	net-analyzer/gnu-netcat
+	>=net-misc/nx-2.1.0
+	sys-apps/gawk
+	virtual/ssh
+	x11-apps/xauth
+	x11-apps/xrdb
+	x11-apps/sessreg
+	nxclient? ( net-misc/nxclient )
+	!nxclient? ( !net-misc/nxclient
+				 || ( x11-misc/xdialog
+					  x11-apps/xmessage ) )
+	rdesktop? ( net-misc/rdesktop )
+	vnc? ( x11-misc/x11vnc
+		   || ( net-misc/tightvnc net-misc/vnc ) )
+	!net-misc/nxserver-freeedition
+	!net-misc/nxserver-2xterminalserver"
+
+S=${WORKDIR}/${MY_PN}
+
+export NX_HOME_DIR=/var/lib/nxserver/home
+
+pkg_setup () {
+	enewuser nx -1 -1 ${NX_HOME_DIR}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-pam_ssh.patch
+	epatch "${FILESDIR}"/${PN}-0.7.3_p102-nxloadconfig.patch
+	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
+	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
+
+	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
+		-e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \
+		-i nxloadconfig || die "nxloadconfig sed failed"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" || die "compilation failed"
+}
+
+src_install() {
+	export NX_ETC_DIR=/etc/nxserver
+	export NX_SESS_DIR=/var/lib/nxserver/db
+
+	emake DESTDIR="${D}" install || die "install failed"
+
+	# This should be renamed to remove the blocker on net-misc/nxclient
+	use nxclient && rm "${D}"/usr/bin/nxprint
+
+	mv "${D}"/etc/nxserver/node.conf.sample "${D}"/etc/nxserver/node.conf ||
+		die "cannot find default configuration file"
+
+	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
+
+	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 -a -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"
+	elog "This will use the default Nomachine SSH key"
+	elog "If you had older NX servers installed, you may need to add \"--clean --purge\" to the nxsetup command"
+
+	if ! built_with_use net-misc/openssh pam; then
+		elog ""
+		elog "net-misc/openssh was not built with PAM support"
+		elog "You will need to unlock the nx account by setting a password for it"
+	fi
+}