Fix mounting smb shares

Package-Manager: portage-2.1.4_rc9

6 files changed, 83 insertions, 18 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index f167e32a0425..eaac579ff3c1 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -15,14 +15,21 @@ MD5 08d051f5c082efc3ab71dabbd384d543 files/nx-2.1.0-invalid-options.patch 978
 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 files/nx-2.1.0-invalid-options.patch 978
 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01 files/nx-2.1.0-invalid-options.patch 978
 DIST nx-X11-3.0.0-37.tar.gz 20183918 RMD160 2d8ba625a698d4bd1d8f262a012dcaa9f92d5f20 SHA1 8e875243758722cae03bc8697fd678c08e5e3eb9 SHA256 8f0de96431d17987e1926b800f7aa409efbd02898756fe55b978e1304c32e5df
+DIST nx-X11-3.1.0-1.tar.gz 20175237 RMD160 918ea4f90d463e71dd245d2f54de2a6af267e36e SHA1 f4090090ca573c2915f84d746905c2ef73612ca8 SHA256 1998164fb6741046398cdbe822483f45a438a0c761db61b0b0284030c48d51f9
 DIST nxagent-3.0.0-85.tar.gz 1537674 RMD160 5c80dbf2c016fafe9e20816c3e7b0fd5291f368c SHA1 f8a18851346454b4c05491db1fe067c812fed717 SHA256 3d5b223e7bd0ae3ba4348fe5afee62d22cf457412f254c33fd11ae5898a716d9
 DIST nxagent-3.0.0-93.tar.gz 1534641 RMD160 8d73b31e4c5930737b19dbb6db0a4de9b69b911b SHA1 a1ac0b4cd222b7663d2c32de7a6937c148a12167 SHA256 6cb345921fb527a7093f96484b9550526f9b9c07e9bb1210a7733cd8ce3f2e24
+DIST nxagent-3.1.0-2.tar.gz 1538314 RMD160 e355556fa098b3cf2e1c2db7be1de4cdd2863c59 SHA1 72799be7ab793f74843b66c8d129d03b8b014f75 SHA256 68c4900aa1947073c4381d54546baac353558508788d22ba78a2959eb06c3757
 DIST nxauth-3.0.0-6.tar.gz 30474 RMD160 e71ae1b83b78f47f9bacf6d85cca529bfda8b2d0 SHA1 4813adbfb99908da73979456fa381a40fea7489e SHA256 09868f985ab71f9cefa61ddd0e809cb41583b31af5098a0b4cdc7a0f4d7fdd62
+DIST nxauth-3.1.0-1.tar.gz 29922 RMD160 4813d95a64b424143d7e36b761376daab14e7dbf SHA1 4bc9eaa75ac62d73cd2d2eeec6d008ef790496ee SHA256 3636bd340ab4de613cdb3e7995c683d19f0a267ec77a8e3371635d57c33c91dc
 DIST nxcomp-3.0.0-43.tar.gz 530677 RMD160 8d0d04333b1a90d10da0d4653e196c1754dcab28 SHA1 af6554c2748691f6d5206d23215b6acc45141f9b SHA256 cff0ae97284b8a6d32f57cf20617e6aa021565fe3595545e888eeaaaf5aef48e
 DIST nxcomp-3.0.0-48.tar.gz 500084 RMD160 0b71022cd986914d4f98144f82a6e16c487a374a SHA1 39f5fc9256e180dee9dad6ef0f2c65cbdca00bb1 SHA256 9df9122d898d8cd4bce83c3cfb8c61133b5138f83ec6887ff5944ab4bf10e79f
+DIST nxcomp-3.1.0-4.tar.gz 500228 RMD160 fdd35bd5bac75729af380943c9d1d4a8ce1c0e97 SHA1 bd468baf4b5af46925d6c596cfec8e2bc10926b6 SHA256 7355a9b8e386ffcabddbd164024c852a8902e19e34641078b2b9bd855a7928eb
 DIST nxcompext-3.0.0-18.tar.gz 89984 RMD160 8b4e483e0226041d758920957b4a20626342b797 SHA1 ef7021673fbbe11ed5635c1f58052127c0d7466a SHA256 a6c2bb400d6a970e94db453491d345cbeebd4be0a1b3969b38281a658f6fa554
+DIST nxcompext-3.1.0-2.tar.gz 121284 RMD160 9bf0df1453ff32e1fc730271ea2a9e27a91cf5a8 SHA1 63210a5ea6514d4d6e2f60480162811a25e9c413 SHA256 8502082a56cfeed4fd2b11fbd2a467e44b9b0fcc7c6ebe50661ec0784d966ce6
 DIST nxcompshad-3.0.0-19.tar.gz 71747 RMD160 0a0d1142024544956eece74d0ea5929ebdb67ec8 SHA1 37519203e0a12762607f64c3978f01383dab81df SHA256 0011b7cff616001e7e9f846ed4f128b39ed6a4a0a40aa62138afc13fbb0c6cec
+DIST nxcompshad-3.1.0-2.tar.gz 72510 RMD160 cce5e3031c23574c70f6c8851bf5637f8d99c1ec SHA1 b4786468cac0509e5f530a626f866da31958908e SHA256 3741dbd427fb40363c34170cb90e61c108c1414453665b5aac2644f09b8b5974
 DIST nxproxy-3.0.0-4.tar.gz 82730 RMD160 b96e8752fce7015da88e2e304c8647abc6591892 SHA1 b4e22c541f3ae6f08f16c0239494475519de4045 SHA256 e2a838697d79b8621851e1fbe12dd699699f6ab62fa2caa92c53a0fefe901954
+DIST nxproxy-3.1.0-2.tar.gz 80127 RMD160 5fa986880540e61674f2d510d8ae22d4b1bc4825 SHA1 2ed7feaf8aa598f7f0b50be3d4dac3a652d9581c SHA256 a5dc41e4e58cf140b4e735405f98f863fb8dc49cd0ce06571539e1efad5cb2b4
 EBUILD nx-3.0.0-r1.ebuild 3318 RMD160 ec6164ba91ae239540e395513f8a8f6d3b469a56 SHA1 bac06951cec8e1e46259cff3bf53d7af1190859a SHA256 25f5694a4092465330774945ec714aa7aa5881596b86db30272ad17f885339b1
 MD5 d6b896a49c0e979f059f655d7b66e43f nx-3.0.0-r1.ebuild 3318
 RMD160 ec6164ba91ae239540e395513f8a8f6d3b469a56 nx-3.0.0-r1.ebuild 3318
@@ -31,10 +38,14 @@ EBUILD nx-3.0.0.ebuild 2877 RMD160 c63d57674c85dcfe30c41180a621de3db7ffb248 SHA1
 MD5 44fe006e3f6bba525cef39d01911e8eb nx-3.0.0.ebuild 2877
 RMD160 c63d57674c85dcfe30c41180a621de3db7ffb248 nx-3.0.0.ebuild 2877
 SHA256 4ae2434ac53802d29d93ade86e3634915840eb5436e2849524ba8cc5fdfcccbe nx-3.0.0.ebuild 2877
-MISC ChangeLog 2246 RMD160 afd5d74846fe418fe4a763ad547706ff2456ff87 SHA1 4867c905a8d12b4b7b0c13024de3dee56e1dd0e9 SHA256 63cc181f8b9345e74b1a0c4871ed3616cfa68dca7886f1ffbf03b9cb30f4441d
-MD5 65ebfb17e374e83c73b67cb5f347d5c2 ChangeLog 2246
-RMD160 afd5d74846fe418fe4a763ad547706ff2456ff87 ChangeLog 2246
-SHA256 63cc181f8b9345e74b1a0c4871ed3616cfa68dca7886f1ffbf03b9cb30f4441d ChangeLog 2246
+EBUILD nx-3.1.0.ebuild 3232 RMD160 3990e063fa25b26d1c6725f0de314dc4ea767cf9 SHA1 6c53f2be4be9d0a92036c58020b0d5dace02b4a9 SHA256 f84f208b1ab9ace1f29923ee7bc03cc06909fd6f961b08b14964842f77ad3a18
+MD5 e7b56c58139678fed7208d94cd0db4b6 nx-3.1.0.ebuild 3232
+RMD160 3990e063fa25b26d1c6725f0de314dc4ea767cf9 nx-3.1.0.ebuild 3232
+SHA256 f84f208b1ab9ace1f29923ee7bc03cc06909fd6f961b08b14964842f77ad3a18 nx-3.1.0.ebuild 3232
+MISC ChangeLog 2374 RMD160 a10ae1296168ea5a583d6ec4af0afc309b6aaa61 SHA1 8dde113c5a0c891023def8a4661183fec29e91f9 SHA256 42647764dadac6b22f7fd73e6f97115246c2d5be3cec0ce75a694f28aa4de9bb
+MD5 6282255e3183c72eff1e715083310e42 ChangeLog 2374
+RMD160 a10ae1296168ea5a583d6ec4af0afc309b6aaa61 ChangeLog 2374
+SHA256 42647764dadac6b22f7fd73e6f97115246c2d5be3cec0ce75a694f28aa4de9bb ChangeLog 2374
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
 MD5 a2d70e2a73718e9fc4f8b89eecc1952b metadata.xml 254
 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f metadata.xml 254
@@ -45,3 +56,6 @@ SHA256 339e2fa700c4fbe38f8cc97d359b55c21b860858c62d8f059fd12a02ea3064d0 files/di
 MD5 ac3da98e0ff4429fb72464800996b42c files/digest-nx-3.0.0-r1 1747
 RMD160 c6aee97069b63678826d76539fc16d37eb094dc1 files/digest-nx-3.0.0-r1 1747
 SHA256 b2a6f5fc16ba510c9eca5e28d33740f94f2de42f190931e155d86d0770d2718b files/digest-nx-3.0.0-r1 1747
+MD5 b8bf35aab1ded01c68e0e78d20ac8499 files/digest-nx-3.1.0 1735
+RMD160 b7fdbc75f9740a3046432b25c38c49dc7546ebff files/digest-nx-3.1.0 1735
+SHA256 97498bc4ed0156c3e29f34b065e514aeee946b3075990a559ca379940d62872a files/digest-nx-3.1.0 1735
diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 360f3d317c9d..753911abd4db 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.39 2007/12/03 20:00:26 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.40 2007/12/14 14:22:17 voyageur Exp $
+
+*nxserver-freenx-0.7.1-r2 (14 Dec 2007)
+
+  14 Dec 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-freenx-0.7.1-samba.patch, -nxserver-freenx-0.7.1.ebuild,
+  +nxserver-freenx-0.7.1-r2.ebuild:
+  Fix mounting smb shares, thanks again Bruno Redondi in bug #202045
 
 *nxserver-freenx-0.7.1-r1 (03 Dec 2007)
 
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 291d84b07925..5094ff0c17b9 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -34,6 +34,10 @@ AUX nxserver-freenx-0.7.1-nxserver_fixes.patch 469 RMD160 8a94d5d5768085347fc9a5
 MD5 dbb3e37be27719a4018f80e53bdc2aa1 files/nxserver-freenx-0.7.1-nxserver_fixes.patch 469
 RMD160 8a94d5d5768085347fc9a5ed1fed5b0440917a02 files/nxserver-freenx-0.7.1-nxserver_fixes.patch 469
 SHA256 a9f3e1e98214c86aaf7cd2d302f19b621d55a727cb16799aa9519877e9519efa files/nxserver-freenx-0.7.1-nxserver_fixes.patch 469
+AUX nxserver-freenx-0.7.1-samba.patch 1590 RMD160 bb934a1152250ea1cb812db167f2a141f7e4dcda SHA1 9a508c1bc5b6e8c9b312833602c6b928c5ae61e6 SHA256 0f7778099935739abfc5185c06645613551be9077d012ca04daf91657e4d9eb9
+MD5 210b69202c75404d1a1beccfc45778d8 files/nxserver-freenx-0.7.1-samba.patch 1590
+RMD160 bb934a1152250ea1cb812db167f2a141f7e4dcda files/nxserver-freenx-0.7.1-samba.patch 1590
+SHA256 0f7778099935739abfc5185c06645613551be9077d012ca04daf91657e4d9eb9 files/nxserver-freenx-0.7.1-samba.patch 1590
 AUX nxserver-freenx-0.7.1-usession_fixes.patch 1435 RMD160 c3fa000e1996402afd1feefed3d73285c910c387 SHA1 80f53a93be35acab564c6454a1dbf6596078ffd7 SHA256 5cf226e31f3b7f26f6fa749d971e25cbc08c570657c668f7f45d9bfc0ffaa532
 MD5 305686acdf5236696891538a6a07049a files/nxserver-freenx-0.7.1-usession_fixes.patch 1435
 RMD160 c3fa000e1996402afd1feefed3d73285c910c387 files/nxserver-freenx-0.7.1-usession_fixes.patch 1435
@@ -52,14 +56,14 @@ EBUILD nxserver-freenx-0.7.1-r1.ebuild 3899 RMD160 e843123577ed25cbdd890a929a9a0
 MD5 e62d063fb949127e01ebaae09ba2855c nxserver-freenx-0.7.1-r1.ebuild 3899
 RMD160 e843123577ed25cbdd890a929a9a011cff8cdda2 nxserver-freenx-0.7.1-r1.ebuild 3899
 SHA256 d12cd9a20540ce885b8a8c1533521ec983e45b70f71c66d7c3eba37edccf5180 nxserver-freenx-0.7.1-r1.ebuild 3899
-EBUILD nxserver-freenx-0.7.1.ebuild 3627 RMD160 a106d5b2fca655e2700b66cacd7e0017647659da SHA1 7138c4960fc4c213c4276b38248a8a9d4f865667 SHA256 51e8fad24f5819411df48be694b4169ce6ff8418ec6d67c9e2674c92acd03076
-MD5 c3b94dee52df7e377240c7bf9b1e1b9c nxserver-freenx-0.7.1.ebuild 3627
-RMD160 a106d5b2fca655e2700b66cacd7e0017647659da nxserver-freenx-0.7.1.ebuild 3627
-SHA256 51e8fad24f5819411df48be694b4169ce6ff8418ec6d67c9e2674c92acd03076 nxserver-freenx-0.7.1.ebuild 3627
-MISC ChangeLog 9188 RMD160 34d5adfa883fdc916070479175945882f0427829 SHA1 79a6b14aa4eee0c54cf59bc3705fbfedc083f552 SHA256 4a29760acf274af55e294330f22ca90b5790169441201c2de8a4d8352010f459
-MD5 52a2ad8a012f8f932e97484a03261dfb ChangeLog 9188
-RMD160 34d5adfa883fdc916070479175945882f0427829 ChangeLog 9188
-SHA256 4a29760acf274af55e294330f22ca90b5790169441201c2de8a4d8352010f459 ChangeLog 9188
+EBUILD nxserver-freenx-0.7.1-r2.ebuild 3938 RMD160 faa3c15a997969fd33334e1b9db51ff0aa964545 SHA1 63cbd6b503ea4e03d91a268e404b680a3d06a77a SHA256 cd9fa34c58f17b49138b8847c5671fb84da502d4ae71287ff6afa16267f77eac
+MD5 57096fc086c05c5d14cf9b035e190bc0 nxserver-freenx-0.7.1-r2.ebuild 3938
+RMD160 faa3c15a997969fd33334e1b9db51ff0aa964545 nxserver-freenx-0.7.1-r2.ebuild 3938
+SHA256 cd9fa34c58f17b49138b8847c5671fb84da502d4ae71287ff6afa16267f77eac nxserver-freenx-0.7.1-r2.ebuild 3938
+MISC ChangeLog 9465 RMD160 901b135deb3e311498af22c3a6ece9625f5148eb SHA1 0e92c5964418b7f5d68fd2293d003995ad2ad8b5 SHA256 02b1dd9d045619706d8a1b4b0046fbe81acf8f7999c46cd4d0cb2b4bf092a107
+MD5 14c0d4a70ee73b77792200c0111f7be7 ChangeLog 9465
+RMD160 901b135deb3e311498af22c3a6ece9625f5148eb ChangeLog 9465
+SHA256 02b1dd9d045619706d8a1b4b0046fbe81acf8f7999c46cd4d0cb2b4bf092a107 ChangeLog 9465
 MISC metadata.xml 350 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d SHA1 591b43c9210782070d5d9b30317b1cef3975ab7e SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e
 MD5 433fa8974d44bd11845f96eb0be88ae7 metadata.xml 350
 RMD160 53819424da8eb045d991b7d02b8a6d9e6d54369d metadata.xml 350
@@ -67,9 +71,9 @@ SHA256 5cf73679195a2c8a5a960d30614cfd340b7aadabb2e4c684928f44527278500e metadata
 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
-MD5 efb81b3a243f38c1393b93d118b3745f files/digest-nxserver-freenx-0.7.1 235
-RMD160 f8c7d17d303422e1bbd252fa107d60f626e536f8 files/digest-nxserver-freenx-0.7.1 235
-SHA256 3d943fb223cc3963b8d10b34490ea347cdfb5264f37af98ec5bad4ce3910b70b files/digest-nxserver-freenx-0.7.1 235
 MD5 efb81b3a243f38c1393b93d118b3745f files/digest-nxserver-freenx-0.7.1-r1 235
 RMD160 f8c7d17d303422e1bbd252fa107d60f626e536f8 files/digest-nxserver-freenx-0.7.1-r1 235
 SHA256 3d943fb223cc3963b8d10b34490ea347cdfb5264f37af98ec5bad4ce3910b70b files/digest-nxserver-freenx-0.7.1-r1 235
+MD5 efb81b3a243f38c1393b93d118b3745f files/digest-nxserver-freenx-0.7.1-r2 235
+RMD160 f8c7d17d303422e1bbd252fa107d60f626e536f8 files/digest-nxserver-freenx-0.7.1-r2 235
+SHA256 3d943fb223cc3963b8d10b34490ea347cdfb5264f37af98ec5bad4ce3910b70b files/digest-nxserver-freenx-0.7.1-r2 235
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1-r2
index aad19a87b1b6..aad19a87b1b6 100644
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.7.1-r2
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-samba.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-samba.patch
new file mode 100644
index 000000000000..01601dd966f1
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-samba.patch
@@ -0,0 +1,32 @@
+--- nxnode~	2007-12-05 18:41:09.714867153 +0100
++++ nxnode	2007-12-10 18:19:20.572614463 +0100
+@@ -56,7 +56,7 @@
+ {
+ 	stringinstring "&$1=" "$CMDLINE" || return 1
+ 	
+-	echo "$CMDLINE" |  tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }'
++	echo "$CMDLINE" |  tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }' | sed 's|%24|$|'
+ 	
+ 	return 0
+ }
+@@ -720,7 +720,7 @@
+ 		# Catch NXAGENT SMB Port (sometimes the port differs from what we got from nxserver)
+ 		#
+ 		
+-		if stringinstring "Info: Listening for SMB connections on port" "$line"
++		if stringinstring "Info: Listening * SMB connections on port" "$line"
+ 		then
+ 			SMBMOUNT_PORT=$(echo $line | cut -d"'" -f2)
+ 			echo "$SMBMOUNT_PORT" >"$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mport"
+@@ -1314,8 +1314,9 @@
+ 		sleep 1
+ 	done
+ 	# sometimes the samba port we get from nxserver is not the right one, so let's get it from nxagent
+-	port=$(cat "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mport")
+-	error=$(PASSWD="$password" $COMMAND_SMBMOUNT "//$computername/$share" "$HOME/$dir" -o username="$username,ip=127.0.0.1,port=$port" 2>&1)
++	realport=$(cat "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mport")
++	[ -n "$realport" ] && port=$realport
++	error=$(PASSWD="$password" $COMMAND_SMBMOUNT "//$computername/$share" "$HOME/$dir" -o username="$username",ip=127.0.0.1,port=$port 2>&1)
+ 	if [ $? -eq 0 ]
+ 	then
+ 		$PATH_BIN/nxdialog -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$share' mounted on: '$HOME/$dir'" -display :$display &
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r2.ebuild
index d13ccef56152..ade3e165ef9e 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.4 2007/11/07 09:52:51 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1-r2.ebuild,v 1.1 2007/12/14 14:22:17 voyageur Exp $
 
 inherit multilib eutils
 
@@ -32,7 +32,8 @@ RDEPEND="${DEPEND}
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc
 	x11-apps/xauth
-	x11-apps/xrdb"
+	x11-apps/xrdb
+	x11-apps/sessreg"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
@@ -52,6 +53,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-cups.patch
 	epatch "${FILESDIR}"/${P}-nxdialog.patch
 	epatch "${FILESDIR}"/${P}-nscd.patch
+	epatch "${FILESDIR}"/${P}-usession_fixes.patch
+	epatch "${FILESDIR}"/${P}-nxserver_fixes.patch
+	epatch "${FILESDIR}"/${P}-samba.patch
 
 	sed -i "/PATH_LIB=/s/lib/$(get_libdir)/g" nxloadconfig || die
 	sed -i "/REAL_PATH_BIN=/s/lib/$(get_libdir)/g" nxloadconfig || die
@@ -111,6 +115,8 @@ src_install() {
 		keepdir ${NX_SESS_DIR}/$x
 		fperms 0700 ${NX_SESS_DIR}/$x
 	done
+
+	newinitd "${FILESDIR}"/nxserver.init nxserver
 }
 
 pkg_postinst () {
@@ -119,11 +125,13 @@ pkg_postinst () {
 	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:"