Fix samba parameters setting in nxnode, patch by and thanks to Bruno Redondi <bruno.redondi@altarisoluzione.com> in bug #269593

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

4 files changed, 239 insertions, 2 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index e7d3f3bbe367..f0870eb90ed2 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,14 @@
 # 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.65 2009/09/17 09:23:19 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.66 2009/10/09 14:29:00 voyageur Exp $
+
+*nxserver-freenx-0.7.3_p104-r2 (09 Oct 2009)
+
+  09 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +nxserver-freenx-0.7.3_p104-r2.ebuild,
+  +files/nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch:
+  Fix samba parameters setting in nxnode, patch by and thanks to Bruno
+  Redondi <bruno.redondi@altarisoluzione.com> in bug #269593
 
   17 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
   nxserver-freenx-0.7.3_p104-r1.ebuild:
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 4c6338b68d94..9b6b4e68ab03 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -7,6 +7,7 @@ AUX nxserver-freenx-0.7.3-nxloadconfig.patch 2849 RMD160 fafa9dea7324d2c20dc0992
 AUX nxserver-freenx-0.7.3-roundrobin.patch 4130 RMD160 605a87e06ad4626d78abdcfa15ec1f73d3ea0a18 SHA1 c3407eef092b3432c9aba82a6b38e52c45b3dc34 SHA256 4d08d5a75c56f3b976282e191ed8041b6e776fe028f38dce23a2360f911279ed
 AUX nxserver-freenx-0.7.3_p102-cflags.patch 925 RMD160 d735fffcac7500ed1329e273a97d4b5da5a3d825 SHA1 a28ad4001ec8a28b33a4646e48a453bd2e89ba02 SHA256 ca99ad30acaf356ece570ebbc0ca4e52e40590533173bc028872dffc1055066b
 AUX nxserver-freenx-0.7.3_p102-nxloadconfig.patch 2007 RMD160 0bdbcb76de722284d1ba3f39786b31ae3e0cac0b SHA1 f5a8ad8912763a912270a9a83a52d74aefeb1842 SHA256 d241bde25650bd1613618c84aa05c6887f528e44a550fde165a16fb3b7c95396
+AUX nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch 2709 RMD160 973befb2e3c3c92b844b585aca1624f4f506ce79 SHA1 534041c2a3f7a02552f75f021b0ba50cf94a5bbf SHA256 ccc3464e6ae44353f98dda81b2ab8cd6fec2d8994586f6991ec823f9ea5ed658
 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.tar.gz 114680 RMD160 7a635b2d4796f4ab405c974c881985ea66e8efaf SHA1 888344f946cfb0802e2532e6b93601248c909eb8 SHA256 1afa8a64def93ee95a10f9105de2e6a6ff18076ee187c8ad20b34dc54116a3e4
@@ -14,5 +15,6 @@ DIST freenx-server_0.7.3+teambzr104.orig.tar.gz 118242 RMD160 6dc846efa395351611
 EBUILD nxserver-freenx-0.7.3-r2.ebuild 3833 RMD160 0f312fb995bcea727dbc0baab01b010d84417a7d SHA1 5d757cbd208fb19b19c2e210a3810e9e3e3d76db SHA256 8cb3442b05615974263d7ebf22fe3eaa9a9c53630e648d9a4487e83888f95e9f
 EBUILD nxserver-freenx-0.7.3-r3.ebuild 3846 RMD160 8dfe47dc7450d388d56dca1bfe16f0e71af4b0bf SHA1 d0315609950f6cedb19b0b9f9e4df3f2ca362ba1 SHA256 17fed103dcfb2c434e7f16f359e5c70af967f8c143184cf671b673f9a2e7d49a
 EBUILD nxserver-freenx-0.7.3_p104-r1.ebuild 3667 RMD160 3723594676749dcff40ba6a3ff3f6b0f6d33a5dd SHA1 698713bfd4aed06e427cf27cba0cb387625e411c SHA256 b5fdfa4897dbeec20f6ec0285f6af666a0af661eaf076480fc3872d33e3df2a5
-MISC ChangeLog 15355 RMD160 488e15609c0aa53196cba75d7728fb2448f67bb2 SHA1 2a642915cbf6925c310f6870ba485535db35cb01 SHA256 94ae2eef6b568892c609875bb94d53800dfc115035767dcc52cb641d7ac190e8
+EBUILD nxserver-freenx-0.7.3_p104-r2.ebuild 3719 RMD160 9d2a8eba0bf9838661cb2b3bd593eac394db7643 SHA1 83cebfd3b708a2f72b495de77ea202ab1bf5faf2 SHA256 48da013d385908534200e7381028df87ee9e85b0bf3c9eae4bd04e2a0bfebe01
+MISC ChangeLog 15692 RMD160 974e50d5ed5bc22809467517b7ab7c9a5a6f2a6e SHA1 6f3397993996f40383637efb6c6e9b3b1a8b8492 SHA256 1c5cc5561dc0f406d1654c9947b181a1be3f8a09702c6cf62809bcd4987c0466
 MISC metadata.xml 525 RMD160 6b438e37f35775bbce33bbb1a04494049956aa04 SHA1 cf904293a398fd2acb8492d4c0a6c43045d71ea5 SHA256 50af7f059bc7dbf3a4040618c7c9bfa9a6f57ce7eeb2d135ed912a60bcc373bc
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch
new file mode 100644
index 000000000000..543cc16b7b3e
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch
@@ -0,0 +1,106 @@
+diff -ruN freenx-server.orig/nxnode freenx-server/nxnode
+--- freenx-server.orig/nxnode	2009-03-29 14:07:27.000000000 +0200
++++ freenx-server/nxnode	2009-05-12 19:19:28.090537066 +0200
+@@ -85,6 +85,45 @@
+ 	echo $sessionid
+ }
+ 
++setup_samba()
++{
++	smbport=""
++
++	# We know from protocol traces that client=linux,winnt,macosx are valid values.
++	# I hope with smbclientproto=smb on default and smbclientproto=cifs on all valid
++	# values we get support for all those systems.
++
++	smbproto="$SAMBA_MOUNT_SHARE_PROTOCOL"
++
++	if [ "$smbproto" = "both" ]
++	then
++		smbproto="smbfs"
++
++		[ "$client" = "linux" ] && smbproto="cifs"
++		[ "$client" = "winnt" ] && smbproto="cifs"
++		[ "$client" = "macosx" ] && smbproto="cifs"
++
++		# FIXME: This is a rather wild guess
++		[ "$client" = "win9x" ] && smbproto="smbfs"
++	fi
++
++	if [ "$smbproto" = "cifs" ]
++	then
++		smbport=445
++		COMMAND_SMBMOUNT=$COMMAND_SMBMOUNT_CIFS
++		COMMAND_SMBUMOUNT=$COMMAND_SMBUMOUNT_CIFS
++	elif [ "$smbproto" = "none" ] # none
++	then
++		# we set this to true so that the 
++		# SMB mount does not give an error message.
++
++		COMMAND_SMBMOUNT=/bin/true
++		COMMAND_SMBUMOUNT=/bin/true
++	else # smbfs
++		smbport=139
++	fi
++}
++
+ #
+ # -----------------------------------------------------------------------------
+ # Node functions module
+@@ -735,6 +774,7 @@
+ 
+ node_umount_smb()
+ {
++	setup_samba
+ 	[ -e "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" ] || return
+ 	cat "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" | while read mpoint
+ 	do
+@@ -1136,39 +1176,7 @@
+ 
+ 	if [ "$samba" = "1" ]
+ 	then
+-		# We know from protocol traces that client=linux,winnt,macosx are valid values.
+-		# I hope with smbclientproto=smb on default and smbclientproto=cifs on all valid
+-		# values we get support for all those systems.
+-
+-		smbproto="$SAMBA_MOUNT_SHARE_PROTOCOL"
+-
+-		if [ "$smbproto" = "both" ]
+-		then
+-			smbproto="smbfs"
+-
+-			[ "$client" = "linux" ] && smbproto="cifs"
+-			[ "$client" = "winnt" ] && smbproto="cifs"
+-			[ "$client" = "macosx" ] && smbproto="cifs"
+-
+-			# FIXME: This is a rather wild guess
+-			[ "$client" = "win9x" ] && smbproto="smbfs"
+-		fi
+-
+-		if [ "$smbproto" = "cifs" ]
+-		then
+-			smbport=445
+-			COMMAND_SMBMOUNT=$COMMAND_SMBMOUNT_CIFS
+-			COMMAND_SMBUMOUNT=$COMMAND_SMBUMOUNT_CIFS
+-		elif [ "$smbproto" = "none" ] # none
+-		then
+-			# we set this to true so that the 
+-			# SMB mount does not give an error message.
+-
+-			COMMAND_SMBMOUNT=/bin/true
+-			COMMAND_SMBUMOUNT=/bin/true
+-		else # smbfs
+-			smbport=139
+-		fi
++		setup_samba
+ 	fi
+ 	
+ 	# FreeNX specific variables
+@@ -1430,6 +1438,7 @@
+ 
+ cmd_node_smbmount()
+ {
++	setup_samba
+ 	sessionid=$(getparam_sessionid)
+ 	port=$(getparam port)
+ 	username=$(getparam username)
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
new file mode 100644
index 000000000000..3c56333694dd
--- /dev/null
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild
@@ -0,0 +1,121 @@
+# 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-r2.ebuild,v 1.1 2009/10/09 14:29:00 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
+	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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-pam_ssh.patch
+	epatch "${FILESDIR}"/${P}-nxnode_setup_samba.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
+}