1 |
commit: 7c01b0308e5930c14617b37612328345d14f384d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 20 13:09:32 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 20 15:22:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c01b030 |
7 |
|
8 |
media-sound/mpg123: Security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/626346 |
11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
12 |
|
13 |
media-sound/mpg123/Manifest | 2 - |
14 |
media-sound/mpg123/mpg123-1.25.6.ebuild | 103 -------------------------------- |
15 |
media-sound/mpg123/mpg123-1.25.8.ebuild | 103 -------------------------------- |
16 |
3 files changed, 208 deletions(-) |
17 |
|
18 |
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest |
19 |
index 265c7ddf66e..c15d548f4da 100644 |
20 |
--- a/media-sound/mpg123/Manifest |
21 |
+++ b/media-sound/mpg123/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09 |
24 |
-DIST mpg123-1.25.6.tar.bz2 919169 BLAKE2B 7b330d67465f332f608fa7efbfbfe1bbe69f8912a5678f72c56080b2deb44407d66bac6af23fb8c1359373eb90966ba67901235555f1776a00dc27e66167b0a5 SHA512 0b129c38c19462f7fbe3f56ea2b856222f8a1a3ba76ef8109ca759c9a9c668432cc0ec76059f9a7a3c37228ce615e4c628c7de3b1663073302cc7c8fc93f249c |
25 |
-DIST mpg123-1.25.8.tar.bz2 920677 BLAKE2B bbffa9fa36c40557abb6c70af942b63a43739462c86a22839363b36a39e1a2f16ce3f4e5462f9be9cea2addda1b46af6fdd58b24b5a0b31949efc604ef475c19 SHA512 f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203 |
26 |
|
27 |
diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild |
28 |
deleted file mode 100644 |
29 |
index 39a7bcfda21..00000000000 |
30 |
--- a/media-sound/mpg123/mpg123-1.25.6.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,103 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal |
38 |
- |
39 |
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3" |
40 |
-HOMEPAGE="https://www.mpg123.org/" |
41 |
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2" |
42 |
- |
43 |
-LICENSE="GPL-2 LGPL-2.1" |
44 |
-SLOT="0" |
45 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
46 |
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse" |
47 |
- |
48 |
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs. |
49 |
-RDEPEND="app-eselect/eselect-mpg123 |
50 |
- dev-libs/libltdl:0 |
51 |
- alsa? ( media-libs/alsa-lib ) |
52 |
- jack? ( virtual/jack ) |
53 |
- nas? ( media-libs/nas ) |
54 |
- portaudio? ( media-libs/portaudio ) |
55 |
- pulseaudio? ( media-sound/pulseaudio ) |
56 |
- sdl? ( media-libs/libsdl )" |
57 |
-DEPEND="${RDEPEND} |
58 |
- sys-devel/libtool |
59 |
- virtual/pkgconfig" |
60 |
- |
61 |
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README ) |
62 |
- |
63 |
-pkg_setup() { |
64 |
- # Build fails without -D_GNU_SOURCE like this: |
65 |
- # error: ‘struct hostent’ has no member named ‘h_addr’ |
66 |
- append-cflags -D_GNU_SOURCE |
67 |
-} |
68 |
- |
69 |
-src_prepare() { |
70 |
- default |
71 |
- elibtoolize # for Darwin bundles |
72 |
-} |
73 |
- |
74 |
-multilib_src_configure() { |
75 |
- local _audio=dummy |
76 |
- local _output=dummy |
77 |
- local _cpu=generic_fpu |
78 |
- |
79 |
- if $(multilib_is_native_abi) ; then |
80 |
- for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do |
81 |
- if use ${flag}; then |
82 |
- _audio+=" ${flag/pulseaudio/pulse}" |
83 |
- _output=${flag/pulseaudio/pulse} |
84 |
- fi |
85 |
- done |
86 |
- fi |
87 |
- |
88 |
- use altivec && _cpu=altivec |
89 |
- |
90 |
- if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then |
91 |
- use cpu_flags_x86_sse && _cpu=x86-64 |
92 |
- elif use x86 && gcc-specs-pie ; then |
93 |
- # Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504 |
94 |
- _cpu=generic_fpu |
95 |
- elif use x86-macos ; then |
96 |
- # ASM doesn't work quite as expected with the Darwin linker |
97 |
- _cpu=generic_fpu |
98 |
- else |
99 |
- use cpu_flags_x86_mmx && _cpu=mmx |
100 |
- use cpu_flags_x86_3dnow && _cpu=3dnow |
101 |
- use cpu_flags_x86_sse && _cpu=x86 |
102 |
- use cpu_flags_x86_3dnowext && _cpu=x86 |
103 |
- fi |
104 |
- |
105 |
- local myconf="" |
106 |
- multilib_is_native_abi || myconf="${myconf} --disable-modules" |
107 |
- |
108 |
- ECONF_SOURCE="${S}" econf \ |
109 |
- --with-optimization=0 \ |
110 |
- --with-audio="${_audio}" \ |
111 |
- --with-default-audio=${_output} \ |
112 |
- --with-cpu=${_cpu} \ |
113 |
- --enable-network \ |
114 |
- $(use_enable ipv6) \ |
115 |
- --enable-int-quality=$(usex int-quality) \ |
116 |
- ${myconf} |
117 |
- |
118 |
- if ! $(multilib_is_native_abi) ; then |
119 |
- sed -i -e 's:src doc:src/libmpg123:' Makefile || die |
120 |
- fi |
121 |
-} |
122 |
- |
123 |
-multilib_src_install_all() { |
124 |
- einstalldocs |
125 |
- mv "${ED}"/usr/bin/mpg123{,-mpg123} |
126 |
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + |
127 |
-} |
128 |
- |
129 |
-pkg_postinst() { |
130 |
- eselect mpg123 update ifunset |
131 |
-} |
132 |
- |
133 |
-pkg_postrm() { |
134 |
- eselect mpg123 update ifunset |
135 |
-} |
136 |
|
137 |
diff --git a/media-sound/mpg123/mpg123-1.25.8.ebuild b/media-sound/mpg123/mpg123-1.25.8.ebuild |
138 |
deleted file mode 100644 |
139 |
index 5cb30beae9d..00000000000 |
140 |
--- a/media-sound/mpg123/mpg123-1.25.8.ebuild |
141 |
+++ /dev/null |
142 |
@@ -1,103 +0,0 @@ |
143 |
-# Copyright 1999-2017 Gentoo Foundation |
144 |
-# Distributed under the terms of the GNU General Public License v2 |
145 |
- |
146 |
-EAPI=6 |
147 |
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal |
148 |
- |
149 |
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3" |
150 |
-HOMEPAGE="https://www.mpg123.org/" |
151 |
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2" |
152 |
- |
153 |
-LICENSE="GPL-2 LGPL-2.1" |
154 |
-SLOT="0" |
155 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
156 |
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse" |
157 |
- |
158 |
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs. |
159 |
-RDEPEND="app-eselect/eselect-mpg123 |
160 |
- dev-libs/libltdl:0 |
161 |
- alsa? ( media-libs/alsa-lib ) |
162 |
- jack? ( virtual/jack ) |
163 |
- nas? ( media-libs/nas ) |
164 |
- portaudio? ( media-libs/portaudio ) |
165 |
- pulseaudio? ( media-sound/pulseaudio ) |
166 |
- sdl? ( media-libs/libsdl )" |
167 |
-DEPEND="${RDEPEND} |
168 |
- sys-devel/libtool |
169 |
- virtual/pkgconfig" |
170 |
- |
171 |
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README ) |
172 |
- |
173 |
-pkg_setup() { |
174 |
- # Build fails without -D_GNU_SOURCE like this: |
175 |
- # error: ‘struct hostent’ has no member named ‘h_addr’ |
176 |
- append-cflags -D_GNU_SOURCE |
177 |
-} |
178 |
- |
179 |
-src_prepare() { |
180 |
- default |
181 |
- elibtoolize # for Darwin bundles |
182 |
-} |
183 |
- |
184 |
-multilib_src_configure() { |
185 |
- local _audio=dummy |
186 |
- local _output=dummy |
187 |
- local _cpu=generic_fpu |
188 |
- |
189 |
- if $(multilib_is_native_abi) ; then |
190 |
- for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do |
191 |
- if use ${flag}; then |
192 |
- _audio+=" ${flag/pulseaudio/pulse}" |
193 |
- _output=${flag/pulseaudio/pulse} |
194 |
- fi |
195 |
- done |
196 |
- fi |
197 |
- |
198 |
- use altivec && _cpu=altivec |
199 |
- |
200 |
- if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then |
201 |
- use cpu_flags_x86_sse && _cpu=x86-64 |
202 |
- elif use x86 && gcc-specs-pie ; then |
203 |
- # Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504 |
204 |
- _cpu=generic_fpu |
205 |
- elif use x86-macos ; then |
206 |
- # ASM doesn't work quite as expected with the Darwin linker |
207 |
- _cpu=generic_fpu |
208 |
- else |
209 |
- use cpu_flags_x86_mmx && _cpu=mmx |
210 |
- use cpu_flags_x86_3dnow && _cpu=3dnow |
211 |
- use cpu_flags_x86_sse && _cpu=x86 |
212 |
- use cpu_flags_x86_3dnowext && _cpu=x86 |
213 |
- fi |
214 |
- |
215 |
- local myconf="" |
216 |
- multilib_is_native_abi || myconf="${myconf} --disable-modules" |
217 |
- |
218 |
- ECONF_SOURCE="${S}" econf \ |
219 |
- --with-optimization=0 \ |
220 |
- --with-audio="${_audio}" \ |
221 |
- --with-default-audio=${_output} \ |
222 |
- --with-cpu=${_cpu} \ |
223 |
- --enable-network \ |
224 |
- $(use_enable ipv6) \ |
225 |
- --enable-int-quality=$(usex int-quality) \ |
226 |
- ${myconf} |
227 |
- |
228 |
- if ! $(multilib_is_native_abi) ; then |
229 |
- sed -i -e 's:src doc:src/libmpg123:' Makefile || die |
230 |
- fi |
231 |
-} |
232 |
- |
233 |
-multilib_src_install_all() { |
234 |
- einstalldocs |
235 |
- mv "${ED}"/usr/bin/mpg123{,-mpg123} |
236 |
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + |
237 |
-} |
238 |
- |
239 |
-pkg_postinst() { |
240 |
- eselect mpg123 update ifunset |
241 |
-} |
242 |
- |
243 |
-pkg_postrm() { |
244 |
- eselect mpg123 update ifunset |
245 |
-} |