commit: aad3e720d039fd78f880a62433019fe77bcdae00 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Feb 26 15:27:41 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Feb 26 21:19:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad3e720
media-sound/vorbis-tools: Drop 1.4.0-r5 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/vorbis-tools/Manifest | 1 - .../files/vorbis-tools-1.4.0-CVE-2014-9638.patch | 92 ---------------------- .../files/vorbis-tools-1.4.0-CVE-2014-9640.patch | 24 ------ .../files/vorbis-tools-1.4.0-docdir.patch | 14 ---- .../files/vorbis-tools-1.4.0-format-security.patch | 11 --- .../files/vorbis-tools-1.4.0-underlinking.patch | 47 ----------- .../vorbis-tools/vorbis-tools-1.4.0-r5.ebuild | 53 ------------- 7 files changed, 242 deletions(-) diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest index 7c4e168674b..a898479f8eb 100644 --- a/media-sound/vorbis-tools/Manifest +++ b/media-sound/vorbis-tools/Manifest @@ -1,2 +1 @@ -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 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 a643f1cb82f..00000000000 --- 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 51c23b062af..00000000000 --- 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 d3fdde0e11d..00000000000 --- 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 501300ca617..00000000000 --- 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 9aee38e0b19..00000000000 --- 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 51e642dbe33..00000000000 --- 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) -}
