From 816567bbc89b9b0752db03cb586b7d2865f69466 Mon Sep 17 00:00:00 2001 From: Denis Lisov Date: Sat, 20 Apr 2019 01:55:01 +0300 Subject: media-sound/teamspeak-client: bump to 3.2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream version bump. Upstream lists this as a security fix to the Qt framework, so it may not be one for Gentoo due to the use of system Qt, but the servers are recommended to require 3.2.5 clients too. Signed-off-by: Denis Lisov Closes: https://github.com/gentoo/gentoo/pull/11637 Signed-off-by: Michał Górny --- media-sound/teamspeak-client/Manifest | 2 + ...eak-client-3.2.3-qt-5.12-symbol-reexports.patch | 141 --------------------- ...eak-client-3.2.5-qt-5.12-symbol-reexports.patch | 141 +++++++++++++++++++++ .../teamspeak-client-3.2.3-r2.ebuild | 102 --------------- .../teamspeak-client/teamspeak-client-3.2.5.ebuild | 102 +++++++++++++++ 5 files changed, 245 insertions(+), 243 deletions(-) delete mode 100644 media-sound/teamspeak-client/files/teamspeak-client-3.2.3-qt-5.12-symbol-reexports.patch create mode 100644 media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch delete mode 100644 media-sound/teamspeak-client/teamspeak-client-3.2.3-r2.ebuild create mode 100644 media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild (limited to 'media-sound/teamspeak-client') diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest index 500eb810a51c..61603280d186 100644 --- a/media-sound/teamspeak-client/Manifest +++ b/media-sound/teamspeak-client/Manifest @@ -1,2 +1,4 @@ DIST TeamSpeak3-Client-linux_amd64-3.2.3.run 76247769 BLAKE2B 2fc226455bf839811ad82735c30f493ac9800e6f5f2f3af2d34bcbce3abd7478144feff329c3afa31d994a891990ecae5f51aa3fa001fe828d4ae0bba60fc6e9 SHA512 6f2a0e366589a3495be3ecbe3e866e1d05db3578ed1e2bf19195e6d6818acc1ddb44b46915aa88ff64ac6cc150d3b88b3347147bb0cde93e013aa7960c10dfab +DIST TeamSpeak3-Client-linux_amd64-3.2.5.run 76619678 BLAKE2B b8d42a4d633124cab395ea69d3ccbebc65f4d9b5a148c6a81a6d9a3afab48dd59fd99ac3f5cc9551c89daabb7cc51a60c5587034a7a5bec5e3b530ecb3d6e220 SHA512 fdfaa863d3523fffdf46ca0cf9c2b0588e8d847e348ade75c8f82818920f493460740a5192d4cc8d1eafe1e7a03af93b09ae6ddecaa0b166552ab5409508a445 DIST TeamSpeak3-Client-linux_x86-3.2.3.run 75997823 BLAKE2B 03403430d6409ceebcbdfcdb48b54142327a003c300a3bcbd63f9fb6e40c259f50ee9346fe54fbbb3a19143bacb782248f5b61d2a950f893e8227568a2df1839 SHA512 ad6ea2d5f8237585859c5deac11e0f0b6af6018b2a92fe0aab2a04cfdeab0bd57166bf4fec273d48fedd20819203cba2fd58c3a76b59ec3224e867fc10172808 +DIST TeamSpeak3-Client-linux_x86-3.2.5.run 76311914 BLAKE2B 4a8f4a6ce55bde680f2d9d1f28c1cabe2a01fa6c10f3f3f637931dbe2f652c87cd2a7b61f054b50a8faf3bce461e316ca2e9b68418271535a5f6a3cd0b9d3492 SHA512 90b46a840a6e43bbc7d4cfb526117a81cdb92fb8186194ab9f245e8e501608ec4740a198e8d1de5e3f69bea84ab6281384915193d4e6a1e90aff45b4b80d3d9a diff --git a/media-sound/teamspeak-client/files/teamspeak-client-3.2.3-qt-5.12-symbol-reexports.patch b/media-sound/teamspeak-client/files/teamspeak-client-3.2.3-qt-5.12-symbol-reexports.patch deleted file mode 100644 index ee5f78914d0b..000000000000 --- a/media-sound/teamspeak-client/files/teamspeak-client-3.2.3-qt-5.12-symbol-reexports.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/Makefile b/Makefile -new file mode 100644 -index 0000000..c036d5f ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,2 @@ -+overrides.so: qt-5.12-overrides.o override-version.map -+ $(CXX) $(LDFLAGS) -shared -o $@ -Wl,--version-script override-version.map qt-5.12-overrides.o -diff --git a/override-version.map b/override-version.map -new file mode 100644 -index 0000000..991d98e ---- /dev/null -+++ b/override-version.map -@@ -0,0 +1 @@ -+Qt_5 {}; -diff --git a/qt-5.12-overrides.cpp b/qt-5.12-overrides.cpp -new file mode 100644 -index 0000000..002a1af ---- /dev/null -+++ b/qt-5.12-overrides.cpp -@@ -0,0 +1,120 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtWebEngine module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include -+#include -+ -+#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn))) -+#define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5") -+#define SHIM_HIDDEN __attribute__ ((visibility ("hidden"))) -+ -+extern "C" { -+ -+SHIM_SYMBOL_VERSION(malloc); -+void* __malloc(size_t size) -+ SHIM_ALIAS_SYMBOL(ShimMalloc); -+ -+SHIM_SYMBOL_VERSION(free); -+void __free(void* ptr) -+ SHIM_ALIAS_SYMBOL(ShimFree); -+ -+SHIM_SYMBOL_VERSION(realloc); -+void* __realloc(void* ptr, size_t size) -+ SHIM_ALIAS_SYMBOL(ShimRealloc); -+ -+SHIM_SYMBOL_VERSION(calloc); -+void* __calloc(size_t n, size_t size) -+ SHIM_ALIAS_SYMBOL(ShimCalloc); -+ -+SHIM_SYMBOL_VERSION(cfree); -+void __cfree(void* ptr) -+ SHIM_ALIAS_SYMBOL(ShimCFree); -+ -+SHIM_SYMBOL_VERSION(memalign); -+void* __memalign(size_t align, size_t s) -+ SHIM_ALIAS_SYMBOL(ShimMemalign); -+ -+SHIM_SYMBOL_VERSION(valloc); -+void* __valloc(size_t size) -+ SHIM_ALIAS_SYMBOL(ShimValloc); -+ -+SHIM_SYMBOL_VERSION(pvalloc); -+void* __pvalloc(size_t size) -+ SHIM_ALIAS_SYMBOL(ShimPvalloc); -+ -+SHIM_SYMBOL_VERSION(posix_memalign); -+int __posix_memalign(void** r, size_t a, size_t s) -+ SHIM_ALIAS_SYMBOL(ShimPosixMemalign); -+ -+SHIM_HIDDEN void* ShimMalloc(size_t size) { -+ return malloc(size); -+} -+ -+SHIM_HIDDEN void ShimFree(void* ptr) { -+ free(ptr); -+} -+ -+SHIM_HIDDEN void* ShimRealloc(void* ptr, size_t size) { -+ return realloc(ptr,size); -+} -+ -+SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { -+ return calloc(n,size); -+} -+ -+SHIM_HIDDEN void ShimCFree(void* ptr) { -+ free(ptr); -+} -+ -+SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { -+ return memalign(align,s); -+} -+ -+SHIM_HIDDEN void* ShimValloc(size_t size) { -+ return valloc(size); -+} -+ -+SHIM_HIDDEN void* ShimPvalloc(size_t size) { -+ return pvalloc(size); -+} -+ -+SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { -+ return posix_memalign(r,a,s); -+} -+} // extern "C" diff --git a/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch b/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch new file mode 100644 index 000000000000..ee5f78914d0b --- /dev/null +++ b/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch @@ -0,0 +1,141 @@ +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..c036d5f +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,2 @@ ++overrides.so: qt-5.12-overrides.o override-version.map ++ $(CXX) $(LDFLAGS) -shared -o $@ -Wl,--version-script override-version.map qt-5.12-overrides.o +diff --git a/override-version.map b/override-version.map +new file mode 100644 +index 0000000..991d98e +--- /dev/null ++++ b/override-version.map +@@ -0,0 +1 @@ ++Qt_5 {}; +diff --git a/qt-5.12-overrides.cpp b/qt-5.12-overrides.cpp +new file mode 100644 +index 0000000..002a1af +--- /dev/null ++++ b/qt-5.12-overrides.cpp +@@ -0,0 +1,120 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2017 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the QtWebEngine module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include ++#include ++ ++#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn))) ++#define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5") ++#define SHIM_HIDDEN __attribute__ ((visibility ("hidden"))) ++ ++extern "C" { ++ ++SHIM_SYMBOL_VERSION(malloc); ++void* __malloc(size_t size) ++ SHIM_ALIAS_SYMBOL(ShimMalloc); ++ ++SHIM_SYMBOL_VERSION(free); ++void __free(void* ptr) ++ SHIM_ALIAS_SYMBOL(ShimFree); ++ ++SHIM_SYMBOL_VERSION(realloc); ++void* __realloc(void* ptr, size_t size) ++ SHIM_ALIAS_SYMBOL(ShimRealloc); ++ ++SHIM_SYMBOL_VERSION(calloc); ++void* __calloc(size_t n, size_t size) ++ SHIM_ALIAS_SYMBOL(ShimCalloc); ++ ++SHIM_SYMBOL_VERSION(cfree); ++void __cfree(void* ptr) ++ SHIM_ALIAS_SYMBOL(ShimCFree); ++ ++SHIM_SYMBOL_VERSION(memalign); ++void* __memalign(size_t align, size_t s) ++ SHIM_ALIAS_SYMBOL(ShimMemalign); ++ ++SHIM_SYMBOL_VERSION(valloc); ++void* __valloc(size_t size) ++ SHIM_ALIAS_SYMBOL(ShimValloc); ++ ++SHIM_SYMBOL_VERSION(pvalloc); ++void* __pvalloc(size_t size) ++ SHIM_ALIAS_SYMBOL(ShimPvalloc); ++ ++SHIM_SYMBOL_VERSION(posix_memalign); ++int __posix_memalign(void** r, size_t a, size_t s) ++ SHIM_ALIAS_SYMBOL(ShimPosixMemalign); ++ ++SHIM_HIDDEN void* ShimMalloc(size_t size) { ++ return malloc(size); ++} ++ ++SHIM_HIDDEN void ShimFree(void* ptr) { ++ free(ptr); ++} ++ ++SHIM_HIDDEN void* ShimRealloc(void* ptr, size_t size) { ++ return realloc(ptr,size); ++} ++ ++SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { ++ return calloc(n,size); ++} ++ ++SHIM_HIDDEN void ShimCFree(void* ptr) { ++ free(ptr); ++} ++ ++SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { ++ return memalign(align,s); ++} ++ ++SHIM_HIDDEN void* ShimValloc(size_t size) { ++ return valloc(size); ++} ++ ++SHIM_HIDDEN void* ShimPvalloc(size_t size) { ++ return pvalloc(size); ++} ++ ++SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { ++ return posix_memalign(r,a,s); ++} ++} // extern "C" diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.3-r2.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.3-r2.ebuild deleted file mode 100644 index ae3fd36b38eb..000000000000 --- a/media-sound/teamspeak-client/teamspeak-client-3.2.3-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs unpacker xdg-utils - -MY_PV="${PV/_/-}" - -DESCRIPTION="A client software for quality voice communication via the internet" -HOMEPAGE="https://www.teamspeak.com/" -SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run ) - x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )" - -KEYWORDS="-* ~amd64 ~x86" -LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )" -SLOT="0" -IUSE="alsa pulseaudio" -REQUIRED_USE="|| ( alsa pulseaudio )" - -RDEPEND=" - app-arch/snappy:0/1 - dev-libs/openssl:0 - dev-libs/quazip - dev-qt/qtcore:5 - dev-qt/qtgui:5[accessibility,dbus,xcb] - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[geolocation,widgets] - dev-qt/qtwidgets:5 - net-libs/libsrtp:0 - sys-libs/libcxx[libcxxabi] - sys-libs/zlib:0/1 - virtual/udev - alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) -" - -RESTRICT="mirror" - -S="${WORKDIR}" - -QA_PREBUILT=" - opt/teamspeak3-client/error_report - opt/teamspeak3-client/package_inst - opt/teamspeak3-client/soundbackends/libalsa_linux_*.so - opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so - opt/teamspeak3-client/ts3client - opt/teamspeak3-client/update -" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.12-symbol-reexports.patch" -) - -src_prepare() { - default - - if ! use alsa; then - rm -f soundbackends/libalsa_linux_*.so || die - fi - if ! use pulseaudio ; then - rm -f soundbackends/libpulseaudio_linux_*.so || die - fi - - mv ts3client_linux_* ts3client || die - - tc-export CXX -} - -src_install() { - exeinto /opt/teamspeak3-client - doexe error_report package_inst ts3client update overrides.so - newexe "${FILESDIR}"/ts3client-bin-r1 ts3client-bin - - exeinto /opt/teamspeak3-client/soundbackends - doexe soundbackends/*.so - - insinto /opt/teamspeak3-client - doins -r gfx html resources sound styles translations - - dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess - - dodir /opt/bin - dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client - - make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network" - - einstalldocs -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild new file mode 100644 index 000000000000..9204ab36f972 --- /dev/null +++ b/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs unpacker xdg-utils + +MY_PV="${PV/_/-}" + +DESCRIPTION="A client software for quality voice communication via the internet" +HOMEPAGE="https://www.teamspeak.com/" +SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run ) + x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )" + +KEYWORDS="-* ~amd64 ~x86" +LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )" +SLOT="0" +IUSE="alsa pulseaudio" +REQUIRED_USE="|| ( alsa pulseaudio )" + +RDEPEND=" + app-arch/snappy:0/1 + dev-libs/openssl:0 + dev-libs/quazip + dev-qt/qtcore:5 + dev-qt/qtgui:5[accessibility,dbus,xcb] + dev-qt/qtnetwork:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwebchannel:5 + dev-qt/qtwebengine:5[geolocation,widgets] + dev-qt/qtwidgets:5 + net-libs/libsrtp:0 + sys-libs/libcxx[libcxxabi] + sys-libs/zlib:0/1 + virtual/udev + alsa? ( media-libs/alsa-lib ) + pulseaudio? ( media-sound/pulseaudio ) +" + +RESTRICT="mirror" + +S="${WORKDIR}" + +QA_PREBUILT=" + opt/teamspeak3-client/error_report + opt/teamspeak3-client/package_inst + opt/teamspeak3-client/soundbackends/libalsa_linux_*.so + opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so + opt/teamspeak3-client/ts3client + opt/teamspeak3-client/update +" + +PATCHES=( + "${FILESDIR}/${PN}-3.2.5-qt-5.12-symbol-reexports.patch" +) + +src_prepare() { + default + + if ! use alsa; then + rm -f soundbackends/libalsa_linux_*.so || die + fi + if ! use pulseaudio ; then + rm -f soundbackends/libpulseaudio_linux_*.so || die + fi + + mv ts3client_linux_* ts3client || die + + tc-export CXX +} + +src_install() { + exeinto /opt/teamspeak3-client + doexe error_report package_inst ts3client update overrides.so + newexe "${FILESDIR}"/ts3client-bin-r1 ts3client-bin + + exeinto /opt/teamspeak3-client/soundbackends + doexe soundbackends/*.so + + insinto /opt/teamspeak3-client + doins -r gfx html resources sound styles translations + + dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess + + dodir /opt/bin + dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client + + make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network" + + einstalldocs +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} -- cgit v1.2.3-65-gdbad