gentoo resync : 03.03.2021

8 files changed, 2 insertions, 250 deletions

diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index d830af1528b7..405c69580b37 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,11 +1,4 @@
-AUX vorbis-tools-1.4.0-CVE-2014-9638.patch 2579 BLAKE2B e568ba19d7905546672e31d3bf3e119df2cf7ba521e500bbd348e1c19e7498ddaaf8bb39b188b87d11adf2aee0c7a9f9bdeed671a4e1737550b7f8634a117655 SHA512 f7e05deb226e6f32088f55519cfc17849e0bf6ddfc27aa582f77b4e7fb9ba3962f509d86af895e1b867f29a50ec5550aeb8fda780f5875fd2e2564aa4b723f1e
-AUX vorbis-tools-1.4.0-CVE-2014-9640.patch 691 BLAKE2B bdf2e1f18ddddf90afb26e6814afbf67032509570d9671a7f90b6188897e7494f0832d888f4fe4c854de75151d6e4c4811ad6d0dee3da3d65446402b7aa9fa71 SHA512 f9dd54fa2d09f2ad1a45bbf576884aa00148334452c478914566713bd149572f9c4e05b301aa8bd2aeb299a095cbae5cde09dcb762eaa6c2e8bbd33c91fec2f0
-AUX vorbis-tools-1.4.0-docdir.patch 340 BLAKE2B 147fa0212acd6a7df359d3eeb120465ca962532263c8cfa8815a91c5f0a43c230d52b2693e9ff1167a17191edf4f70592778249857ff91641b99ca19f572ea87 SHA512 080e70054ef9583430c1675f5cba1cef1ad6cf76068fe1881b0771a08d9d3651cd2adfe92388ad8974fbbc64f2066b3aaeb8de790ba5bfaeae68b5618c733646
-AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743afe660ae1a741d8bb7b2790823936a089c4a8667a41160d6d1b79ec6027f4bf77dbbd8110bc65d2503bcd87c51f4f1e675566ff2dc6 SHA512 319451c4317e2224cb56c791528c8ba4722a142b5c85f63fd606e3a1acadc95904cfab3bee7ad4634fa982f59a92ebeb30d8698d8f697640d6579b6a80eadd93
-AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
 AUX vorbis-tools-1.4.2-docdir.patch 416 BLAKE2B 1ce521f429314e40b9fbde91103dc0fd4cb02a0801479da8c4d5cf17334e6586c23a892f12398b9cc62c86fd17394d5325bd580c5be1d03ffd11e5a21bf18443 SHA512 96f1ef85b92e25dd1d029cf19b4e81ca455cbf9da83b49bf50ce10bbbf02a0150975eaeb2ded262c8931d213d6d767013ced4d7334ab5a6fa1c06f55bf278c91
-DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
 DIST vorbis-tools-1.4.2.tar.gz 1389947 BLAKE2B 6cec240a2c069a74accfadd4d4a5a2a75bb4ad40c83aff86e190f7b19a87d4348d7a932e69a9ae9dd2efff636f47d3465b3d26d39393b4fec925cb7d1543f77e SHA512 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf
-EBUILD vorbis-tools-1.4.0-r5.ebuild 1187 BLAKE2B ff778c641c185df7262a9e7ff146d329c3a64eab774ad64f67b846e3e9c1ce35d618ce98d27b92e6ef390daa52168aacf63d0e3bd2eca1e0e5dde33fae4dc8d1 SHA512 8829796e494ab2e280b5d1cd028ce55b33c0f3c0bac84b5f4aecd005cd90bf036eaf1d4561ec9233f93be6dd0078936223dd46fc722b0e1314c26166decb03af
-EBUILD vorbis-tools-1.4.2.ebuild 951 BLAKE2B 3b819d545b3c9041522d51500168742ab3fe92b6ca2d3de7315bff32caa18b31941da68fdfc2531bd489a05e5242a7869c50e6c270ca30264793fc64894db362 SHA512 993af7575a3edb7f0f1f9af7bf8fcd9575d99f5a096a63477e5549b5adf863a17eaf0e2f77eecc2b602be0efdd80971b7564a47774ec9bb061a5669b9ce9ae2d
+EBUILD vorbis-tools-1.4.2.ebuild 945 BLAKE2B e89fedc5e2f1873a0dc6d68d68a7e0cd55f5d1deb58c5b0209240e51bebd99860be202d466d09e706ed2571a17811811f438fe843942191c3a3a9b2c2667b35e SHA512 504608faefc9c5cfaab1c802419533da15dd935e08e4c903937a775263b9277b4c738da17cf8b29254e2ffaa09c1a64a4045fe4a06f8a9060309756f8f4b9550
 MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
deleted file mode 100644
index a643f1cb82f6..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Patches taken as references: 
-https://github.com/mark4o/opus-tools/commit/8c412e619b83eb6dd32191909cf6672e93e5802e
-https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
-To fix bug report:
-http://www.openwall.com/lists/oss-security/2015/08/29/1
-    https://bugs.gentoo.org/show_bug.cgi?id=559170
-https://bugs.gentoo.org/show_bug.cgi?id=537422
---- a/oggenc/audio.h
-+++ b/oggenc/audio.h
-@@ -25,7 +25,7 @@
- 
- typedef struct {
-     short format;
--    short channels;
-+    unsigned short channels;
-     int samplerate;
-     int bytespersec;
-     short align;
-@@ -44,7 +44,7 @@
- } wavfile;
- 
- typedef struct {
--    short channels;
-+    unsigned short channels;
-     int totalframes;
-     short samplesize;
-     int rate;
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -245,8 +245,8 @@
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- {
-     int aifc; /* AIFC or AIFF? */
--    unsigned int len;
--    unsigned char *buffer;
-+    unsigned int len,readlen;
-+    unsigned char buffer[22];
-     unsigned char buf2[8];
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@
-         return 0; /* Weird common chunk */
-     }
-
--    buffer = alloca(len);
--
--    if(fread(buffer,1,len,in) < len)
-+    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
-+    if(fread(buffer,1,readlen,in) < readlen ||
-+        (len > readlen && !seek_forward(in, len-readlen)))
-     {
-         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
-         return 0;
-@@ -277,11 +277,18 @@
-         return 0;
-     }
- 
--    format.channels = READ_U16_BE(buffer);
-+    format.channels = (short)READ_U16_BE(buffer);
-     format.totalframes = READ_U32_BE(buffer+2);
-     format.samplesize = READ_U16_BE(buffer+6);
-     format.rate = (int)read_IEEE80(buffer+8);
- 
-+    if(format.channels <=0)
-+    {
-+    	fprintf(stderr, _("ERROR: Invalid channel count in AIFF header\n"));
-+	return 0;
-+
-+    }
-+
-     aiff->bigendian = 1;
- 
-     if(aifc)
-@@ -449,11 +449,17 @@
-     }
-
-     format.format =      READ_U16_LE(buf);
--    format.channels =    READ_U16_LE(buf+2);
-+    format.channels =    (short)READ_U16_LE(buf+2);
-     format.samplerate =  READ_U32_LE(buf+4);
-     format.bytespersec = READ_U32_LE(buf+8);
-     format.align =       READ_U16_LE(buf+12);
-     format.samplesize =  READ_U16_LE(buf+14);
-+
-+    if(format.channels == 0)
-+    {
-+      fprintf(stderr, _("ERROR: Zero channels in WAV header\n"));
-+      return 0;
-+    }
-
-     if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
-     {
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
deleted file mode 100644
index 51c23b062aff..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch taken from: 
-https://trac.xiph.org/changeset/19117
-To fix bug report:
-https://bugs.gentoo.org/show_bug.cgi?id=537422
---- vorbis-tools-1.4.0/oggenc/oggenc.c	
-+++ vorbis-tools-1.4.0/oggenc/oggenc.c
-@@ -97,6 +97,8 @@
-               .3,-1,
-               0,0,0.f,
-               0, 0, 0, 0, 0};
-+    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
-+        N_("RAW file reader")};
- 
-     int i;
- 
-@@ -239,8 +241,6 @@
- 
-         if(opt.rawmode)
-         {
--            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
--                N_("RAW file reader")};
- 
-             enc_opts.rate=opt.raw_samplerate;
-             enc_opts.channels=opt.raw_channels;
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
deleted file mode 100644
index d3fdde0e11d7..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Thanks-to: Chris Mayo
-https://bugs.gentoo.org/533774
-
---- a/ogg123/Makefile.am
-+++ b/ogg123/Makefile.am
-@@ -19,7 +19,7 @@
- localedir = $(datadir)/locale
- DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = @docdir@
- mandir = @MANDIR@
- 
- bin_PROGRAMS = ogg123
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch
deleted file mode 100644
index 501300ca6171..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vorbis-tools-1.4.0.orig/ogg123/status.c
-+++ vorbis-tools-1.4.0/ogg123/status.c
-@@ -148,7 +148,7 @@
- 
-     switch (stats->type) {
-     case stat_noarg:
--      len += sprintf(str+len, stats->formatstr);
-+      len += sprintf(str+len, "%s", stats->formatstr);
-       break;
-     case stat_intarg:
-       len += sprintf(str+len, stats->formatstr, stats->arg.intarg);
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
deleted file mode 100644
index 9aee38e0b19e..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://bugs.gentoo.org/513942
-
-Fix building with `./configure --enable-ogg123 --without-flac --without-speex --without-kate` and `make`:
-
-libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--hash-style=gnu -o oggenc oggenc.o audio.o encode.o platform.o resample.o skeleton.o  -Wl,--as-needed ../share/libutf8.a ../share/libgetopt.a -lvorbisenc -lvorbis -logg
-resample.o:resample.c:function res_init: error: undefined reference to 'sin'
-collect2: error: ld returned 1 exit status
-
-libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -o ogg123 audio.o buffer.o callbacks.o cfgfile_options.o cmdline_options.o file_transport.o format.o http_transport.o ogg123.o oggvorbis_format.o playlist.o status.o remote.o transport.o vorbis_comments.o vgfilter.o  ../share/libutf8.a ../share/libgetopt.a -lvorbisfile -lvorbis -logg -lao -lnsl -lcurl -lpthread
-vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
-vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
-vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
-vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
-collect2: error: ld returned 1 exit status
-
-This is using the new GNU gold linker:
-
-$ ld -v
-GNU gold (GNU Binutils 2.24) 1.11
-
-Happens because -lm gets appended to the libraries list only with, for example, --with-flac but vgfilter.c and resample.c are always
-using functions from the mathlib.
-
-Therefore, always link to mathlib:
-
---- a/ogg123/Makefile.am
-+++ b/ogg123/Makefile.am
-@@ -30,7 +30,7 @@
- ogg123_LDADD = @SHARE_LIBS@ \
- 	       @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
-                @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
--               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@
-+               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ -lm
- 
- ogg123_DEPENDENCIES = @SHARE_LIBS@
- ogg123_SOURCES = audio.c buffer.c callbacks.c \
---- a/oggenc/Makefile.am
-+++ b/oggenc/Makefile.am
-@@ -23,7 +23,7 @@
- 
- oggenc_LDADD = @SHARE_LIBS@ \
- 	       @VORBISENC_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ \
--	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@
-+	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@ -lm
- 
- oggenc_DEPENDENCIES = @SHARE_LIBS@
- 
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
deleted file mode 100644
index 51e642dbe33a..000000000000
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Tools for using the Ogg Vorbis sound file format"
-HOMEPAGE="http://www.vorbis.com"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="flac kate nls +ogg123 speex"
-
-RDEPEND="
-	>=media-libs/libvorbis-1.3.0
-	flac? ( media-libs/flac )
-	kate? ( media-libs/libkate )
-	ogg123? (
-		>=media-libs/libao-1.0.0
-		net-misc/curl
-	)
-	speex? ( media-libs/speex )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-CVE-2014-9640.patch
-	"${FILESDIR}"/${P}-CVE-2014-9638.patch
-	"${FILESDIR}"/${P}-docdir.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ogg123) \
-		$(use_with flac) \
-		$(use_with speex) \
-		$(use_with kate)
-}
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
index eaae1ed08819..9c088f59ceb2 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://ftp.osuosl.org/pub/xiph/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="flac kate nls +ogg123 speex"
 
 RDEPEND="