gentoo resync : 06.05.2018

5 files changed, 48 insertions, 103 deletions

diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 760e8f9be107..57dace467916 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,12 +1,8 @@
+AUX CVE-2017-15185.patch 1132 BLAKE2B ae218573443dc724c4136cd5602c14965a146479212c769929e1a60be2f2056b2703351adb8dcee92851666557db71d8303347921343d94a4db96848da827086 SHA512 5336c71917c34b84c882b2afd01d31141db816c1a6293ab1cbc87138b4d7a8288d4ebea8fc7cf882d907c0c07f5b827d9293dda082d6c8ecf3aafd002e540951
 AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0b607750aa1227eeb1f620c3cc47306ea1f5c064a297e563bc9ef83e99e2d5a658b6292b301ff4d3d12fb3906a7d32 SHA512 8707dcf0a23f6466c0f8d0bfcce8ecfd8840ffec09f3c7a66f039be5f707b0b561d5462ad9b170e2bca9dc4872a61114a8d515f702b9e7e79af2deddbce6385f
-DIST libmp3splt-0.7.3.tar.gz 650741 BLAKE2B 8e2486bb66549e08bb334c52a677503b6db1f5f5e8049ffc2120eb1e9f05e3e32c6e61a12a871b3f07aad03067c1bb510cedaf1c9f4cfd31ba2f644c72a26bf4 SHA512 4ad158e47ce03626bf6493575a9adff51c709d5a7827c96cc18a56303cf709e7076081d0c3d2cfc8d22173bfd40e3ea7b750ade44a155f690e2ce0d394a2ebc7
-DIST libmp3splt-0.9.0.tar.gz 686054 BLAKE2B 739723f7fd0886e7a582b59bd9bf4bf2ec286a65d5154a6d7a74ce517909e4c87287bce88d3881fb222937593feb7d9bc479b6f0a64cfa9dd19b2fcc75ee84ec SHA512 63624c9982fc2ab88e62fa29f16c5777f7689d19c3eecaceda83e7679cac9a64081e8ad2555403fe3bd0be0af2f7dedc02307254f5923b3f2856accc0f3e585a
-DIST libmp3splt-0.9.1.tar.gz 703040 BLAKE2B 7f7541a076940275fc03391fe33e601008d60b7c83c970db9893c4f4d0b4b68f170efdc7fadc41dcc64a8e3858b5668aff21abc3870a33b89b308c825b3dda93 SHA512 a95f5a5e622baca6ea87e7c8d2c2da3bda8b9c91761506392efea848e433045b8a304b774d12fef5a93c7c75d64c65b5df45a37d936bbbc91c1ddb2f8ac1d670
 DIST libmp3splt-0.9.1a.tar.gz 702948 BLAKE2B 96661e2fdc96d1ce4555bfc9b84f44bb1ecf9bd05f6b6038274a3097a657707bb6c6ef8b2b6ecf673c390f52a1885a6c91b555c1971d490df7089523d0739329 SHA512 07229c048c4f999c7c723ab2f7bb06807d264609c8c1e38f8ff40f11e54285212de71548bbd66ba3100287d563673d80a8704bd384d7ffcd2145a098faabd389
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
-EBUILD libmp3splt-0.7.3.ebuild 1112 BLAKE2B 36795da97561dab79b29deb1e1cfa31c40dcc0f71746d4337a0e35772132a80c1a3a1d506fcb0c398c33199d38a380bf3922111ebe8ceeab93d4985fd5c7ce2d SHA512 284e1968313d828b029d4c931a69b9322204cdef795ee35f051a0842f030815e5e7ce91749132994cf710f9fd91cd16a5fea31b4eb689e02cc8d0edd005a71e9
-EBUILD libmp3splt-0.9.0.ebuild 1244 BLAKE2B 79ad93da476e5948a969000fdb2a8369c331bf5c137cefa5e0bebfb86001a4d336cf8b5ede133d4bbbbe9f1889b8267c0c1e51e7965e712f13224275bde0809d SHA512 b0459823431d950bef6af67d222d201f4efe435be2b6bbb43f4dfd51f8307ea9dd9ca217abf4231edd82719ebc57a12da61f311f293f31dbfcc9f2dcbb137eb9
-EBUILD libmp3splt-0.9.1.ebuild 1247 BLAKE2B 6d5d24c1a67f1cb12c82e3f29a2b43b7e2adf1aee331be92f153c08023a7b8cc45582c6d68319af3094ae83fcbfe0feae0a6fca577907da8f7034cac2dc177ad SHA512 1a4b39bfdd3c2d41ae7d908212325a7eb4e587f0189fe470134d7556a49d1b6ffc2a635cd1db656fbdaa9ce30df1c88d450c34d234ce9b2cba486d7d04d217b1
 EBUILD libmp3splt-0.9.1a.ebuild 1244 BLAKE2B 1809d4d5b3da03405fa6080259ddd79967f51ec40c9975f0a22a785f26aec47eeebd34005a592164c43f9d1798320af7813828e6a2fdd76ba02ae606abf0dfd9 SHA512 39cd447f9f20810b14b4864df837d58952ffc52d6947cb0ba672e1b4bed87da12eba7391a19cab3fcda5336b9de36d565da917a1f99f140d455a72eb3a96e285
+EBUILD libmp3splt-0.9.2-r1.ebuild 1292 BLAKE2B 6df436b2a0055f13684ad26b1b6c223fa551b7e90a62c3521e7d59c26c633226aaf5054fbd0cbd84b498a776186258754c09adf110adecba42ac8d756fdc23d6 SHA512 ef3f7a6f2ffa877d439819577f3edd84f11d0ee7cf2677a129d15eff173614d070c4ee160b5d2d74191b04716e9d4237e6f14d09794ce340ecde749d0a9f74d2
 EBUILD libmp3splt-0.9.2.ebuild 1245 BLAKE2B 23dda3aa0055c03908bc81994f2e7e819be9e79066b939d4fc23bf3f0cc55ce66b85d7bd3194a9405ea3e43c8829285f94319c149568aba6febbb6f8afe9980a SHA512 899074eb64a40a328a0ec8afa7784ae362cf13d76167d6427417f0c99a4aad3068134ce7ae866c55e6a855c83bb0507f8afd0b407b9479197f16dc47dcfe9005
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/files/CVE-2017-15185.patch b/media-libs/libmp3splt/files/CVE-2017-15185.patch
new file mode 100644
index 000000000000..b31a92d0c452
--- /dev/null
+++ b/media-libs/libmp3splt/files/CVE-2017-15185.patch
@@ -0,0 +1,41 @@
+diff --git a/libmp3splt/plugins/ogg.c b/libmp3splt/plugins/ogg.c
+index 50cc495..57745f1 100644
+--- a/libmp3splt/plugins/ogg.c
++++ b/libmp3splt/plugins/ogg.c
+@@ -212,26 +212,36 @@ static splt_ogg_state *splt_ogg_v_new(int *error)
+     goto error;
+   }
+   memset(oggstate, 0, sizeof(splt_ogg_state));
++
+   if ((oggstate->sync_in = malloc(sizeof(ogg_sync_state)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->sync_in, 0, sizeof(ogg_sync_state));
++
+   if ((oggstate->stream_in = malloc(sizeof(ogg_stream_state)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->stream_in, 0, sizeof(ogg_stream_state));
++
+   if ((oggstate->vd = malloc(sizeof(vorbis_dsp_state)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->vd, 0, sizeof(vorbis_dsp_state));
++
+   if ((oggstate->vi = malloc(sizeof(vorbis_info)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->vi, 0, sizeof(vorbis_info));
++
+   if ((oggstate->vb = malloc(sizeof(vorbis_block)))==NULL)
+   {
+     goto error;
+   }
++  memset(oggstate->vb, 0, sizeof(vorbis_block));
+ 
+   if ((oggstate->headers = malloc(sizeof(splt_v_packet) * TOTAL_HEADER_PACKETS))==NULL)
+   {
diff --git a/media-libs/libmp3splt/libmp3splt-0.7.3.ebuild b/media-libs/libmp3splt/libmp3splt-0.7.3.ebuild
deleted file mode 100644
index 67392dfcdb12..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit versionator autotools eutils multilib
-
-DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="doc pcre"
-
-RDEPEND="media-libs/libmad
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libid3tag
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable pcre) \
-		$(use_enable doc doxygen_doc) \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-cutter  # TODO package cutter <http://cutter.sourceforge.net/>
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog LIMITS NEWS README TODO || die
-	find "${D}"/usr -name '*.la' -delete
-}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.1.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.1.ebuild
deleted file mode 100644
index a87df6ca43f5..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit versionator autotools eutils multilib
-
-DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="doc flac pcre"
-
-RDEPEND="media-libs/libmad
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libid3tag
-	flac? ( >=media-libs/flac-1.2.1 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.8.3.1 media-gfx/graphviz )
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable pcre) \
-		$(use_enable flac) \
-		$(use_enable doc doxygen_doc) \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimise \
-		--disable-cutter  # TODO package cutter <http://cutter.sourceforge.net/>
-}
-
-src_install() {
-	default
-	use	doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
-
-	dodoc AUTHORS ChangeLog LIMITS NEWS README TODO
-
-	find "${D}"/usr -name '*.la' -delete
-}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.0.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
index 4bcca579b4a0..0427694ed0bc 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.0.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=5
+
 inherit versionator autotools eutils multilib
 
 DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc flac pcre"
 
 RDEPEND="media-libs/libmad
@@ -25,6 +26,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
+	epatch "${FILESDIR}"/CVE-2017-15185.patch
 	eautoreconf
 }