Add a patch to disable tcp listening in nxagent

Package-Manager: portage-2.1.4.4

4 files changed, 143 insertions, 2 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 9120c980e430..61b538b38ddb 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.44 2008/03/18 23:49:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.45 2008/04/02 08:46:47 voyageur Exp $
+
+*nxserver-freenx-0.7.2-r1 (02 Apr 2008)
+
+  02 Apr 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-freenx-0.7.2-nolistentcp.patch,
+  +nxserver-freenx-0.7.2-r1.ebuild:
+  Add a patch to disable tcp listening in nxagent, thanks pappy
 
   18 Mar 2008; Bernard Cafarelli <voyageur@gentoo.org>
   nxserver-freenx-0.7.0-r1.ebuild, nxserver-freenx-0.7.1-r1.ebuild,
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 9656767421a2..5810171bcc62 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -10,6 +10,7 @@ AUX nxserver-freenx-0.7.1-nxserver_fixes.patch 469 RMD160 8a94d5d5768085347fc9a5
 AUX nxserver-freenx-0.7.1-samba.patch 1590 RMD160 bb934a1152250ea1cb812db167f2a141f7e4dcda SHA1 9a508c1bc5b6e8c9b312833602c6b928c5ae61e6 SHA256 0f7778099935739abfc5185c06645613551be9077d012ca04daf91657e4d9eb9
 AUX nxserver-freenx-0.7.1-usession_fixes.patch 1435 RMD160 c3fa000e1996402afd1feefed3d73285c910c387 SHA1 80f53a93be35acab564c6454a1dbf6596078ffd7 SHA256 5cf226e31f3b7f26f6fa749d971e25cbc08c570657c668f7f45d9bfc0ffaa532
 AUX nxserver-freenx-0.7.2-cups.patch 1312 RMD160 c6f0a0675fe7902cc2e53123e708f17e36c44dcd SHA1 3bcd5c4a8bd5ed560f91a705c5f45d3f756c16e9 SHA256 50d0ae81b1bf86aecb0eec82920db481633ae0181dfe2894ac1b10faf5b8644d
+AUX nxserver-freenx-0.7.2-nolistentcp.patch 610 RMD160 1a1625bb2b5840cddf0c927567640a32295206d4 SHA1 adcb471f196294aacc682db449dcf94b178b34ba SHA256 e133da25a6a57a8e8097c4eaef4de2d0a1f45919f1d39af822e4c26b9d6b6fdf
 AUX nxserver-freenx-0.7.2-nxloadconfig.patch 2966 RMD160 07a17869621f0778c64a370f5a1e5a93fe784f17 SHA1 0f78c07c2c800fca9acd2bd3ff636939343a2c03 SHA256 245305309e60d9bf89b9cd1ab2ce4286d54cad16103e5c99c7c21c857cee1556
 AUX nxserver.init 523 RMD160 8d98ed67b55b444340ccb79a0c76c5b2a76ff831 SHA1 81d2835bbb03fd51142692acb6c787c9428c8dbd SHA256 68f7f76296b5826803196e431ae9ecc4ddfa9af4821eb0067b7035b71fde42c4
 DIST freenx-0.7.0.tar.gz 57614 RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 SHA1 243f0c98f02b1c84c59e5b324a5a7e6d3d3d8db3 SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9
@@ -18,6 +19,7 @@ DIST freenx-server-0.7.2.tar.gz 105394 RMD160 fd962a4d7f26db7d5d7aeb8a169950ce54
 EBUILD nxserver-freenx-0.7.0-r1.ebuild 3175 RMD160 7f8d552718d51f72c15d40b7b806d9f4bedaec4b SHA1 f72a65395b59123a7f4145e0367ab170f7f4b8b8 SHA256 68a1a2cea94959d6b7d136ed43d5e304e2ed55ddba7ef4a9152b955fd082bcb1
 EBUILD nxserver-freenx-0.7.1-r1.ebuild 3837 RMD160 e10441cdf642551a560d711e6e92efb2e578281f SHA1 bdc7e89dd7bc2d64e14f7a8679252cf23a44caca SHA256 45e99ff5206f4fdce767783594717ff7d74492f77937f624a7de15db31acc98f
 EBUILD nxserver-freenx-0.7.1-r2.ebuild 3876 RMD160 ca286edeb87785e03c451a041f8ec5cda53b5267 SHA1 fb2aec53ade12c7118496286b0b944c21458a585 SHA256 dbb7a4dc096b1d20603eb55ac42432c49b4c12f2d614934e980c70153d9938d2
+EBUILD nxserver-freenx-0.7.2-r1.ebuild 3607 RMD160 b805c597850d2131acf4c4cb81e5f93c5766e0ae SHA1 670c5f30ab50ff8b8f2085235b403ef9d3358a8a SHA256 b10319f961c4e8150d3772271c2dede0a06f4cdbf3ca5815f92ad41b6a841a14
 EBUILD nxserver-freenx-0.7.2.ebuild 3559 RMD160 6a87c38e709f5990c9573d1c3b316aa7fea61e45 SHA1 c9f82a716bfcad22a685d2e0558a628e9fd08df5 SHA256 ec2d317ab1879607ab638b27bb6725fc960b5379a4de0210e6bc968e16d170e9
-MISC ChangeLog 10215 RMD160 dd2483d676ddf0f96f8761545e581c83c5a4d0b4 SHA1 7cd7afea3391ff6556a22ecb01216ace3b077c73 SHA256 892fbc86e01cf5516834e6d674758050e2647162b77a0205d309d50c3be0924d
+MISC ChangeLog 10462 RMD160 b518f6a070755111ab90129db523f444db48ba84 SHA1 4bd0c2b01962d0df5d6d2e5907dd0572d7a84b52 SHA256 f91d5046ec73bdb7c2cc7495e40f7c0940faf24ce80b8d02f5d5fac91f02a599
 MISC metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d SHA1 591b43c9210782070d5d9b30317b1cef3975ab7e SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nolistentcp.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nolistentcp.patch
new file mode 100644
index 000000000000..35311c3f16ed
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nolistentcp.patch
@@ -0,0 +1,11 @@
+--- nxnode.orig	2008-03-31 14:08:56.000000000 +0200
++++ nxnode	2008-03-31 14:08:58.000000000 +0200
+@@ -525,7 +525,7 @@
+ 		
+ 		# Start the agent
+ 		
+-		PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 &
++		PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -nolisten tcp -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 &
+ 	fi
+ 	
+ 	#
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.2-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..13595c1b1333
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.2-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 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.2-r1.ebuild,v 1.1 2008/04/02 08:46:47 voyageur Exp $
+
+inherit multilib eutils
+
+MY_PN="freenx-server"
+DESCRIPTION="Free Software Implementation of the NX Server"
+HOMEPAGE="http://freenx.berlios.de/"
+SRC_URI="http://download.berlios.de/freenx/${MY_PN}-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+IUSE="arts cups esd nxclient"
+DEPEND="virtual/ssh
+	dev-tcltk/expect
+	sys-apps/gawk
+	net-analyzer/gnu-netcat
+	nxclient? ( net-misc/nxclient )
+	!nxclient? ( !net-misc/nxclient
+				 || ( x11-misc/xdialog
+					  x11-apps/xmessage ) )
+	>=net-misc/nx-2.1.0
+	arts? ( kde-base/arts )
+	cups? ( net-print/cups )
+	esd? ( media-sound/esound )
+	!net-misc/nxserver-freeedition
+	!net-misc/nxserver-2xterminalserver"
+
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-apps/xauth
+	x11-apps/xrdb
+	x11-apps/sessreg"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+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}-nxloadconfig.patch
+	epatch "${FILESDIR}"/${P}-cups.patch
+	epatch "${FILESDIR}"/${P}-nolistentcp.patch
+
+	sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die
+	sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die
+
+	# Change the defaults in nxloadconfig to meet the users needs.
+	if use arts ; then
+		einfo "Enabling arts support."
+		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die
+	fi
+	if use esd ; then
+		einfo "Enabling esd support."
+		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample || die
+	fi
+	if use cups ; then
+		einfo "Enabling cups support."
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig || die
+		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample || die
+	fi
+}
+
+src_install() {
+	NX_ETC_DIR=/etc/nxserver
+	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 -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 --clean --purge"
+	elog "This will use the default Nomachine SSH key"
+}