Version bump to 3.0.8. Imported helpful changes from srcshelton overlay, fixes bug #471276 and bug #480896.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

7 files changed, 83 insertions, 85 deletions

diff --git a/media-sound/teamspeak-server-bin/ChangeLog b/media-sound/teamspeak-server-bin/ChangeLog
index 669283092395..fb5959742149 100644
--- a/media-sound/teamspeak-server-bin/ChangeLog
+++ b/media-sound/teamspeak-server-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/teamspeak-server-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.31 2013/05/22 11:22:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.32 2013/09/04 12:31:03 tomwij Exp $
+
+*teamspeak-server-bin-3.0.8 (04 Sep 2013)
+
+  04 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +files/ts3db_mysql.ini,
+  +teamspeak-server-bin-3.0.8.ebuild, -files/teamspeak3-server.rc,
+  -teamspeak-server-bin-3.0.7.2.ebuild, files/ts3server, metadata.xml:
+  Version bump to 3.0.8. Imported helpful changes from srcshelton overlay, fixes
+  bug #471276 and bug #480896.
 
 *teamspeak-server-bin-3.0.7.2 (22 May 2013)
 
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 50af9329ef5e..7a3e353acf68 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -5,21 +5,21 @@ AUX server.conf 337 SHA256 5520d4d1a0be0fa416e1d4b15f69980cba75c082bf7ae94cefa69
 AUX systemd/teamspeak3.conf 133 SHA256 a3851323891a304e6fc5c53740c0e239f167a7c9251cfc8c7e8a4e1b1ac8a1d8 SHA512 49dab025ab37bb29e14a14fb070568c5710fe257a35fe6b887aa404847fc828e9ffecad7c5d10e987128934c433c3b464b8da0e4891ba3b48868b73abb4b9a4c WHIRLPOOL b7980faa9d5c0b83fa1d72eeb14745c050b01bec70a8cd0974157ce02eef06faafb4f7b35a0c4cff496b102817a9d8245237808557472f9452108f46ac9362ab
 AUX systemd/teamspeak3.service 500 SHA256 d211157fd94480c2d4c21e797ba01e51d0ec1563f1a34cbcda503a7ef110ea8c SHA512 332486a1b456fecade65004384f032291ee3d6e55c5b347b7dc6e7a39f6a633e3a381922295a8e431810d425c77b645df42d916d51bc4a1118aff056b606f0a4 WHIRLPOOL 4314ea4a1ecc33164c10017a8ee4328fea22a16ef5a600ea84cd8ac54b9eec2bdd835e85a24c01552a46d78ff869f03c7ef0970d32eafa31a72000f07b780b6a
 AUX teamspeak-server-bin-3.0.7.2.rc 1246 SHA256 09a118de9a0114d374789fb60970b26f16ff6a369d35ca0e7195e963c3d792aa SHA512 23ef15d422d78d8d9c28efa3dc54796b13f65cb71f2ad8ccbf5dbb32dfd53c1a7cc01b2c607f1b41930c7286396f42ec51fb448722d2ace52bd4aab57422ffe9 WHIRLPOOL 57504f78b50a09438ea03327d4e2d0f49cb2b20ae1bd30ef520cbcf00f9138723ebbddb9d5dade07b03f0ffcb55e83c0475dcefd37874f2f1182d4a74b12448c
-AUX teamspeak3-server.rc 1220 SHA256 4879a10448d2b9abf546e39a9091458abdc7af9eed63d85a3230204b85d02882 SHA512 050ac1d57733eff782ffd091c508061877b4bb6d59d61d52d90de450e8d0693c80f6998f81bd4b7e4870ae97b9ab199bdadef468e4b89fe34c26308d930e6d1e WHIRLPOOL 8c5643cf50e579b7307c739b99afea153b6436ee44bb487e0d9a0e177d36b7872c20e3f7c6f297fb8c7a2c0ea445393a96e40d054f6a9348241340ecfa20ccc7
-AUX ts3server 262 SHA256 1565e470d1d17d0161ba78c14726f5fc0628fa155a0153349c869fd8011cbe67 SHA512 f922482e754708c551868e05511685f609fb32b7bfbfd8d545b991b5fb24eec20ee31ca5721ef62636228902faa5b43d62a2742637e08683da17694c46cd01fe WHIRLPOOL 197193a3988d132f0ef8423b682a585c4ba22e46ca4ff87e1203b7d38b22e3b6bf3416990441172f2d91c0fde4eddef9aeb34c00a178f1ea02e1583d8d992ce3
-DIST teamspeak3-server_linux-amd64-3.0.7.2.tar.gz 4490216 SHA256 1be5cb2dd03168c8c2b8900748439545e122d0cdbf66e2c9bf3d9bed1d9553f6 SHA512 647ee7c5e3e832db9e53f130603c23d73d21af2e5501bbf3727abad9d317f70e6fd9a0158e10ffcaa28dfd9bb30f23743d8d8f9aef1d450659eb114dc626da97 WHIRLPOOL d421f9610a3b35124b44bbf2b915e7a9af17ad31c77529a8939a33de6b1b6ebed670cd87785474dd3c1b2cb625e7914bb5c8de50ce3b0625d444c6f638c1dc31
-DIST teamspeak3-server_linux-x86-3.0.7.2.tar.gz 4766948 SHA256 9616b6619eb9a253d7b60e4898ee86485d007a0d051c3b044bc3f3204c8a49cf SHA512 69f1296c33bdfdcbb4616571180ef45f6beb6f19b54eed6dd7b82f86df4775395cc711acca7ed9bc0cbdbd357bc3dacee4377b13fd5b3ca6c183ae84e3d75223 WHIRLPOOL 572f74d399e86e4cc3c5cc683009b5be4c7e22519730753b805b2afac22e277d3b53c08d1ada448173a2a3466c36514b6fa57a202da4cb96f2c479589ecf9bd4
-EBUILD teamspeak-server-bin-3.0.7.2.ebuild 2109 SHA256 d85c94651efb6a435df544461bbeea9155ef57035ed276b5975438f40e74dda7 SHA512 995a0d304cf71aa0ee1fe6dc6529f09f4700638b4f1d3ccbee82b5b908c031fa2aaadb1bfadb393213a0ae23f765f78f471551da6f8ddb026f86a64e582dd2df WHIRLPOOL adc6a288f15136880824e3cc556f8953096dd67a27974fb3a5022659139cfe2c3a3c22e4024f1664fe1b1cd1373ac6abd8f81ae85a00f39ecf0fc8cf1fa36b75
-MISC ChangeLog 6767 SHA256 4aebfe8dc76294314092c0230a3a675993582cc9f4b4914177052e42a04f3b94 SHA512 9b1a348b2ac560ca59014cf805f3cda018efe8b62b4409655d8737c479d72ffcb783bbda3c2610df0c44a3e156b856d58c836155a6da656283490035278f12c9 WHIRLPOOL 68cf3c462d2ec123734a5975f1b6b1eba7252ed526a51be0e2241e4be3d600278598abc9f6beaaf38ef1676aef041edcf2b99e164e0080445820f195992b21f7
-MISC metadata.xml 329 SHA256 284267feac74eebadc0d7b308e4a093e4a4241b501a7419af7249c3858ac39b6 SHA512 ef3033517130592ecd40dfcbb6fd226459d1827a7adefe5c677d3fdac91190cd9dbd0a2c1213936e202f0432e04eb354c30cb86f49eb85c79a7d501ef6ecd1c5 WHIRLPOOL fabe3c09ccf7134fb378225897bb2d90fbc16abbe85e3039faf1c6bfe84ea71513ae2b7e083e3760abe1e54bb715b7fb611123b6193ba4dac784320d91a37f6c
+AUX ts3db_mysql.ini 98 SHA256 5b4cde4ed06bf831d6d3ed4bdffa2fd92fd47536a3d0f94352d01df91dcb7c76 SHA512 d2d1ef64c90638fde3cc587d351987b16e96d8cfc83672dee43c0294ab297b83106e682d834008f0213b67b975dadcd4f77c63332c39d155a4125a28206ba7d4 WHIRLPOOL fe8b108a563afafa57aa463b638353277f756ab3bfe858d742ab172cd0ea75d361a07f34f0d65e982e76022d7ce25aabe6c59c04b22958a66969b3c0fa68a7bd
+AUX ts3server 267 SHA256 fd5fb5e2fa508b84b85d84794bc1d5436828fc4cd0729c6cf70c3739e999d0bb SHA512 632297afee021b1603efff9c4070ddeaa10531cab4faa21bc61e259e9109f4d9bc338347da2a435492f509628baf7a8876b3bc7c5a91cb5f81f0c97f8d634c57 WHIRLPOOL 876f82672c0360f65ce87273273952d0f27df4bc37ab030cd575e2d176236fd7790d76879227de7a5e2df495996839df938fc91ef61611641bc4a9fc48d0d015
+DIST teamspeak3-server_linux-amd64-3.0.8.tar.gz 7156063 SHA256 f40bd7976a6fb084868f57bf10e5d954265a732914f45b396aedda530fd9c0c8 SHA512 0b2545e972db570a38b5fe601bbfbdf0cd153f5bc816c6df542bd47f831654f199fb173c95da2ff28855bf0559f9b2e3b054dc22ddf323c44551ba54c7cd46a2 WHIRLPOOL a5f0bd034856ee96dcccff43b0ca98725b35f0accfef9e3215afe6a99dfc50b64a4b6edc86175c54216a288ccefaba596d9182be4a8662eca8c55f64484313c0
+DIST teamspeak3-server_linux-x86-3.0.8.tar.gz 7313865 SHA256 986334b2ed7e3174948f8ed746bfb2c09c69c30c5dc793a9d8b88bac74dbc6e2 SHA512 adf3e86b8869b45e9476479afa7d21d053bdb2f5bb95edca3a62ad487e31991978c652bb6be949414a7638d282c08025114776e4dda875b1bfef52974036646e WHIRLPOOL 2aa8c9f19abd3d755978d1e5d8139d2e84b7c3c82a3d6d8d7100329ce79c8c16d87e8106e06282cc692a471b392a54ff7c83c112639f1aa13ecfa12d5e1a0323
+EBUILD teamspeak-server-bin-3.0.8.ebuild 2563 SHA256 82fb290f3257165605505de25acd806d0af00155970daba21240776852e2bb61 SHA512 47b9f92a2f003fe6e8b48495f979e93498c09b5dc05d232a5e177f4bff84a60174ab65f8a3a6efc2089a95982ec7dac5cfd8c42a0636f8c2179b7c7fa05a16c1 WHIRLPOOL 7240f4f3deca806eb4ae2116193f2086295c36f9772a3383024000e9150beeaa9beb8cc79148c14f6ec95d8edb169168edf9ba958657a2573e43950754bd038e
+MISC ChangeLog 7132 SHA256 167ea25daf3580470a1e6059e13ae47339f313045db17d90f2ccefdba9af1752 SHA512 10f2e18de2ba01679320e6631b1c0b7ae6068e4a0d6af14f74041f02272c7cc5d995cfde0854d6d667e423ad4480cd23ea807d2697df34fd74f7ca45963a3f36 WHIRLPOOL d322fdd3005ab03b2060a24159937404f10863ff3f028fa7f3b51feda108c07a9effa749e2128950a8d5ea9096de015af6b501f76cf69435bc58b580bffe6784
+MISC metadata.xml 389 SHA256 de51f41a72067e7623f118986c9420a7f4eeb4c0f2ba542e3ee9eac2d6b13666 SHA512 934ad028aa6a23cffed03289e40cd27ca8f39f3a66924b9381d455ae51689250b3c07f58ec2c25e6b90b480e9ad5b51dc7ac28a123c05994fcf47b54b8e7ce89 WHIRLPOOL f33b226244f11c64ec9eaa1910b3f8f1565c96a72c84be25db5c8fc42f1b6ba4e11f957c88b9a1785399465cefee168085fc9289a570c8e021fabb91937ea884
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRnKopAAoJEJWyH81tNOV9IhoH/3Y96aJHnbTicjXm7jz9tCQE
-Mw18XsCz4UynOtBU60W7LD2gbcZH8uKW0TQVIkC9IdWEDi6J1h8AMC2M9e8CQUNO
-4Hv13hw2gNCDlvA3QSVna32o856u0PlZWVhSzPoc7wGL5oa3qZiz2rZx3MJfxMBS
-c5CyDmq2jlU9a1yFYYUX2a/MnQRUgNSAwN0mRWrcJhvu7GSO49t4OTXjuBGpWyxX
-42ENJhRfIMMaq/3SL8MAyQGrkQT31sjAeIg8uSOCBouWCYnMkMAw47tHTOhVsL4c
-pQgT2xYqtsTNHk4H3Ok3QE/n2GYAFpMvZ/iMcf8umu5sa5RtQdIZZ2lo7fw+nVo=
-=7YqC
+iQEcBAEBCAAGBQJSJygOAAoJEJWyH81tNOV92ewH/A0AYGxiLzv57JSI5fiSsXpa
+D+CUu9INXue3z4+mT/3iSTwZ8aMKtpXDZ1QdYjYm3N6zupEfV9peUm/mjtRZMH9v
+mdg4jBp1aq6l/acKWrFa7nGQCKVm5JeprZznvjTLmvS5O7bNRxPWU3l2Is2Tu/Xh
+RMlg/zwX1ITTeGMkEwhw0Ar8DfpCy28u73DHi+G9sObteF9hqD4wp4+j7wGQQGWg
+4Nk3OvfsGUd4lQZHi15cExJPSkx6IwSQn8IOJcGtuXLVuS3aCJ3nAW/JFiQz6Ye7
+XcNSp+iK6uMMPFi8t9KJt2Km9BujgKN0601cStxRc0Vw7VZNvgU6V8H0/Avq8JI=
+=nD1+
 -----END PGP SIGNATURE-----
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
deleted file mode 100644
index a4a547aea474..000000000000
--- a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 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.6 2012/12/21 19:24:29 hwoarang Exp $
-
-depend() {
-	need net
-	use mysql
-}
-
-start() {
-	ebegin "Starting TeamSpeak 3 Server"
-
-	# 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
-
-	[ -d /var/run/teamspeak3-server ] || mkdir /var/run/teamspeak3-server
-	chown teamspeak3:teamspeak3 /var/run/teamspeak3-server
-
-	start-stop-daemon --start --quiet --background \
-		--pidfile "/var/run/teamspeak3-server/server.pid" --make-pidfile \
-		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
-		--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 $?
-}
-
-restart() {
-	svc_stop
-	sleep 3
-	svc_start
-}
diff --git a/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini b/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini
new file mode 100644
index 000000000000..7cdc6d6075ab
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini
@@ -0,0 +1,7 @@
+[config]
+host=localhost
+port=3306
+username=teamspeak
+password=teamspeak
+database=teamspeak
+socket=
\ No newline at end of file
diff --git a/media-sound/teamspeak-server-bin/files/ts3server b/media-sound/teamspeak-server-bin/files/ts3server
index 2b2e1c3ce09c..261b47171b3d 100644
--- a/media-sound/teamspeak-server-bin/files/ts3server
+++ b/media-sound/teamspeak-server-bin/files/ts3server
@@ -7,4 +7,4 @@ export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
 # work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
 cd "${BASEDIR}"
 
-exec "${BASEDIR}/ts3server-bin" $*
+exec "${BASEDIR}/sbin/ts3server-bin" $*
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index 8d810c9956ef..ec57db4e56c8 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>TomWij@gentoo.org</email>
-    <name>Tom Wijsman</name>
-  </maintainer>
-  <longdescription>
-    TeamSpeak Server (Voice Communication Software)
-  </longdescription>
+	<maintainer>
+		<email>TomWij@gentoo.org</email>
+		<name>Tom Wijsman</name>
+	</maintainer>
+	<longdescription>
+		TeamSpeak Server (Voice Communication Software)
+	</longdescription>
+	<use>
+		<flag name="tsdns">Make use of TeamSpeak DNS.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.2.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.8.ebuild
index 5dee57f27768..756760dd9a75 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.2.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.8.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.2.ebuild,v 1.1 2013/05/22 11:22:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.8.ebuild,v 1.1 2013/09/04 12:31:03 tomwij Exp $
 
-EAPI=5
+EAPI="5"
 
 inherit eutils systemd user
 
 DESCRIPTION="TeamSpeak Server - Voice Communication Software"
 HOMEPAGE="http://www.teamspeak.com/"
 LICENSE="teamspeak3 GPL-2"
+
 SLOT="0"
+IUSE="doc pdf tsdns"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch mirror strip"
+
+RESTRICT="installsources fetch mirror strip"
 
 SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz )
 	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )"
@@ -34,29 +37,51 @@ pkg_setup() {
 
 src_install() {
 	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
-	local dest="${D}/opt/teamspeak3-server"
-	mkdir -p "${dest}" || die "Can't create ${dest} directory."
-	cp -R "${WORKDIR}/teamspeak3-server_linux-"*/* "${dest}/" || die "Can't copy files to ${dest}."
-	mv "${dest}/ts3server_linux_"* "${dest}/ts3server-bin" || die "Can't rename server file to t3server-bin."
+	local opt_dir="/opt/teamspeak3-server"
+	into ${opt_dir}
+	insinto ${opt_dir}
+
+	# Install binary, wrapper, shell files and libraries.
+	newsbin ts3server_linux_${ARCH} ts3server-bin
 
-	# Install wrapper.
 	exeinto /usr/sbin
-	doexe "${FILESDIR}/ts3server"
+	doexe "${FILESDIR}"/ts3server
+
+	exeinto ${opt_dir}
+	doexe *.sh
+	doins *.so
+	# 'libmysqlclient.so.15' is hard-coded into the ts3-server binary :(
+	dosym "${ROOT}"/usr/$(get_libdir)/mysql/libmysqlclient.so ${opt_dir}/libmysqlclient.so.15
+	doins -r sql
+
+	# Install documentation and tsdns.
+	dodoc -r CHANGELOG doc/*.txt
+	use doc && dodoc -r serverquerydocs
+	use pdf && dodoc doc/*.pdf
+
+	if use tsdns; then
+		newsbin tsdns/tsdnsserver_linux_${ARCH} tsdnsserver
+
+		newdoc tsdns/README README.tsdns
+		newdoc tsdns/USAGE USAGE.tsdns
+		dodoc tsdns/tsdns_settings.ini.sample
+	fi
 
 	# Install the runtime FS layout.
 	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}/server.conf"
+	doins "${FILESDIR}"/server.conf
+	doins "${FILESDIR}"/ts3db_mysql.ini
 	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
 
 	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}/${P}.rc" teamspeak3-server
-	systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
-	systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
+	newinitd "${FILESDIR}"/${PN}-3.0.7.2.rc teamspeak3-server
+	systemd_dounit "${FILESDIR}"/systemd/teamspeak3.service
+	systemd_dotmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf
 
 	# Fix up permissions.
 	fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3-server
-	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
+	fowners teamspeak3 ${opt_dir}
 
-	fowners teamspeak3 /opt/teamspeak3-server
-	fperms 755 /opt/teamspeak3-server
+	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
+	fperms 755 ${opt_dir}
 }