From d9d4a056dffa4cb4d54cbc65a227aba629936d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 11 Aug 2018 20:01:31 +0200 Subject: [PATCH] [media-sound/teamspeak-server] version bump --- media-sound/teamspeak-server/Manifest | 4 +- .../teamspeak-server/files/teamspeak.initd | 45 ------ .../teamspeak-server/files/teamspeak.initd-r1 | 23 +++ .../files/{ts3server.ini => ts3server.ini-r1} | 6 + ...sample => ts3server_mariadb.ini.sample-r1} | 8 +- .../teamspeak-server-3.2.0.ebuild | 134 ------------------ .../teamspeak-server-3.3.0.ebuild | 123 ++++++++++++++++ 7 files changed, 161 insertions(+), 182 deletions(-) delete mode 100644 media-sound/teamspeak-server/files/teamspeak.initd create mode 100644 media-sound/teamspeak-server/files/teamspeak.initd-r1 rename media-sound/teamspeak-server/files/{ts3server.ini => ts3server.ini-r1} (74%) rename media-sound/teamspeak-server/files/{ts3server_mariadb.ini.sample => ts3server_mariadb.ini.sample-r1} (68%) delete mode 100644 media-sound/teamspeak-server/teamspeak-server-3.2.0.ebuild create mode 100644 media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest index 1fe5924..e723192 100644 --- a/media-sound/teamspeak-server/Manifest +++ b/media-sound/teamspeak-server/Manifest @@ -1,2 +1,2 @@ -DIST teamspeak3-server_linux_amd64-3.2.0.tar.bz2 7850988 BLAKE2B 00bcbe3bf1a6352a7366f6e3821dd98158cfc1b84711e031b2e1fb75bf1f96abf64a6de00ed833ab2b34ea564c359c2f32c75205afa9c80474bda53790f29f48 SHA512 b9ecfb8f9619e3716a1a2f38d1ee3239b4fb6bc12f928d3b9b5b4780bbee63d43d029606f4b945b741c61c10ea3ced764137c68a8462fb1660a9cc058aa80109 -DIST teamspeak3-server_linux_x86-3.2.0.tar.bz2 7694652 BLAKE2B 0e937292af8cd93f5be61c02f70cf629a158956dc3b87a17a82c3671d0702d707d19e08f8fbc5f2bfc44565e8bce0af59227441e1d883536b766f878727625f3 SHA512 022713795c37aa59d607649db2b602da5e84b881da16b4522d3a4c235b322eb41793176414e740e9db73e2556d0ef6560702969d1c536a05fc6c4bbed550dbad +DIST teamspeak3-server_linux_amd64-3.3.0.tar.bz2 8383889 BLAKE2B 7397f1c084c7487b613db7c2a71670320636b1c3c5fa353f255d721404dabee39f4f876440613772a1c784947393907c58fb7f275bf212ac3ae46957feb0c5a2 SHA512 375d1476fcbc507aec75a781ee071ccb99753290ecbfb2f2709c9a14556502f27adbbfc31abc9905e33eab3796a6addbde3f81e4714969e18204873c62c0647f +DIST teamspeak3-server_linux_x86-3.3.0.tar.bz2 8257788 BLAKE2B d23dab70b2f847cf8c1e52b36dd72afa8c6f463b7439d3fd0b10e62586e6678c70eced16c934f87cd8fcc18ee1d2013189a9e60c56dfebf356bb4975f0fce821 SHA512 9b85b75d55f0ea2c89bfc0925de008268cb0c82894dc6909588dd2de6d0c271ad19102f7cc6f5d5f1143be3e3e9c56ac6206fb19d120eede1fc9f4ec67a58142 diff --git a/media-sound/teamspeak-server/files/teamspeak.initd b/media-sound/teamspeak-server/files/teamspeak.initd deleted file mode 100644 index cc8393b..0000000 --- a/media-sound/teamspeak-server/files/teamspeak.initd +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/opt/bin/ts3server" -command_background="true" -group="teamspeak" -inifile="/etc/teamspeak3-server/ts3server.ini" -name="TeamSpeak Server" -pidfile="/run/teamspeak3-server/server.pid" -user="teamspeak" - -depend() { - need net - use mysql -} - -start_pre() { - # ensure, that the TS3-server finds all custom supplied shared objects on startup. - LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH" - export 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 - - checkpath -d --owner ${user}:${group} --mode 0700 /run/teamspeak3-server -} - -start() { - ebegin "Starting ${name}" - - start-stop-daemon --start --quiet --background --env "TS3SERVER_LICENSE=accept" \ - --pidfile "${pidfile}" --make-pidfile \ - --user "${user}" --group "${group}" --chdir "/opt/teamspeak3-server" \ - --exec "${command}" -- \ - inifile="${inifile}" - - eend $? -} - -restart() { - stop - sleep 3 - start -} diff --git a/media-sound/teamspeak-server/files/teamspeak.initd-r1 b/media-sound/teamspeak-server/files/teamspeak.initd-r1 new file mode 100644 index 0000000..200ce02 --- /dev/null +++ b/media-sound/teamspeak-server/files/teamspeak.initd-r1 @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +config="/etc/teamspeak3-server/ts3server.ini" +name="TeamSpeak3 Server" +pidfile="/run/${RC_SVCNAME}.pid" +start_stop_daemon_args="--chdir /opt/teamspeak3-server --env TS3SERVER_LICENSE=accept" + +command="ts3server" +command_args="inifile=${config}" +command_background="true" +command_group="teamspeak" +command_user="teamspeak" + +depend() { + use mysql +} + +start_pre() { + # Fix for EPERM bug + rm -f /dev/shm/7gbhujb54g8z9hu43jre8 +} diff --git a/media-sound/teamspeak-server/files/ts3server.ini b/media-sound/teamspeak-server/files/ts3server.ini-r1 similarity index 74% rename from media-sound/teamspeak-server/files/ts3server.ini rename to media-sound/teamspeak-server/files/ts3server.ini-r1 index 962c8b8..769e815 100644 --- a/media-sound/teamspeak-server/files/ts3server.ini +++ b/media-sound/teamspeak-server/files/ts3server.ini-r1 @@ -21,3 +21,9 @@ query_skipbruteforcecheck=0 query_buffer_mb=20 http_proxy= license_accepted=1 +serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/ +query_ssh_ip=0.0.0.0, :: +query_ssh_port=10022 +query_protocols=raw +query_ssh_rsa_host_key=ssh_host_rsa_key +query_timeout=300 diff --git a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1 similarity index 68% rename from media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample rename to media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1 index 94cea8b..6b2a28d 100644 --- a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample +++ b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1 @@ -9,7 +9,7 @@ query_ip=0.0.0.0, :: query_ip_whitelist=query_ip_whitelist.txt query_ip_blacklist=query_ip_blacklist.txt dbplugin=ts3db_mariadb -dbpluginparameter=ts3db_mariadb.ini +dbpluginparameter=/etc/teamspeak3-server/ts3db_mariadb.ini dbsqlpath=/opt/teamspeak3-server/sql/ dbsqlcreatepath=create_mariadb/ dbconnections=10 @@ -21,3 +21,9 @@ query_skipbruteforcecheck=0 query_buffer_mb=20 http_proxy= license_accepted=1 +serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/ +query_ssh_ip=0.0.0.0, :: +query_ssh_port=10022 +query_protocols=raw +query_ssh_rsa_host_key=ssh_host_rsa_key +query_timeout=300 diff --git a/media-sound/teamspeak-server/teamspeak-server-3.2.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.2.0.ebuild deleted file mode 100644 index bd05f6e..0000000 --- a/media-sound/teamspeak-server/teamspeak-server-3.2.0.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver systemd user - -MY_PV="$(ver_cut 1-4)-Beta-$(ver_cut 5)" - -DESCRIPTION="A server software for hosting quality voice communication via the internet" -HOMEPAGE="https://www.teamspeak.com/" -if [[ ${PV} != "*_beta*" ]] ; then - SRC_URI=" - amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 ) - x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )" -else - SRC_URI=" - amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/server/${MY_PV}/teamspeak3-server_linux_amd64-${MY_PV}.tar.bz2 ) - x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/server/${MY_PV}/teamspeak3-server_linux_x86-${MY_PV}.tar.bz2 )" -fi - -LICENSE="LGPL-2.1 teamspeak3" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="doc mysql tsdns" - -RDEPEND="mysql? ( "${T}"/99teamspeak3-server || die - else - echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini\"" > "${T}"/99teamspeak3-server || die - fi - doenvd "${T}"/99teamspeak3-server - - fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server" -} - -pkg_postinst() { - elog "If you have a Non-Profit License (NPL)," - elog "place it in /opt/teamspeak3-server as licensekey.dat." -} diff --git a/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild new file mode 100644 index 0000000..853e132 --- /dev/null +++ b/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eapi7-ver systemd user + +MY_PV="$(ver_cut 1-4)-Beta-$(ver_cut 5)" + +DESCRIPTION="A server software for hosting quality voice communication via the internet" +HOMEPAGE="https://www.teamspeak.com/" +if [[ ${PV} != "*_beta*" ]] ; then + SRC_URI=" + amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 ) + x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )" +else + SRC_URI=" + amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/server/${MY_PV}/teamspeak3-server_linux_amd64-${MY_PV}.tar.bz2 ) + x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/server/${MY_PV}/teamspeak3-server_linux_x86-${MY_PV}.tar.bz2 )" +fi + +LICENSE="LGPL-2.1 teamspeak3" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="doc mysql tsdns" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/teamspeak3-server/libmariadb.so.2 + opt/teamspeak3-server/libts3db_mariadb.so + opt/teamspeak3-server/libts3db_sqlite3.so + opt/teamspeak3-server/libts3_ssh.so + opt/teamspeak3-server/ts3server + opt/teamspeak3-server/tsdnsserver" + +pkg_setup() { + enewgroup teamspeak + enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak +} + +src_unpack() { + default + + mv teamspeak3-server_linux_$(usex amd64 amd64 x86) ${P} || die +} + +src_install() { + keepdir /etc/teamspeak3-server + diropts -o teamspeak -g teamspeak + keepdir /opt/teamspeak3-server /var/log/teamspeak3-server + + touch ${D%/}/opt/teamspeak3-server/.ts3server_license_accepted || die + + exeinto /opt/teamspeak3-server + doexe ts3server + doexe "${FILESDIR}"/ts3server-bin + dodir /opt/bin + dosym ../teamspeak3-server/ts3server-bin /opt/bin/ts3server + + exeinto /opt/teamspeak3-server + doexe libts3db_sqlite3.so libts3_ssh.so + + docinto serverquery + dodoc -r serverquerydocs/. + + dosym ../../usr/share/doc/teamspeak-server-${PV}/serverquery /opt/teamspeak3-server/serverquerydocs + + insinto /opt/teamspeak3-server/sql + doins sql/*.sql + doins -r sql/create_sqlite + + insinto /etc/teamspeak3-server + newins "${FILESDIR}"/ts3server.ini-r1 ts3server.ini + + newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server + systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service + + if use mysql; then + insinto /etc/teamspeak3-server + newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r1 ts3server_mariadb.ini.sample + doins "${FILESDIR}"/ts3db_mariadb.ini.sample + + exeinto /opt/teamspeak3-server + doexe libts3db_mariadb.so + doexe redist/libmariadb.so.2 + + insinto /opt/teamspeak3-server/sql + doins -r sql/create_mariadb + doins -r sql/updates_and_fixes + fi + + if use doc; then + docinto serverquery/html + dodoc doc/serverquery/* + fi + + if use tsdns; then + exeinto /opt/teamspeak3-server + doexe tsdns/tsdnsserver + dodir /opt/bin + dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver + + insinto /etc/teamspeak3-server + doins tsdns/tsdns_settings.ini.sample + + docinto ts3server + dodoc doc/*.txt + + docinto tsdns + dodoc tsdns/README tsdns/USAGE + fi + + cat <<- EOF > "${T}"/99teamspeak3-server || die + CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini" + EOF + doenvd "${T}"/99teamspeak3-server +} + +pkg_postinst() { + elog "If you have a Non-Profit License (NPL)," + elog "place it in /opt/teamspeak3-server as licensekey.dat." + elog "Please note, that the license must be writeable by the teamspeak user." +}