Add nx 3.0 libraries support, security bug #192712

Package-Manager: portage-2.1.3.9

5 files changed, 295 insertions, 5 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index ad2540279e5e..370659311747 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.29 2007/08/10 18:33:35 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.30 2007/09/18 16:35:01 voyageur Exp $
+
+*nxserver-freenx-0.7.0-r1 (18 Sep 2007)
+
+  18 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-freenx-0.7.0-nx3support.patch,
+  +nxserver-freenx-0.7.0-r1.ebuild:
+  Add nx 3.0 libraries support, security bug #192712
 
 *nxserver-freenx-0.7.0 (10 Aug 2007)
 
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 982262c8ab14..77229927a7cf 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -14,6 +14,10 @@ AUX nxserver-freenx-0.7.0-kdecups.patch 1373 RMD160 34227f429683b4d718321fb696fa
 MD5 8c5f7c0037b3d2e759e1dbfde81ebf9a files/nxserver-freenx-0.7.0-kdecups.patch 1373
 RMD160 34227f429683b4d718321fb696faf5e05ed665dc files/nxserver-freenx-0.7.0-kdecups.patch 1373
 SHA256 ad010a7b5d4f1874d9f4e60f18de370eb4a0b1e4ca78aff225918302b00d1ad2 files/nxserver-freenx-0.7.0-kdecups.patch 1373
+AUX nxserver-freenx-0.7.0-nx3support.patch 6969 RMD160 c866cc6641ff560179a178b97fc9f1f9676a8d94 SHA1 191d8b0dc2d4e5b808de3d07537bf9b9f4824170 SHA256 d66f249c6aa6e759c667314f6e770e7074ceff3e318237a7d2de547ed485d601
+MD5 485a7d2c8583e699b7e962ddd027fcea files/nxserver-freenx-0.7.0-nx3support.patch 6969
+RMD160 c866cc6641ff560179a178b97fc9f1f9676a8d94 files/nxserver-freenx-0.7.0-nx3support.patch 6969
+SHA256 d66f249c6aa6e759c667314f6e770e7074ceff3e318237a7d2de547ed485d601 files/nxserver-freenx-0.7.0-nx3support.patch 6969
 AUX nxserver-freenx-0.7.0-xfsfonts.patch 583 RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 SHA1 8d33b566cc23e52f25b356c4ce9a8675661fc440 SHA256 d5bc41d43d46728d770be26680970e8f1608b1aa97e1e0bb2f0cf34bd6c591df
 MD5 6c71560ff7f6002f6a43a946f8b20e6e files/nxserver-freenx-0.7.0-xfsfonts.patch 583
 RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 files/nxserver-freenx-0.7.0-xfsfonts.patch 583
@@ -24,14 +28,18 @@ EBUILD nxserver-freenx-0.6.0.ebuild 3251 RMD160 212a438197bc40eecdb953d410e5f3ae
 MD5 4490a69a17c0c7beafaf3b7ddec58e39 nxserver-freenx-0.6.0.ebuild 3251
 RMD160 212a438197bc40eecdb953d410e5f3ae64e023c9 nxserver-freenx-0.6.0.ebuild 3251
 SHA256 c2f1d560943949d34e44050b6fc95ec4c703525de90d331f40143904b5e4493c nxserver-freenx-0.6.0.ebuild 3251
+EBUILD nxserver-freenx-0.7.0-r1.ebuild 3224 RMD160 4e4e3568d71a2c29827b11a0facf227c00a9f336 SHA1 860ee806bb14ca9f9f563a602f7d0e6b42822f54 SHA256 3b4471f9913a2b56cf3139ccab1f8f1031e82d5fb4e54234e7470e1ed918247d
+MD5 9acf806fd15e46a6ba34bacb27592368 nxserver-freenx-0.7.0-r1.ebuild 3224
+RMD160 4e4e3568d71a2c29827b11a0facf227c00a9f336 nxserver-freenx-0.7.0-r1.ebuild 3224
+SHA256 3b4471f9913a2b56cf3139ccab1f8f1031e82d5fb4e54234e7470e1ed918247d nxserver-freenx-0.7.0-r1.ebuild 3224
 EBUILD nxserver-freenx-0.7.0.ebuild 3284 RMD160 04e88b0067c3f9cd272c1f82be70584cbdc03a38 SHA1 b707d262e9bfccf9b5e3dee7fb7a281c58740044 SHA256 78d8a9c9bb307918d22439453775401b94682728a368eb19c2b158dcbb6cb1a1
 MD5 416ee053c1da3f4f19d7973cc6906309 nxserver-freenx-0.7.0.ebuild 3284
 RMD160 04e88b0067c3f9cd272c1f82be70584cbdc03a38 nxserver-freenx-0.7.0.ebuild 3284
 SHA256 78d8a9c9bb307918d22439453775401b94682728a368eb19c2b158dcbb6cb1a1 nxserver-freenx-0.7.0.ebuild 3284
-MISC ChangeLog 7044 RMD160 f284245512c7724249d65185f443b90b2392e3df SHA1 0baa9fa240cdfcaf2b54c7e257d81d77b7b234ab SHA256 71b4d351de135406f892494f17dbbbae625b5f6559a3a88ac3b8e7aa753e0b5a
-MD5 51d917d54d0678b5d493e0316c64b503 ChangeLog 7044
-RMD160 f284245512c7724249d65185f443b90b2392e3df ChangeLog 7044
-SHA256 71b4d351de135406f892494f17dbbbae625b5f6559a3a88ac3b8e7aa753e0b5a ChangeLog 7044
+MISC ChangeLog 7279 RMD160 65db1064546912cf263c83adfcb60f88643b2dbc SHA1 bd9e2debe0cdba34a44fb719483df23d5e942d40 SHA256 b5e794cf7ec0f46036d36e9fe8de405d26029dd13cf61850b1537c043faa5e11
+MD5 ea351b7d1e5d63e5ac76c26a28f116f3 ChangeLog 7279
+RMD160 65db1064546912cf263c83adfcb60f88643b2dbc ChangeLog 7279
+SHA256 b5e794cf7ec0f46036d36e9fe8de405d26029dd13cf61850b1537c043faa5e11 ChangeLog 7279
 MISC metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d SHA1 591b43c9210782070d5d9b30317b1cef3975ab7e SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e
 MD5 433fa8974d44bd11845f96eb0be88ae7 metadata.xml 350
 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d metadata.xml 350
@@ -42,3 +50,6 @@ SHA256 1d10b1f32814e055aa8289983618c869f3b5a7cc1718c5b943fe32e2e8bfd509 files/di
 MD5 6fa79d6a782ced51048ad11dd422abf0 files/digest-nxserver-freenx-0.7.0 235
 RMD160 4fffb376d8359b2f7aedce2802d784fa7c06521d files/digest-nxserver-freenx-0.7.0 235
 SHA256 9d184ea648e7ffe72fb0394f2887fad339e972a4857607c41415b9116018ae56 files/digest-nxserver-freenx-0.7.0 235
+MD5 6fa79d6a782ced51048ad11dd422abf0 files/digest-nxserver-freenx-0.7.0-r1 235
+RMD160 4fffb376d8359b2f7aedce2802d784fa7c06521d files/digest-nxserver-freenx-0.7.0-r1 235
+SHA256 9d184ea648e7ffe72fb0394f2887fad339e972a4857607c41415b9116018ae56 files/digest-nxserver-freenx-0.7.0-r1 235
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.0-r1 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.0-r1
new file mode 100644
index 000000000000..4c88fd9819e4
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.0-r1
@@ -0,0 +1,3 @@
+MD5 9c21eb45b4193ad7184109f3274c9e33 freenx-0.7.0.tar.gz 57614
+RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 freenx-0.7.0.tar.gz 57614
+SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9 freenx-0.7.0.tar.gz 57614
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
new file mode 100644
index 000000000000..720b922917c6
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
@@ -0,0 +1,147 @@
+diff -Naur freenx-0.7.0.orig/node.conf freenx-0.7.0/node.conf
+--- freenx-0.7.0.orig/node.conf	2007-09-17 15:53:24.000000000 +0200
++++ freenx-0.7.0/node.conf	2007-09-17 15:53:08.000000000 +0200
+@@ -378,6 +378,9 @@
+ # When you installed a 2.0.0 NX Backend, set this to 1.
+ #ENABLE_2_0_0_BACKEND="0"
+ 
++# When you installed a 3.0.0 NX Backend, set this to 1.
++#ENABLE_3_0_0_BACKEND="0"
++
+ # When set to 1 this will automatically resume started sessions
+ #ENABLE_AUTORECONNECT="0"
+ 
+diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
+--- freenx-0.7.0.orig/nxloadconfig	2007-09-17 15:53:24.000000000 +0200
++++ freenx-0.7.0/nxloadconfig	2007-09-17 15:53:07.000000000 +0200
+@@ -184,6 +184,7 @@
+ # Misc directives
+ 
+ ENABLE_2_0_0_BACKEND=""
++ENABLE_3_0_0_BACKEND=""
+ ENABLE_AUTORECONNECT="0"
+ ENABLE_AUTORECONNECT_BEFORE_140="1"
+ EXPORT_USERIP="0"
+@@ -275,13 +276,19 @@
+ [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
+ [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
+ [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
+-[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
++[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXcompshad.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
+ if [ -z "$ENABLE_2_0_0_BACKEND" ]
+ then
+ 	ENABLE_2_0_0_BACKEND="1"
+ 	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
+ fi 
+ 
++if [ -z "$ENABLE_3_0_0_BACKEND" ]
++then
++	ENABLE_3_0_0_BACKEND="1"
++	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 3.[01].0')" ] && ENABLE_3_0_0_BACKEND="0"
++fi
++
+ [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
+ [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+ 
+@@ -303,11 +310,11 @@
+ 	[ ! -f "$REAL_PATH_BIN/nxagent" ] && \
+ 		ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
+ 		
+-	[ ! -f "$PATH_BIN/nxdesktop" ] && \
+-		WARNING="yes" && echo "Warning: Could not find nxdesktop in $PATH_BIN. RDP sessions won't work."
++	[ ! -f "$PATH_BIN/rdesktop" ] && \
++		WARNING="yes" && echo "Warning: Could not find rdesktop in $PATH_BIN. RDP sessions won't work."
+ 		
+-	[ ! -f "$PATH_BIN/nxviewer" ] && \
+-		WARNING="yes" && echo "Warning: Could not find nxviewer in $PATH_BIN. VNC sessions won't work."
++	[ ! -f "$PATH_BIN/vncviewer" ] && \
++		WARNING="yes" && echo "Warning: Could not find vncviewer in $PATH_BIN. VNC sessions won't work."
+ 
+ 	# Check for paths
+ 		
+@@ -535,8 +542,8 @@
+ 	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
+ 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
+ 
+-	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
+-		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
++	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
++		ERROR="yes" && echo "Error: Could not find 1.5.0, 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 to 3.0.0 backend is needed for this version of FreeNX."
+ 		
+ 	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
+ 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
+diff -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
+--- freenx-0.7.0.orig/nxnode	2007-09-17 15:53:24.000000000 +0200
++++ freenx-0.7.0/nxnode	2007-09-17 15:55:03.000000000 +0200
+@@ -414,7 +414,7 @@
+ 	# backingstore
+ 	
+ 	B=""
+-	if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ]
++	if [ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" -a "$ENABLE_3_0_0_BACKEND" != "1" ]
+ 	then
+ 		[ "$backingstore" != 1 ] && B="-bs $backingstore"
+ 		[ "$backingstore" = 1 ] && B="+bs"
+@@ -424,6 +424,7 @@
+ 	
+ 	G=""
+ 	[ -n "$geometry" ] && G="-geometry $geometry"
++	[ -n "$geometry" -a "$type" = "windows" ] && G="-g $geometry"
+ 
+ 	# type of session
+ 	
+@@ -435,7 +436,7 @@
+ 	vncfullscreen=""
+ 	[ "$geometry" = "fullscreen" -a "$type" = "vnc" ] && vncfullscreen="-fullscreen" && G=""
+ 	
+-	[ "$geometry" = "fullscreen" -a "$type" = "windows" ] && G="-geometry `echo $screeninfo | cut -d"x" -f1,2`"
++	[ "$geometry" = "fullscreen" -a "$type" = "windows" ] && G="-g`echo $screeninfo | cut -d"x" -f1,2`"
+ 
+ 	#
+ 	# Start the wanted nxagent
+@@ -443,7 +444,7 @@
+ 
+ 	if [ "$type" = "windows" ]
+ 	then
+-		# nxdesktop session (Windows RDP)
++		# rdesktop session (Windows RDP)
+ 
+ 		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
+ 		# Setup optional parameters
+@@ -457,21 +458,21 @@
+ 
+ 		# Start the agent
+ 		
+-		echo "$agent_password" | $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
++		echo "$agent_password" | $PATH_BIN/rdesktop $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
+ 
+ 	elif [ "$type" = "vnc" ]
+ 	then
+-		# nxviewer session (VNC RFP)
++		# vncviewer session (VNC RFP)
+ 		
+ 		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
+ 		# Setup password
+ 		
+ 		mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/"
+-		echo "$agent_password" | $PATH_BIN/nxpasswd "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd" doit
++		echo "$agent_password" | $PATH_BIN/vncpasswd -f > "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd"
+ 		
+ 		# Start the agent
+ 		
+-		$PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $vncfullscreen $G $K $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
++		$PATH_BIN/vncviewer -encodings "tight hextile copyrect raw" -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd $vncfullscreen $G $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
+ 
+ 	elif [ "$R" = "-R" -a "$rootless" != "1" ]
+ 	then
+@@ -942,8 +943,8 @@
+ 
+ node_start_monitor()
+ {
+-	[ "$ENABLE_2_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
+-	[ "$ENABLE_2_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
++	[ "$ENABLE_2_0_0_BACKEND" = "1" || "$ENABLE_3_0_0_BACKEND" = "1" ] && node_start_monitor_2_0_0 "$@"
++	[ "$ENABLE_2_0_0_BACKEND" = "1" || "$ENABLE_3_0_0_BACKEND" = "1" ] || node_start_monitor_1_5_0 "$@"
+ }
+ 
+ #
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..919e551fc13e
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.0-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2007 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.0-r1.ebuild,v 1.1 2007/09/18 16:35:01 voyageur Exp $
+
+inherit multilib eutils
+
+MY_PN="freenx"
+DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
+HOMEPAGE="http://freenx.berlios.de/"
+SRC_URI="http://download.berlios.de/${MY_PN}/${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"
+
+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}
+
+	mv node.conf.sample node.conf || die
+
+	epatch ${FILESDIR}/${PN}-0.6.0-nxloadconfig.patch
+	epatch ${FILESDIR}/${P}-kdecups.patch
+	epatch ${FILESDIR}/${P}-xfsfonts.patch
+	epatch ${FILESDIR}/${P}-nx3support.patch
+
+	# Fix DISPLAY for XCB-enabled systems
+	sed -i "s/unix:/:/g" nxnode || die
+
+	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 || 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 || 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 || die
+	fi
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	NX_ETC_DIR=/etc/nxserver
+	NX_SESS_DIR=/var/lib/nxserver/db
+
+	dobin nxserver
+	dobin nxnode
+	dobin nxnode-login
+	dobin nxkeygen
+	dobin nxloadconfig
+	dobin nxsetup
+	dobin nxcups-gethost
+	use nxclient || dobin nxprint
+	use nxclient || dobin nxclient
+
+	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
+
+	insinto ${NX_ETC_DIR}
+	doins node.conf
+
+	dodir ${NX_HOME_DIR}
+
+	for x in closed running failed ; do
+		keepdir ${NX_SESS_DIR}/$x
+		fperms 0700 ${NX_SESS_DIR}/$x
+	done
+}
+
+pkg_postinst () {
+	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!!"
+
+	elog "To complete the installation, run:"
+	elog " nxsetup --install --setup-nomachine-key --clean --purge"
+	elog "This will use the default Nomachine SSH key"
+}