1 |
commit: aad3e720d039fd78f880a62433019fe77bcdae00 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 26 15:27:41 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 26 21:19:23 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad3e720 |
7 |
|
8 |
media-sound/vorbis-tools: Drop 1.4.0-r5 |
9 |
|
10 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-sound/vorbis-tools/Manifest | 1 - |
14 |
.../files/vorbis-tools-1.4.0-CVE-2014-9638.patch | 92 ---------------------- |
15 |
.../files/vorbis-tools-1.4.0-CVE-2014-9640.patch | 24 ------ |
16 |
.../files/vorbis-tools-1.4.0-docdir.patch | 14 ---- |
17 |
.../files/vorbis-tools-1.4.0-format-security.patch | 11 --- |
18 |
.../files/vorbis-tools-1.4.0-underlinking.patch | 47 ----------- |
19 |
.../vorbis-tools/vorbis-tools-1.4.0-r5.ebuild | 53 ------------- |
20 |
7 files changed, 242 deletions(-) |
21 |
|
22 |
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest |
23 |
index 7c4e168674b..a898479f8eb 100644 |
24 |
--- a/media-sound/vorbis-tools/Manifest |
25 |
+++ b/media-sound/vorbis-tools/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99 |
28 |
DIST vorbis-tools-1.4.2.tar.gz 1389947 BLAKE2B 6cec240a2c069a74accfadd4d4a5a2a75bb4ad40c83aff86e190f7b19a87d4348d7a932e69a9ae9dd2efff636f47d3465b3d26d39393b4fec925cb7d1543f77e SHA512 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf |
29 |
|
30 |
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 |
31 |
deleted file mode 100644 |
32 |
index a643f1cb82f..00000000000 |
33 |
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch |
34 |
+++ /dev/null |
35 |
@@ -1,92 +0,0 @@ |
36 |
-Patches taken as references: |
37 |
-https://github.com/mark4o/opus-tools/commit/8c412e619b83eb6dd32191909cf6672e93e5802e |
38 |
-https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch |
39 |
-To fix bug report: |
40 |
-http://www.openwall.com/lists/oss-security/2015/08/29/1 |
41 |
- https://bugs.gentoo.org/show_bug.cgi?id=559170 |
42 |
-https://bugs.gentoo.org/show_bug.cgi?id=537422 |
43 |
---- a/oggenc/audio.h |
44 |
-+++ b/oggenc/audio.h |
45 |
-@@ -25,7 +25,7 @@ |
46 |
- |
47 |
- typedef struct { |
48 |
- short format; |
49 |
-- short channels; |
50 |
-+ unsigned short channels; |
51 |
- int samplerate; |
52 |
- int bytespersec; |
53 |
- short align; |
54 |
-@@ -44,7 +44,7 @@ |
55 |
- } wavfile; |
56 |
- |
57 |
- typedef struct { |
58 |
-- short channels; |
59 |
-+ unsigned short channels; |
60 |
- int totalframes; |
61 |
- short samplesize; |
62 |
- int rate; |
63 |
---- a/oggenc/audio.c |
64 |
-+++ b/oggenc/audio.c |
65 |
-@@ -245,8 +245,8 @@ |
66 |
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) |
67 |
- { |
68 |
- int aifc; /* AIFC or AIFF? */ |
69 |
-- unsigned int len; |
70 |
-- unsigned char *buffer; |
71 |
-+ unsigned int len,readlen; |
72 |
-+ unsigned char buffer[22]; |
73 |
- unsigned char buf2[8]; |
74 |
- aiff_fmt format; |
75 |
- aifffile *aiff = malloc(sizeof(aifffile)); |
76 |
-@@ -269,9 +269,9 @@ |
77 |
- return 0; /* Weird common chunk */ |
78 |
- } |
79 |
- |
80 |
-- buffer = alloca(len); |
81 |
-- |
82 |
-- if(fread(buffer,1,len,in) < len) |
83 |
-+ readlen = len < sizeof(buffer) ? len : sizeof(buffer); |
84 |
-+ if(fread(buffer,1,readlen,in) < readlen || |
85 |
-+ (len > readlen && !seek_forward(in, len-readlen))) |
86 |
- { |
87 |
- fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); |
88 |
- return 0; |
89 |
-@@ -277,11 +277,18 @@ |
90 |
- return 0; |
91 |
- } |
92 |
- |
93 |
-- format.channels = READ_U16_BE(buffer); |
94 |
-+ format.channels = (short)READ_U16_BE(buffer); |
95 |
- format.totalframes = READ_U32_BE(buffer+2); |
96 |
- format.samplesize = READ_U16_BE(buffer+6); |
97 |
- format.rate = (int)read_IEEE80(buffer+8); |
98 |
- |
99 |
-+ if(format.channels <=0) |
100 |
-+ { |
101 |
-+ fprintf(stderr, _("ERROR: Invalid channel count in AIFF header\n")); |
102 |
-+ return 0; |
103 |
-+ |
104 |
-+ } |
105 |
-+ |
106 |
- aiff->bigendian = 1; |
107 |
- |
108 |
- if(aifc) |
109 |
-@@ -449,11 +449,17 @@ |
110 |
- } |
111 |
- |
112 |
- format.format = READ_U16_LE(buf); |
113 |
-- format.channels = READ_U16_LE(buf+2); |
114 |
-+ format.channels = (short)READ_U16_LE(buf+2); |
115 |
- format.samplerate = READ_U32_LE(buf+4); |
116 |
- format.bytespersec = READ_U32_LE(buf+8); |
117 |
- format.align = READ_U16_LE(buf+12); |
118 |
- format.samplesize = READ_U16_LE(buf+14); |
119 |
-+ |
120 |
-+ if(format.channels == 0) |
121 |
-+ { |
122 |
-+ fprintf(stderr, _("ERROR: Zero channels in WAV header\n")); |
123 |
-+ return 0; |
124 |
-+ } |
125 |
- |
126 |
- if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ |
127 |
- { |
128 |
|
129 |
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 |
130 |
deleted file mode 100644 |
131 |
index 51c23b062af..00000000000 |
132 |
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch |
133 |
+++ /dev/null |
134 |
@@ -1,24 +0,0 @@ |
135 |
-Patch taken from: |
136 |
-https://trac.xiph.org/changeset/19117 |
137 |
-To fix bug report: |
138 |
-https://bugs.gentoo.org/show_bug.cgi?id=537422 |
139 |
---- vorbis-tools-1.4.0/oggenc/oggenc.c |
140 |
-+++ vorbis-tools-1.4.0/oggenc/oggenc.c |
141 |
-@@ -97,6 +97,8 @@ |
142 |
- .3,-1, |
143 |
- 0,0,0.f, |
144 |
- 0, 0, 0, 0, 0}; |
145 |
-+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", |
146 |
-+ N_("RAW file reader")}; |
147 |
- |
148 |
- int i; |
149 |
- |
150 |
-@@ -239,8 +241,6 @@ |
151 |
- |
152 |
- if(opt.rawmode) |
153 |
- { |
154 |
-- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", |
155 |
-- N_("RAW file reader")}; |
156 |
- |
157 |
- enc_opts.rate=opt.raw_samplerate; |
158 |
- enc_opts.channels=opt.raw_channels; |
159 |
|
160 |
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 |
161 |
deleted file mode 100644 |
162 |
index d3fdde0e11d..00000000000 |
163 |
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch |
164 |
+++ /dev/null |
165 |
@@ -1,14 +0,0 @@ |
166 |
-Thanks-to: Chris Mayo |
167 |
-https://bugs.gentoo.org/533774 |
168 |
- |
169 |
---- a/ogg123/Makefile.am |
170 |
-+++ b/ogg123/Makefile.am |
171 |
-@@ -19,7 +19,7 @@ |
172 |
- localedir = $(datadir)/locale |
173 |
- DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@ |
174 |
- |
175 |
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) |
176 |
-+docdir = @docdir@ |
177 |
- mandir = @MANDIR@ |
178 |
- |
179 |
- bin_PROGRAMS = ogg123 |
180 |
|
181 |
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 |
182 |
deleted file mode 100644 |
183 |
index 501300ca617..00000000000 |
184 |
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch |
185 |
+++ /dev/null |
186 |
@@ -1,11 +0,0 @@ |
187 |
---- vorbis-tools-1.4.0.orig/ogg123/status.c |
188 |
-+++ vorbis-tools-1.4.0/ogg123/status.c |
189 |
-@@ -148,7 +148,7 @@ |
190 |
- |
191 |
- switch (stats->type) { |
192 |
- case stat_noarg: |
193 |
-- len += sprintf(str+len, stats->formatstr); |
194 |
-+ len += sprintf(str+len, "%s", stats->formatstr); |
195 |
- break; |
196 |
- case stat_intarg: |
197 |
- len += sprintf(str+len, stats->formatstr, stats->arg.intarg); |
198 |
|
199 |
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 |
200 |
deleted file mode 100644 |
201 |
index 9aee38e0b19..00000000000 |
202 |
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch |
203 |
+++ /dev/null |
204 |
@@ -1,47 +0,0 @@ |
205 |
-http://bugs.gentoo.org/513942 |
206 |
- |
207 |
-Fix building with `./configure --enable-ogg123 --without-flac --without-speex --without-kate` and `make`: |
208 |
- |
209 |
-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 |
210 |
-resample.o:resample.c:function res_init: error: undefined reference to 'sin' |
211 |
-collect2: error: ld returned 1 exit status |
212 |
- |
213 |
-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 |
214 |
-vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite' |
215 |
-vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite' |
216 |
-vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh' |
217 |
-vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh' |
218 |
-collect2: error: ld returned 1 exit status |
219 |
- |
220 |
-This is using the new GNU gold linker: |
221 |
- |
222 |
-$ ld -v |
223 |
-GNU gold (GNU Binutils 2.24) 1.11 |
224 |
- |
225 |
-Happens because -lm gets appended to the libraries list only with, for example, --with-flac but vgfilter.c and resample.c are always |
226 |
-using functions from the mathlib. |
227 |
- |
228 |
-Therefore, always link to mathlib: |
229 |
- |
230 |
---- a/ogg123/Makefile.am |
231 |
-+++ b/ogg123/Makefile.am |
232 |
-@@ -30,7 +30,7 @@ |
233 |
- ogg123_LDADD = @SHARE_LIBS@ \ |
234 |
- @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \ |
235 |
- @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \ |
236 |
-- @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ |
237 |
-+ @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ -lm |
238 |
- |
239 |
- ogg123_DEPENDENCIES = @SHARE_LIBS@ |
240 |
- ogg123_SOURCES = audio.c buffer.c callbacks.c \ |
241 |
---- a/oggenc/Makefile.am |
242 |
-+++ b/oggenc/Makefile.am |
243 |
-@@ -23,7 +23,7 @@ |
244 |
- |
245 |
- oggenc_LDADD = @SHARE_LIBS@ \ |
246 |
- @VORBISENC_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ \ |
247 |
-- @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@ |
248 |
-+ @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@ -lm |
249 |
- |
250 |
- oggenc_DEPENDENCIES = @SHARE_LIBS@ |
251 |
- |
252 |
|
253 |
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 |
254 |
deleted file mode 100644 |
255 |
index 51e642dbe33..00000000000 |
256 |
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild |
257 |
+++ /dev/null |
258 |
@@ -1,53 +0,0 @@ |
259 |
-# Copyright 1999-2021 Gentoo Authors |
260 |
-# Distributed under the terms of the GNU General Public License v2 |
261 |
- |
262 |
-EAPI=6 |
263 |
- |
264 |
-inherit autotools |
265 |
- |
266 |
-DESCRIPTION="Tools for using the Ogg Vorbis sound file format" |
267 |
-HOMEPAGE="http://www.vorbis.com" |
268 |
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz" |
269 |
- |
270 |
-LICENSE="GPL-2" |
271 |
-SLOT="0" |
272 |
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" |
273 |
-IUSE="flac kate nls +ogg123 speex" |
274 |
- |
275 |
-RDEPEND=" |
276 |
- >=media-libs/libvorbis-1.3.0 |
277 |
- flac? ( media-libs/flac ) |
278 |
- kate? ( media-libs/libkate ) |
279 |
- ogg123? ( |
280 |
- >=media-libs/libao-1.0.0 |
281 |
- net-misc/curl |
282 |
- ) |
283 |
- speex? ( media-libs/speex ) |
284 |
-" |
285 |
-DEPEND="${RDEPEND} |
286 |
- virtual/pkgconfig |
287 |
- nls? ( sys-devel/gettext ) |
288 |
-" |
289 |
- |
290 |
-PATCHES=( |
291 |
- "${FILESDIR}"/${P}-underlinking.patch |
292 |
- "${FILESDIR}"/${P}-format-security.patch |
293 |
- "${FILESDIR}"/${P}-CVE-2014-9640.patch |
294 |
- "${FILESDIR}"/${P}-CVE-2014-9638.patch |
295 |
- "${FILESDIR}"/${P}-docdir.patch |
296 |
-) |
297 |
- |
298 |
-src_prepare() { |
299 |
- default |
300 |
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220 |
301 |
- eautoreconf |
302 |
-} |
303 |
- |
304 |
-src_configure() { |
305 |
- econf \ |
306 |
- $(use_enable nls) \ |
307 |
- $(use_enable ogg123) \ |
308 |
- $(use_with flac) \ |
309 |
- $(use_with speex) \ |
310 |
- $(use_with kate) |
311 |
-} |