From e0ffb208e34389bc6204bba544d461ced181f7a1 Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Sun, 11 Apr 2010 18:51:54 +0000
Subject: [PATCH] Revision bump to fix support for current stable
 net-misc/nx-3.4.0, bug #312879 Package-Manager: portage-2.2_rc67/cvs/Linux
 x86_64

---
 net-misc/nxserver-freenx/ChangeLog            |  13 +-
 net-misc/nxserver-freenx/Manifest             |   7 +-
 .../nxserver-freenx-0.7.3_p104-r2.ebuild      |   6 +-
 .../nxserver-freenx-0.7.3_p104-r3.ebuild      |   6 +-
 .../nxserver-freenx-0.7.3_p104-r4.ebuild      | 120 ++++++++++++++++++
 5 files changed, 141 insertions(+), 11 deletions(-)
 create mode 100644 net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 8f2fc5ae6348..38f013c60392 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,15 @@
 # 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.69 2009/12/15 20:35:41 voyageur Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.70 2010/04/11 18:51:54 voyageur Exp $
+
+*nxserver-freenx-0.7.3_p104-r4 (11 Apr 2010)
+
+  11 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  nxserver-freenx-0.7.3_p104-r2.ebuild,
+  nxserver-freenx-0.7.3_p104-r3.ebuild,
+  +nxserver-freenx-0.7.3_p104-r4.ebuild:
+  Revision bump to fix support for current stable net-misc/nx-3.4.0, bug
+  #312879
 
 *nxserver-freenx-0.7.3_p104-r3 (15 Dec 2009)
 
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 71f0efb762ce..d02163b0f18b 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -6,7 +6,8 @@ AUX nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch 2709 RMD160 973befb2e3c3
 AUX nxserver-freenx-0.7.3_p104-pam_ssh.patch 441 RMD160 f1adcb881d23cb7f950f67210f5842fc91a27b01 SHA1 bfac4b1cdf01ad3b3886dba631b733e8ec7ba2a8 SHA256 854d17b3656ac2382d84b32ed9de893b291217648f08f1f496e3d09a32b8d857
 AUX nxserver.init 568 RMD160 a48a0d4853fcd28c0ec6dd2e0366bc69ac1e4b28 SHA1 3980df2e35c594a806b18062e781fa5e52131ff9 SHA256 eda452183da56f6ef5730f1f9e7c968c462b2d3ad31c58ed6100d90c7533c4f2
 DIST freenx-server_0.7.3+teambzr104.orig.tar.gz 118242 RMD160 6dc846efa3953516110a212fe6030ba4936ad21d SHA1 47046b08b1f329a00feaccd3fff9129b1aee0b9e SHA256 0d8b8ea883d67551f40c6e1c3a4a280d5bd663f27147a054e879c58b31873c71
-EBUILD nxserver-freenx-0.7.3_p104-r2.ebuild 3715 RMD160 130a7498741e7df6323f287ac323547eb998330c SHA1 a6b591887251d54348181bc0a0416e013050dd6f SHA256 bf6d07b2345d390f7c358e91e80e341e90ff78dc2e9006aaf39cc67378142d19
-EBUILD nxserver-freenx-0.7.3_p104-r3.ebuild 3683 RMD160 d344d25931a8bd6a53833305a02e3e538558e2ba SHA1 450d7d4cfccf44c9f3b5fefbc558c3d072d22f2e SHA256 49e473f9e04bda249962ac2cb1c41806a1aa4c09a012ab048c295427b54a949c
-MISC ChangeLog 16599 RMD160 0b0eba19022cfa671a2d117f66dd5c32c7d36ab9 SHA1 7e129d2e8ca6398e8f4679a5c16dd9f36ddf0259 SHA256 e847677f5b449ede10b38641315748cddee4a7eddbe9c8538a8799d7a6e4f6c7
+EBUILD nxserver-freenx-0.7.3_p104-r2.ebuild 3716 RMD160 5ec2ed900033657f502552b35721a7f7ed5becbe SHA1 8c1c513a959e9a85d4c6c23e314c2f814405396d SHA256 8a9bbc1f8f74eb37b2d8ff2ba8635b008de7592063e77d2dfe27d8643ec0ec44
+EBUILD nxserver-freenx-0.7.3_p104-r3.ebuild 3682 RMD160 6a15b774d685d79bc848cffa25441fbe4169eef0 SHA1 1b7387d1441d1ba36de93ae7ce86df43ca2ee4a2 SHA256 3648bd1b60689c5cc69ffb931a0b472e0350e4f0e3d68568c86b3451df356d8d
+EBUILD nxserver-freenx-0.7.3_p104-r4.ebuild 3771 RMD160 960a4ef24b1d732db54f6e313b68abb4d9402e25 SHA1 bcf2266b050c35495038be3ea56a84147ebdcf1b SHA256 463ad4d22214170d80cb5f1131a2fc801b7328ddef882961ef5df72a73c0a239
+MISC ChangeLog 16905 RMD160 9679665d090cc45965f34d8f856bd6755c5576ec SHA1 411484ecdeebd4b595f269d839fc62655bea6adc SHA256 ebef7efa9c33580a5c4a13fa763b946798cf8292506d4294f432d19d3966574f
 MISC metadata.xml 525 RMD160 6b438e37f35775bbce33bbb1a04494049956aa04 SHA1 cf904293a398fd2acb8492d4c0a6c43045d71ea5 SHA256 50af7f059bc7dbf3a4040618c7c9bfa9a6f57ce7eeb2d135ed912a60bcc373bc
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild
index 5bb008f0ab94..c1e5e562aa7e 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r2.ebuild,v 1.3 2009/11/25 14:00:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild,v 1.4 2010/04/11 18:51:54 voyageur Exp $
 
 EAPI=1
 
@@ -24,7 +24,7 @@ RDEPEND="dev-tcltk/expect
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc
 	net-analyzer/gnu-netcat
-	>=net-misc/nx-2.1.0
+	<net-misc/nx-3.4.0
 	sys-apps/gawk
 	virtual/ssh
 	x11-apps/xauth
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
index b070a9a8bb03..637225eb3116 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2009/12/15 20:35:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild,v 1.2 2010/04/11 18:51:54 voyageur Exp $
 
 EAPI=2
 
@@ -24,7 +24,7 @@ RDEPEND="dev-tcltk/expect
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc
 	net-analyzer/gnu-netcat
-	>=net-misc/nx-2.1.0
+	<net-misc/nx-3.4.0
 	sys-apps/gawk
 	virtual/ssh
 	x11-apps/xauth
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild
new file mode 100644
index 000000000000..037e8c7225da
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2010 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-r4.ebuild,v 1.1 2010/04/11 18:51:54 voyageur Exp $
+
+EAPI=2
+
+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
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc
+	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 ) )"
+
+S=${WORKDIR}/${MY_PN}
+
+export NX_HOME_DIR=/var/lib/nxserver/home
+
+pkg_setup () {
+	enewuser nx -1 -1 ${NX_HOME_DIR}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pam_ssh.patch
+	epatch "${FILESDIR}"/${P}-nxnode_setup_samba.patch
+	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
+	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
+	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
+
+	# Path to net-misc/nx files, support for nx 3.4.0
+	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
+		-e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \
+		-e "s#3.\[0123\].0#3.\[01234\].0#g" \
+		-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 has_version 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
+}
-- 
2.26.2