1 |
commit: 09861a1041e363349a46bc4572f984024dff755d |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 2 23:49:21 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 2 23:49:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09861a10 |
7 |
|
8 |
media-gfx/graphicsmagick: cleanup old |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
media-gfx/graphicsmagick/Manifest | 1 - |
14 |
.../files/graphicsmagick-1.3.19-flags.patch | 56 --------- |
15 |
.../graphicsmagick-1.3.35-CVE-2020-12672.patch | 67 ---------- |
16 |
...smagick-1.3.35-oss-fuzz-20045-20318-21956.patch | 38 ------ |
17 |
.../graphicsmagick-1.3.35-oss-fuzz-23042.patch | 42 ------- |
18 |
.../graphicsmagick/graphicsmagick-1.3.35-r1.ebuild | 135 --------------------- |
19 |
6 files changed, 339 deletions(-) |
20 |
|
21 |
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest |
22 |
index f43ed697a40..097ae8445d3 100644 |
23 |
--- a/media-gfx/graphicsmagick/Manifest |
24 |
+++ b/media-gfx/graphicsmagick/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c |
27 |
DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4 |
28 |
|
29 |
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch |
30 |
deleted file mode 100644 |
31 |
index 1ebef540033..00000000000 |
32 |
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch |
33 |
+++ /dev/null |
34 |
@@ -1,56 +0,0 @@ |
35 |
-Fix various preprocessor, compiler, and linker flags added to config wrappers. |
36 |
-Previously they would add build time flags to the files which is incorrect. |
37 |
- |
38 |
---- GraphicsMagick-1.3.19/configure.ac |
39 |
-+++ GraphicsMagick-1.3.19/configure.ac |
40 |
-@@ -346,6 +346,7 @@ |
41 |
- |
42 |
- AC_OPENMP([C]) |
43 |
- CFLAGS="$OPENMP_CFLAGS $CFLAGS" |
44 |
-+MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS" |
45 |
- #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS" |
46 |
- #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS" |
47 |
- AC_SUBST(OPENMP_CFLAGS) |
48 |
-@@ -3407,9 +3408,10 @@ |
49 |
- MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'` |
50 |
- #LIBS=`echo $LIBS | sed -e 's/ */ /g'` |
51 |
- |
52 |
--MAGICK_API_CFLAGS=$CFLAGS |
53 |
-+MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'` |
54 |
- MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'` |
55 |
--MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS" |
56 |
-+MAGICK_API_CXXFLAGS="" |
57 |
-+MAGICK_API_LDFLAGS="-L$LIB_DIR" |
58 |
- MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS" |
59 |
- MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS" |
60 |
- |
61 |
-@@ -3440,6 +3442,7 @@ |
62 |
- |
63 |
- AC_SUBST(MAGICK_API_CFLAGS) |
64 |
- AC_SUBST(MAGICK_API_CPPFLAGS) |
65 |
-+AC_SUBST(MAGICK_API_CXXFLAGS) |
66 |
- AC_SUBST(MAGICK_API_PC_CPPFLAGS) |
67 |
- AC_SUBST(MAGICK_API_LDFLAGS) |
68 |
- AC_SUBST(MAGICK_API_LIBS) |
69 |
---- GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in |
70 |
-+++ GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in |
71 |
-@@ -30,7 +30,7 @@ |
72 |
- echo @PACKAGE_VERSION@ |
73 |
- ;; |
74 |
- --cflags) |
75 |
-- echo '@CFLAGS@' |
76 |
-+ echo '@MAGICK_API_CFLAGS@' |
77 |
- ;; |
78 |
- --cppflags) |
79 |
- echo '@MAGICK_API_CPPFLAGS@' |
80 |
---- GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in |
81 |
-+++ GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in |
82 |
-@@ -33,7 +33,7 @@ |
83 |
- echo '@MAGICK_API_CPPFLAGS@' |
84 |
- ;; |
85 |
- --cxxflags) |
86 |
-- echo '@CXXFLAGS@' |
87 |
-+ echo '@MAGICK_API_CXXFLAGS@' |
88 |
- ;; |
89 |
- --ldflags) |
90 |
- echo '@MAGICK_API_LDFLAGS@' |
91 |
|
92 |
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch |
93 |
deleted file mode 100644 |
94 |
index b314ea288e4..00000000000 |
95 |
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch |
96 |
+++ /dev/null |
97 |
@@ -1,67 +0,0 @@ |
98 |
-diff -r 4917a4242fc0 -r 50395430a371 coders/png.c |
99 |
---- a/coders/png.c Fri May 01 13:49:13 2020 -0500 |
100 |
-+++ b/coders/png.c Sat May 30 10:18:16 2020 -0500 |
101 |
-@@ -5304,7 +5304,7 @@ |
102 |
- if (logging) |
103 |
- (void) LogMagickEvent(CoderEvent,GetMagickModule(), |
104 |
- "MAGN chunk (%lu bytes): " |
105 |
-- "First_magnified_object_id=%u, Last_magnified_object_id=%u, " |
106 |
-+ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, " |
107 |
- "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, " |
108 |
- "X_method=%u, Y_method=%u", |
109 |
- length, |
110 |
-@@ -5679,6 +5679,8 @@ |
111 |
- /* |
112 |
- If magnifying and a supported method is requested then |
113 |
- magnify the image. |
114 |
-+ |
115 |
-+ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN |
116 |
- */ |
117 |
- if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) && |
118 |
- ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5))) |
119 |
-@@ -5689,7 +5691,28 @@ |
120 |
- |
121 |
- if (logging) |
122 |
- (void) LogMagickEvent(CoderEvent,GetMagickModule(), |
123 |
-- " Processing MNG MAGN chunk"); |
124 |
-+ " Processing MNG MAGN chunk: MB=%u, ML=%u," |
125 |
-+ " MR=%u, MT=%u, MX=%u, MY=%u," |
126 |
-+ " X_method=%u, Y_method=%u", |
127 |
-+ mng_info->magn_mb,mng_info->magn_ml, |
128 |
-+ mng_info->magn_mr,mng_info->magn_mt, |
129 |
-+ mng_info->magn_mx,mng_info->magn_my, |
130 |
-+ mng_info->magn_methx, |
131 |
-+ mng_info->magn_methy); |
132 |
-+ |
133 |
-+ /* |
134 |
-+ If the image width is 1, then X magnification is done |
135 |
-+ by simple pixel replication. |
136 |
-+ */ |
137 |
-+ if (image->columns == 1) |
138 |
-+ mng_info->magn_methx = 1; |
139 |
-+ |
140 |
-+ /* |
141 |
-+ If the image height is 1, then Y magnification is done |
142 |
-+ by simple pixel replication. |
143 |
-+ */ |
144 |
-+ if (image->rows == 1) |
145 |
-+ mng_info->magn_methy = 1; |
146 |
- |
147 |
- if (mng_info->magn_methx == 1) |
148 |
- { |
149 |
-@@ -5734,12 +5757,10 @@ |
150 |
- Image |
151 |
- *large_image; |
152 |
- |
153 |
-- int |
154 |
-- yy; |
155 |
-- |
156 |
- long |
157 |
- m, |
158 |
-- y; |
159 |
-+ y, |
160 |
-+ yy; |
161 |
- |
162 |
- register long |
163 |
- x; |
164 |
- |
165 |
|
166 |
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch |
167 |
deleted file mode 100644 |
168 |
index c7921dd2e69..00000000000 |
169 |
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch |
170 |
+++ /dev/null |
171 |
@@ -1,38 +0,0 @@ |
172 |
-diff -r 50395430a371 -r 83b4d2b4b873 coders/wpg.c |
173 |
---- a/coders/wpg.c Sat May 30 10:18:16 2020 -0500 |
174 |
-+++ b/coders/wpg.c Sat May 30 17:33:51 2020 -0500 |
175 |
-@@ -403,7 +403,7 @@ |
176 |
- x++; \ |
177 |
- if((long) x>=ldblk) \ |
178 |
- { \ |
179 |
-- if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) RetVal=-6; \ |
180 |
-+ if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg_raser_error; } \ |
181 |
- x=0; \ |
182 |
- y++; \ |
183 |
- if(y>=image->rows) break; \ |
184 |
-@@ -537,6 +537,7 @@ |
185 |
- } |
186 |
- } |
187 |
- } |
188 |
-+unpack_wpg_raser_error:; |
189 |
- MagickFreeMemory(BImgBuff); |
190 |
- return(RetVal); |
191 |
- } |
192 |
-@@ -552,7 +553,7 @@ |
193 |
- x++; \ |
194 |
- if((long) x >= ldblk) \ |
195 |
- { \ |
196 |
-- if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) RetVal=-6; \ |
197 |
-+ if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg2_error; } \ |
198 |
- x=0; \ |
199 |
- y++; \ |
200 |
- XorMe = 0; \ |
201 |
-@@ -729,6 +730,7 @@ |
202 |
- } |
203 |
- } |
204 |
- } |
205 |
-+unpack_wpg2_error:; |
206 |
- FreeUnpackWPG2RasterAllocs(BImgBuff,UpImgBuff); |
207 |
- return(RetVal); |
208 |
- } |
209 |
- |
210 |
|
211 |
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch |
212 |
deleted file mode 100644 |
213 |
index 197a230a340..00000000000 |
214 |
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch |
215 |
+++ /dev/null |
216 |
@@ -1,42 +0,0 @@ |
217 |
-diff -r 24ed4812e580 -r b0aa53a5f970 coders/wpg.c |
218 |
---- a/coders/wpg.c Tue Jun 02 07:45:45 2020 -0500 |
219 |
-+++ b/coders/wpg.c Sat Jun 06 14:12:18 2020 -0500 |
220 |
-@@ -413,9 +413,12 @@ |
221 |
- |
222 |
- /** Call this function to ensure that all data matrix is filled with something. This function |
223 |
- * is used only to error recovery. */ |
224 |
--static void ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image, |
225 |
-- int bpp, long ldblk) |
226 |
-+static MagickPassFail ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image, |
227 |
-+ int bpp, long ldblk) |
228 |
- { |
229 |
-+ MagickPassFail |
230 |
-+ status = MagickPass; |
231 |
-+ |
232 |
- while(y<image->rows && image->exception.severity!=UndefinedException) |
233 |
- { |
234 |
- if((long) x<ldblk) |
235 |
-@@ -427,9 +430,13 @@ |
236 |
- x = 0; /* Next pass will need to clear whole row */ |
237 |
- } |
238 |
- if(InsertRow(BImgBuff,y,image,bpp) == MagickFail) |
239 |
-- break; |
240 |
-+ { |
241 |
-+ status = MagickFail; |
242 |
-+ break; |
243 |
-+ } |
244 |
- y++; |
245 |
- } |
246 |
-+ return status; |
247 |
- } |
248 |
- |
249 |
- |
250 |
-@@ -528,7 +535,6 @@ |
251 |
- } |
252 |
- if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) |
253 |
- { |
254 |
-- ZeroFillMissingData(BImgBuff,x,y,image,bpp,ldblk); |
255 |
- MagickFreeMemory(BImgBuff); |
256 |
- return(-6); |
257 |
- } |
258 |
- |
259 |
|
260 |
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild |
261 |
deleted file mode 100644 |
262 |
index 2533e3b977e..00000000000 |
263 |
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild |
264 |
+++ /dev/null |
265 |
@@ -1,135 +0,0 @@ |
266 |
-# Copyright 1999-2020 Gentoo Authors |
267 |
-# Distributed under the terms of the GNU General Public License v2 |
268 |
- |
269 |
-EAPI=7 |
270 |
-inherit autotools toolchain-funcs |
271 |
- |
272 |
-MY_P=${P/graphicsm/GraphicsM} |
273 |
- |
274 |
-DESCRIPTION="Collection of tools and libraries for many image formats" |
275 |
-HOMEPAGE="http://www.graphicsmagick.org/" |
276 |
-LICENSE="MIT" |
277 |
-SLOT="0/${PV%.*}" |
278 |
- |
279 |
-if [[ ${PV} == "9999" ]] ; then |
280 |
- inherit mercurial |
281 |
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" |
282 |
-else |
283 |
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" |
284 |
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
285 |
-fi |
286 |
- |
287 |
-IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma |
288 |
- openmp perl png postscript q16 q32 static-libs svg threads tiff truetype |
289 |
- webp wmf X zlib" |
290 |
- |
291 |
-RDEPEND="dev-libs/libltdl:0 |
292 |
- bzip2? ( app-arch/bzip2 ) |
293 |
- fpx? ( media-libs/libfpx ) |
294 |
- imagemagick? ( !media-gfx/imagemagick ) |
295 |
- jbig? ( media-libs/jbigkit ) |
296 |
- jpeg? ( virtual/jpeg:0 ) |
297 |
- lcms? ( media-libs/lcms:2 ) |
298 |
- lzma? ( app-arch/xz-utils ) |
299 |
- perl? ( dev-lang/perl:= ) |
300 |
- png? ( media-libs/libpng:0= ) |
301 |
- postscript? ( app-text/ghostscript-gpl ) |
302 |
- svg? ( dev-libs/libxml2 ) |
303 |
- tiff? ( media-libs/tiff:0 ) |
304 |
- truetype? ( |
305 |
- media-fonts/urw-fonts |
306 |
- >=media-libs/freetype-2 |
307 |
- ) |
308 |
- webp? ( media-libs/libwebp:= ) |
309 |
- wmf? ( media-libs/libwmf ) |
310 |
- X? ( |
311 |
- x11-libs/libSM |
312 |
- x11-libs/libXext |
313 |
- ) |
314 |
- zlib? ( sys-libs/zlib )" |
315 |
-DEPEND="${RDEPEND}" |
316 |
- |
317 |
-S=${WORKDIR}/${MY_P} |
318 |
- |
319 |
-PATCHES=( |
320 |
- "${FILESDIR}"/${PN}-1.3.19-flags.patch |
321 |
- "${FILESDIR}"/${PN}-1.3.19-perl.patch |
322 |
- "${FILESDIR}"/${P}-CVE-2020-12672.patch |
323 |
- "${FILESDIR}"/${P}-oss-fuzz-20045-20318-21956.patch |
324 |
- "${FILESDIR}"/${P}-oss-fuzz-23042.patch |
325 |
-) |
326 |
- |
327 |
-src_prepare() { |
328 |
- default |
329 |
- eautoreconf |
330 |
-} |
331 |
- |
332 |
-src_configure() { |
333 |
- local depth=8 |
334 |
- use q16 && depth=16 |
335 |
- use q32 && depth=32 |
336 |
- |
337 |
- local openmp=disable |
338 |
- if use openmp && tc-has-openmp; then |
339 |
- openmp=enable |
340 |
- fi |
341 |
- |
342 |
- local myeconfargs=( |
343 |
- --${openmp}-openmp |
344 |
- --enable-largefile |
345 |
- --enable-shared |
346 |
- $(use_enable static-libs static) |
347 |
- $(use_enable debug prof) |
348 |
- $(use_enable debug gcov) |
349 |
- $(use_enable imagemagick magick-compat) |
350 |
- $(use_with threads) |
351 |
- $(use_with dynamic-loading modules) |
352 |
- --with-quantum-depth=${depth} |
353 |
- --without-frozenpaths |
354 |
- $(use_with cxx magick-plus-plus) |
355 |
- $(use_with perl) |
356 |
- --with-perl-options=INSTALLDIRS=vendor |
357 |
- $(use_with bzip2 bzlib) |
358 |
- $(use_with postscript dps) |
359 |
- $(use_with fpx) |
360 |
- $(use_with jbig) |
361 |
- $(use_with webp) |
362 |
- $(use_with jpeg) |
363 |
- --without-jp2 |
364 |
- $(use_with lcms lcms2) |
365 |
- $(use_with lzma) |
366 |
- $(use_with png) |
367 |
- $(use_with tiff) |
368 |
- $(use_with truetype ttf) |
369 |
- $(use_with wmf) |
370 |
- --with-fontpath="${EPREFIX}"/usr/share/fonts |
371 |
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts |
372 |
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts |
373 |
- $(use_with svg xml) |
374 |
- $(use_with zlib) |
375 |
- $(use_with X x) |
376 |
- ) |
377 |
- econf "${myeconfargs[@]}" |
378 |
-} |
379 |
- |
380 |
-src_compile() { |
381 |
- default |
382 |
- use perl && emake perl-build |
383 |
-} |
384 |
- |
385 |
-src_test() { |
386 |
- unset DISPLAY # some perl tests fail when DISPLAY is set |
387 |
- default |
388 |
-} |
389 |
- |
390 |
-src_install() { |
391 |
- default |
392 |
- |
393 |
- if use perl; then |
394 |
- emake -C PerlMagick DESTDIR="${D}" install |
395 |
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die |
396 |
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die |
397 |
- fi |
398 |
- |
399 |
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die |
400 |
-} |