init-script fixes

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

3 files changed, 17 insertions, 7 deletions

diff --git a/media-sound/teamspeak-server-bin/ChangeLog b/media-sound/teamspeak-server-bin/ChangeLog
index e34d8affefbe..d8b997553ba5 100644
--- a/media-sound/teamspeak-server-bin/ChangeLog
+++ b/media-sound/teamspeak-server-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/teamspeak-server-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.17 2010/09/11 15:49:03 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.18 2010/09/11 16:01:50 trapni Exp $
+
+  11 Sep 2010; Christian Parpart <trapni@gentoo.org>
+  files/teamspeak3-server.rc:
+  init-script fixes
 
   11 Sep 2010; Christian Parpart <trapni@gentoo.org>
   -teamspeak-server-bin-3.0.0_beta22.ebuild,
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 906673786294..c1fe3e638af8 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,5 +1,5 @@
 AUX server.conf 337 RMD160 1a03aab9838465ad901b8d2a5baff71092116b63 SHA1 bc7d817d0f5d723dd97112fecf6ba50aae0311f3 SHA256 5520d4d1a0be0fa416e1d4b15f69980cba75c082bf7ae94cefa695af6eb56771
-AUX teamspeak3-server.rc 891 RMD160 0e3a083997081f4d93ecca14c23e3e33b13685d2 SHA1 53612a6e68997b63874526870090537d3089a7d9 SHA256 31e6016e2384f51db9a4110d52de0ddcb0d33eff48760d1822c5ee0aecb3bbf1
+AUX teamspeak3-server.rc 1091 RMD160 3208adfb0bf2404ebd69f1f75561af41902ecee3 SHA1 2518658294144b4843789bb39e47852c48c53675 SHA256 df2cd158fb1b139106c8e3e1e09d443549a8b30d26f7c2d784399531d5052dc5
 AUX ts3server 262 RMD160 bb27d51ece87daaf77b812dd09894141d9e5f905 SHA1 b40ac264473c30b7f157cee491056e37c59101fc SHA256 1565e470d1d17d0161ba78c14726f5fc0628fa155a0153349c869fd8011cbe67
 DIST teamspeak3-server_linux-amd64-3.0.0-beta25.tar.gz 2902907 RMD160 234aa820aae37f82d31b6db74cf79990d6cfea23 SHA1 0f1f4705016a8b6c0ad66811a24b669a5823e1b6 SHA256 747d307854a3d769cd221bfa5ee359f5032aaa4d1ed4441c48ef79be298482d7
 DIST teamspeak3-server_linux-amd64-3.0.0-beta28.tar.gz 3361842 RMD160 95809e16f9eb3994cb97b6e6db7a11e3cd3ed85c SHA1 16bf6bed5e40beb4091b0e7d295e8e3fd62661d1 SHA256 80ac3d272d85dce0e95580d7ca8c62ca494614fbfbd7897fcb08bfcc8f3b8eef
@@ -7,5 +7,5 @@ DIST teamspeak3-server_linux-x86-3.0.0-beta25.tar.gz 3218375 RMD160 b9f3ad4f9a6d
 DIST teamspeak3-server_linux-x86-3.0.0-beta28.tar.gz 3675385 RMD160 368390dcf504dad3f7222e693b48870a2662974b SHA1 2000b3b34e3e79ec4956478381652874f22d2857 SHA256 4d9d76388eb814f47c4b8d66b5050cac99d5e9e3fb267d3b2ec3c4d9a4901c9f
 EBUILD teamspeak-server-bin-3.0.0_beta25.ebuild 2053 RMD160 1ddd84064cc60e2938de8cdf9e0d81e90a1359f5 SHA1 5d87557cf01928d5b73136c75d2f4b20806ce0ed SHA256 84d2d7477157db2c73ad8a6a7f1365ade59d48f6d08e5cbbc8f5e35d30ac5c67
 EBUILD teamspeak-server-bin-3.0.0_beta28.ebuild 1944 RMD160 5fc30de5a072edda181e7cfb975b6c5aa4238618 SHA1 1229c30cdcb2ac4e1b8f25ca46b2216185459d9d SHA256 8e01232e232bfab05360c31d65e7db3f4ece4fe89a6fd2143628724ac20f0fbf
-MISC ChangeLog 3480 RMD160 5e663532115d5719c3fd1a3cb8a90288e638873b SHA1 86bf4de1ad6fecad6340e014a8bcc73e6ccba84c SHA256 918dcb4ec43c57ad4e39c0769dfc745bc85ba9812c0d67aca9a9cf8478d91963
+MISC ChangeLog 3584 RMD160 a8480303bc7ae113e68cca2ea2cdc996338aab5a SHA1 765bc75633a0327f60df58642438a35a68e00ddf SHA256 df66408321b81dfa02dfede34cd0d15101c78e801fc845809fc3bd9f2f5669ee
 MISC metadata.xml 309 RMD160 ae6e1bba345024b9ea45eb5623ab7a730fa29d73 SHA1 859b2305ee7767f22105a5daafadd12e04ff5039 SHA256 aa75b17df1e797ba3b662fc63ed5d2ac5e2c19f84754266c5138f313723a4c31
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
index 12c2d1242d5e..4f83085e283f 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
+++ b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc,v 1.3 2010/01/20 17:55:02 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc,v 1.4 2010/09/11 16:01:50 trapni Exp $
 
 depend() {
 	need net
@@ -11,21 +11,27 @@ depend() {
 start() {
 	ebegin "Starting TeamSpeak 3 Server"
 
-	# temporay fix for EPERM bug
+	# ensure, that the TS3-server finds all custom supplied shared objects on startup.
+	export LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH"
+
+	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
 	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
 
 	start-stop-daemon --start --quiet --background \
 		--pidfile "/var/run/teamspeak3-server/server.pid" --make-pidfile \
 		--chuid "teamspeak3" --chdir "/opt/teamspeak3-server" \
-		--exec "/opt/teamspeak3-server/ts3server-bin" -- \
+		--exec "/usr/sbin/ts3server" -- \
 		inifile="/etc/teamspeak3-server/server.conf"
+
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping TeamSpeak Server"
+
 	start-stop-daemon --stop --quiet \
 		--pidfile "/var/run/teamspeak3-server/server.pid"
+
 	eend $?
 }