1 |
commit: a5f94c4d90095df4ec012acc6ca25e5fc0e7101a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 10 10:28:25 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 10 10:42:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f94c4d |
7 |
|
8 |
media-sound/vorbis-tools: EAPI-6 bump |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
.../files/vorbis-tools-1.4.0-CVE-2014-9638.patch | 8 +++--- |
13 |
.../files/vorbis-tools-1.4.0-underlinking.patch | 8 +++--- |
14 |
.../vorbis-tools/vorbis-tools-1.4.0-r4.ebuild | 30 +++++++++++++--------- |
15 |
3 files changed, 26 insertions(+), 20 deletions(-) |
16 |
|
17 |
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 |
18 |
index 79859df0274..a643f1cb82f 100644 |
19 |
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch |
20 |
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch |
21 |
@@ -5,8 +5,8 @@ To fix bug report: |
22 |
http://www.openwall.com/lists/oss-security/2015/08/29/1 |
23 |
https://bugs.gentoo.org/show_bug.cgi?id=559170 |
24 |
https://bugs.gentoo.org/show_bug.cgi?id=537422 |
25 |
---- oggenc/audio.h |
26 |
-+++ oggenc/audio.h |
27 |
+--- a/oggenc/audio.h |
28 |
++++ b/oggenc/audio.h |
29 |
@@ -25,7 +25,7 @@ |
30 |
|
31 |
typedef struct { |
32 |
@@ -25,8 +25,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=537422 |
33 |
int totalframes; |
34 |
short samplesize; |
35 |
int rate; |
36 |
---- oggenc/audio.c |
37 |
-+++ oggenc/audio.c |
38 |
+--- a/oggenc/audio.c |
39 |
++++ b/oggenc/audio.c |
40 |
@@ -245,8 +245,8 @@ |
41 |
int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) |
42 |
{ |
43 |
|
44 |
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 |
45 |
index aaa10fbb54f..9aee38e0b19 100644 |
46 |
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch |
47 |
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch |
48 |
@@ -23,8 +23,8 @@ using functions from the mathlib. |
49 |
|
50 |
Therefore, always link to mathlib: |
51 |
|
52 |
---- ogg123/Makefile.am |
53 |
-+++ ogg123/Makefile.am |
54 |
+--- a/ogg123/Makefile.am |
55 |
++++ b/ogg123/Makefile.am |
56 |
@@ -30,7 +30,7 @@ |
57 |
ogg123_LDADD = @SHARE_LIBS@ \ |
58 |
@VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \ |
59 |
@@ -34,8 +34,8 @@ Therefore, always link to mathlib: |
60 |
|
61 |
ogg123_DEPENDENCIES = @SHARE_LIBS@ |
62 |
ogg123_SOURCES = audio.c buffer.c callbacks.c \ |
63 |
---- oggenc/Makefile.am |
64 |
-+++ oggenc/Makefile.am |
65 |
+--- a/oggenc/Makefile.am |
66 |
++++ b/oggenc/Makefile.am |
67 |
@@ -23,7 +23,7 @@ |
68 |
|
69 |
oggenc_LDADD = @SHARE_LIBS@ \ |
70 |
|
71 |
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild |
72 |
index 7f85f35db51..54d3541a0b8 100644 |
73 |
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild |
74 |
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild |
75 |
@@ -1,10 +1,11 @@ |
76 |
-# Copyright 1999-2017 Gentoo Foundation |
77 |
+# Copyright 1999-2018 Gentoo Foundation |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
|
80 |
-EAPI=5 |
81 |
-inherit autotools eutils |
82 |
+EAPI=6 |
83 |
|
84 |
-DESCRIPTION="tools for using the Ogg Vorbis sound file format" |
85 |
+inherit autotools |
86 |
+ |
87 |
+DESCRIPTION="Tools for using the Ogg Vorbis sound file format" |
88 |
HOMEPAGE="http://www.vorbis.com" |
89 |
SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz" |
90 |
|
91 |
@@ -13,25 +14,30 @@ SLOT="0" |
92 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" |
93 |
IUSE="flac kate nls +ogg123 speex" |
94 |
|
95 |
-RDEPEND=">=media-libs/libvorbis-1.3.0 |
96 |
+RDEPEND=" |
97 |
+ >=media-libs/libvorbis-1.3.0 |
98 |
flac? ( media-libs/flac ) |
99 |
kate? ( media-libs/libkate ) |
100 |
ogg123? ( |
101 |
>=media-libs/libao-1.0.0 |
102 |
net-misc/curl |
103 |
) |
104 |
- speex? ( media-libs/speex )" |
105 |
+ speex? ( media-libs/speex ) |
106 |
+" |
107 |
DEPEND="${RDEPEND} |
108 |
+ virtual/pkgconfig |
109 |
nls? ( sys-devel/gettext ) |
110 |
- virtual/pkgconfig" |
111 |
+" |
112 |
|
113 |
-DOCS="AUTHORS CHANGES README" |
114 |
+PATCHES=( |
115 |
+ "${FILESDIR}"/${P}-underlinking.patch |
116 |
+ "${FILESDIR}"/${P}-format-security.patch |
117 |
+ "${FILESDIR}"/${P}-CVE-2014-9640.patch |
118 |
+ "${FILESDIR}"/${P}-CVE-2014-9638.patch |
119 |
+) |
120 |
|
121 |
src_prepare() { |
122 |
- epatch "${FILESDIR}"/${P}-underlinking.patch |
123 |
- epatch "${FILESDIR}"/${P}-format-security.patch |
124 |
- epatch "${FILESDIR}"/${P}-CVE-2014-9640.patch |
125 |
- epatch "${FILESDIR}"/${P}-CVE-2014-9638.patch |
126 |
+ default |
127 |
sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220 |
128 |
eautoreconf |
129 |
} |