gentoo resync : 04.05.2019

5 files changed, 2 insertions, 154 deletions

diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 7a307fc9562e..3f3088874048 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,8 +1,3 @@
-AUX libsoundtouch-2.0.0-CVE-2017-92xx.patch 1587 BLAKE2B 29cbb252a2a161e890a354291b6e83f0271ec83f2683bde43c56ca96eeb1dcca5eea3534777158939bfbec288acd2d4404bf8e70987663f43693c259a41dccb3 SHA512 aec797125ac6e0891baedf36552686342e83a2e362544e8d81ae960356227f275c5ec906f595f676497763dc411506b85de06a35e540f173c0d0e966451b1783
-DIST soundtouch-2.0.0.tar.gz 455148 BLAKE2B e38358b0b773edc03a1b227222418d1e79a97f7a1c7abd22f2cb96bb2a7e3427802214775c908329eeec87710b4d199fba819ad7b99f3d58071749cf372991a1 SHA512 c916bdd2cb3d7547f264b1caf09b739b48a161c8c6288c3893fc97379546ed6b41dafaf603b583fbf64ae91270fdeb90811e5b0df0e9c051dc9f6ddca4d319f9
-DIST soundtouch-2.1.1.tar.bz2 526206 BLAKE2B bc5d2edef5ae7d297cd017968fb1206d14306c117a847ba34090dcd284a174edcc8f4694be4a98fee7a7d100e7a912e81c2e14a998a22ab2c50eb0d27ca823f7 SHA512 9272141e5c1a4def7356add524d861f2c78eb9574ebca2bab3a57190821fb1eb5c85624aa7b31d90ada38a5165bafd8445f6fdd51e2b3a262ca9a2f2db35a9aa
 DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
-EBUILD libsoundtouch-2.0.0-r1.ebuild 1499 BLAKE2B 43b32e874493bdfbe22bd07a7a0f78f4952ab5cd192496d1b26bc0918f18f22f2df5b6985dd27727de5097f068897d3a612d2729392450c2f638be5344cd6536 SHA512 ec0e8a610460293f89f743f3457178475b4c4c913cb80a94cdca4ac059c60eaa079252bef940afdfb222bb2b1cb524d1c23cf2a55a2280050602c8cf00aa242b
-EBUILD libsoundtouch-2.1.1.ebuild 1526 BLAKE2B bed4c40cc3e7fddb0a98185b4086ff145515cae22c9b73401bd3b7f6f8260e7c9ca62aaa453aa36a656d7bad7cc2c236f3dc73b24a56292bae1f4d1cfb5ea338 SHA512 fece8e9f6aee68d1bbcba65280f3b578635375af1023bdcc8080eb6f945322bae924d694cfbf26caf7e81d785e4f2d75ade19dffa945091c1b9a91b86a9b84c8
-EBUILD libsoundtouch-2.1.2.ebuild 1524 BLAKE2B cc5857293f5b9e1e6c4360a69308a94f51c8c0517555d9494025cbafccde61533e44d82c2d94686799d2e068b493ef3668ef5b20c04296a1628d9a1c79f4ef48 SHA512 bcb347846bab8b9708e1eab1df4200b4d5d7897f2a788384e65310c7a523101c340fe4c163b5215008f04910da7ea6f30bb5bfd40b4449f8be4a39dac95c245d
+EBUILD libsoundtouch-2.1.2.ebuild 1523 BLAKE2B 538efefc1981e1c3e332f490dd0892a76b25b9fedb528ccca5ecdce5544847155440fd37c5944961499cb576d4f05110a68561378373ad20f7ad55af293e551d SHA512 895e1678aa2fc0b01501df8ee81b4dc8b27c263b5f82a63c9b34db715b750815e1ca227d29954d9b0696ba1cededff1bbe1f5a092fd47cbe05d1004f63591602
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch b/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch
deleted file mode 100644
index 0e475a3e44e6..000000000000
--- a/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix CVE-2017-9258, CVE-2017-9259, CVE-2017-9260

- Based on an upstream commit, original commit message was: "Added sanity

- checks against illegal input audio stream parameters e.g. wildly excessive

- samplerate".

- . 

- There is no reference to CVEs or bugs, the commit was made after disclosure

- of the CVEs and all three proofs of concept (crafted wav files) fail after

- this commit.

- . 

- The commit was made after version 2.0.0, so that version is also vulnerable.

- .

- Unrelated changes were stripped away by patch author, upstream commit author

- is Olli Parviainen <oparviai@iki.fi>.

-Author: Gabor Karsay <gabor.karsay@gmx.at>

-Origin: upstream, https://sourceforge.net/p/soundtouch/code/256/

-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870854

-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870856

-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870857

----

-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/

---- a/source/SoundTouch/TDStretch.cpp
-+++ b/source/SoundTouch/TDStretch.cpp
-@@ -128,7 +128,12 @@
-                               int aSeekWindowMS, int aOverlapMS)

- {

-     // accept only positive parameter values - if zero or negative, use old values instead

--    if (aSampleRate > 0)   this->sampleRate = aSampleRate;

-+    if (aSampleRate > 0)

-+    {

-+        if (aSampleRate > 192000) ST_THROW_RT_ERROR("Error: Excessive samplerate");

-+        this->sampleRate = aSampleRate;

-+    }

-+

-     if (aOverlapMS > 0)    this->overlapMs = aOverlapMS;

- 

-     if (aSequenceMS > 0)

diff --git a/media-libs/libsoundtouch/libsoundtouch-2.0.0-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.0.0-r1.ebuild
deleted file mode 100644
index e57c4115a6f5..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/lib}"
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/"
-SRC_URI="https://www.surina.net/soundtouch/${P/lib}.tar.gz"
-
-LICENSE="LGPL-2.1"
-# subslot = libSoundTouch.so soname
-SLOT="0/1"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse openmp static-libs"
-
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-92xx.patch" )
-
-src_prepare() {
-	default
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--disable-integer-samples
-		$(use_enable cpu_flags_x86_sse x86-optimizations)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild
deleted file mode 100644
index d9b61b4636ad..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-MY_PN=${PN/lib}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
-SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-# subslot = libSoundTouch.so soname
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse openmp static-libs"
-
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--disable-integer-samples
-		$(use_enable cpu_flags_x86_sse x86-optimizations)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
index 80e689588dc4..d09a077c84c7 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"