commit: 09861a1041e363349a46bc4572f984024dff755d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Feb 2 23:49:21 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 2 23:49:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09861a10
media-gfx/graphicsmagick: cleanup old Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/graphicsmagick/Manifest | 1 - .../files/graphicsmagick-1.3.19-flags.patch | 56 --------- .../graphicsmagick-1.3.35-CVE-2020-12672.patch | 67 ---------- ...smagick-1.3.35-oss-fuzz-20045-20318-21956.patch | 38 ------ .../graphicsmagick-1.3.35-oss-fuzz-23042.patch | 42 ------- .../graphicsmagick/graphicsmagick-1.3.35-r1.ebuild | 135 --------------------- 6 files changed, 339 deletions(-) diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index f43ed697a40..097ae8445d3 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,2 +1 @@ -DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch deleted file mode 100644 index 1ebef540033..00000000000 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch +++ /dev/null @@ -1,56 +0,0 @@ -Fix various preprocessor, compiler, and linker flags added to config wrappers. -Previously they would add build time flags to the files which is incorrect. - ---- GraphicsMagick-1.3.19/configure.ac -+++ GraphicsMagick-1.3.19/configure.ac -@@ -346,6 +346,7 @@ - - AC_OPENMP([C]) - CFLAGS="$OPENMP_CFLAGS $CFLAGS" -+MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS" - #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS" - #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS" - AC_SUBST(OPENMP_CFLAGS) -@@ -3407,9 +3408,10 @@ - MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'` - #LIBS=`echo $LIBS | sed -e 's/ */ /g'` - --MAGICK_API_CFLAGS=$CFLAGS -+MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'` - MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'` --MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS" -+MAGICK_API_CXXFLAGS="" -+MAGICK_API_LDFLAGS="-L$LIB_DIR" - MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS" - MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS" - -@@ -3440,6 +3442,7 @@ - - AC_SUBST(MAGICK_API_CFLAGS) - AC_SUBST(MAGICK_API_CPPFLAGS) -+AC_SUBST(MAGICK_API_CXXFLAGS) - AC_SUBST(MAGICK_API_PC_CPPFLAGS) - AC_SUBST(MAGICK_API_LDFLAGS) - AC_SUBST(MAGICK_API_LIBS) ---- GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in -+++ GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in -@@ -30,7 +30,7 @@ - echo @PACKAGE_VERSION@ - ;; - --cflags) -- echo '@CFLAGS@' -+ echo '@MAGICK_API_CFLAGS@' - ;; - --cppflags) - echo '@MAGICK_API_CPPFLAGS@' ---- GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in -+++ GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in -@@ -33,7 +33,7 @@ - echo '@MAGICK_API_CPPFLAGS@' - ;; - --cxxflags) -- echo '@CXXFLAGS@' -+ echo '@MAGICK_API_CXXFLAGS@' - ;; - --ldflags) - echo '@MAGICK_API_LDFLAGS@' 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 deleted file mode 100644 index b314ea288e4..00000000000 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -r 4917a4242fc0 -r 50395430a371 coders/png.c ---- a/coders/png.c Fri May 01 13:49:13 2020 -0500 -+++ b/coders/png.c Sat May 30 10:18:16 2020 -0500 -@@ -5304,7 +5304,7 @@ - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "MAGN chunk (%lu bytes): " -- "First_magnified_object_id=%u, Last_magnified_object_id=%u, " -+ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, " - "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, " - "X_method=%u, Y_method=%u", - length, -@@ -5679,6 +5679,8 @@ - /* - If magnifying and a supported method is requested then - magnify the image. -+ -+ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN - */ - if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) && - ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5))) -@@ -5689,7 +5691,28 @@ - - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " Processing MNG MAGN chunk"); -+ " Processing MNG MAGN chunk: MB=%u, ML=%u," -+ " MR=%u, MT=%u, MX=%u, MY=%u," -+ " X_method=%u, Y_method=%u", -+ mng_info->magn_mb,mng_info->magn_ml, -+ mng_info->magn_mr,mng_info->magn_mt, -+ mng_info->magn_mx,mng_info->magn_my, -+ mng_info->magn_methx, -+ mng_info->magn_methy); -+ -+ /* -+ If the image width is 1, then X magnification is done -+ by simple pixel replication. -+ */ -+ if (image->columns == 1) -+ mng_info->magn_methx = 1; -+ -+ /* -+ If the image height is 1, then Y magnification is done -+ by simple pixel replication. -+ */ -+ if (image->rows == 1) -+ mng_info->magn_methy = 1; - - if (mng_info->magn_methx == 1) - { -@@ -5734,12 +5757,10 @@ - Image - *large_image; - -- int -- yy; -- - long - m, -- y; -+ y, -+ yy; - - register long - x; - 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 deleted file mode 100644 index c7921dd2e69..00000000000 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -r 50395430a371 -r 83b4d2b4b873 coders/wpg.c ---- a/coders/wpg.c Sat May 30 10:18:16 2020 -0500 -+++ b/coders/wpg.c Sat May 30 17:33:51 2020 -0500 -@@ -403,7 +403,7 @@ - x++; \ - if((long) x>=ldblk) \ - { \ -- if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) RetVal=-6; \ -+ if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg_raser_error; } \ - x=0; \ - y++; \ - if(y>=image->rows) break; \ -@@ -537,6 +537,7 @@ - } - } - } -+unpack_wpg_raser_error:; - MagickFreeMemory(BImgBuff); - return(RetVal); - } -@@ -552,7 +553,7 @@ - x++; \ - if((long) x >= ldblk) \ - { \ -- if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) RetVal=-6; \ -+ if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg2_error; } \ - x=0; \ - y++; \ - XorMe = 0; \ -@@ -729,6 +730,7 @@ - } - } - } -+unpack_wpg2_error:; - FreeUnpackWPG2RasterAllocs(BImgBuff,UpImgBuff); - return(RetVal); - } - 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 deleted file mode 100644 index 197a230a340..00000000000 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -r 24ed4812e580 -r b0aa53a5f970 coders/wpg.c ---- a/coders/wpg.c Tue Jun 02 07:45:45 2020 -0500 -+++ b/coders/wpg.c Sat Jun 06 14:12:18 2020 -0500 -@@ -413,9 +413,12 @@ - - /** Call this function to ensure that all data matrix is filled with something. This function - * is used only to error recovery. */ --static void ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image, -- int bpp, long ldblk) -+static MagickPassFail ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image, -+ int bpp, long ldblk) - { -+ MagickPassFail -+ status = MagickPass; -+ - while(y<image->rows && image->exception.severity!=UndefinedException) - { - if((long) x<ldblk) -@@ -427,9 +430,13 @@ - x = 0; /* Next pass will need to clear whole row */ - } - if(InsertRow(BImgBuff,y,image,bpp) == MagickFail) -- break; -+ { -+ status = MagickFail; -+ break; -+ } - y++; - } -+ return status; - } - - -@@ -528,7 +535,6 @@ - } - if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) - { -- ZeroFillMissingData(BImgBuff,x,y,image,bpp,ldblk); - MagickFreeMemory(BImgBuff); - return(-6); - } - diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild deleted file mode 100644 index 2533e3b977e..00000000000 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -MY_P=${P/graphicsm/GraphicsM} - -DESCRIPTION="Collection of tools and libraries for many image formats" -HOMEPAGE="http://www.graphicsmagick.org/"; -LICENSE="MIT" -SLOT="0/${PV%.*}" - -if [[ ${PV} == "9999" ]] ; then - inherit mercurial - EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"; -else - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -fi - -IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma - openmp perl png postscript q16 q32 static-libs svg threads tiff truetype - webp wmf X zlib" - -RDEPEND="dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - fpx? ( media-libs/libfpx ) - imagemagick? ( !media-gfx/imagemagick ) - jbig? ( media-libs/jbigkit ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lzma? ( app-arch/xz-utils ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - svg? ( dev-libs/libxml2 ) - tiff? ( media-libs/tiff:0 ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libSM - x11-libs/libXext - ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.19-flags.patch - "${FILESDIR}"/${PN}-1.3.19-perl.patch - "${FILESDIR}"/${P}-CVE-2020-12672.patch - "${FILESDIR}"/${P}-oss-fuzz-20045-20318-21956.patch - "${FILESDIR}"/${P}-oss-fuzz-23042.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local depth=8 - use q16 && depth=16 - use q32 && depth=32 - - local openmp=disable - if use openmp && tc-has-openmp; then - openmp=enable - fi - - local myeconfargs=( - --${openmp}-openmp - --enable-largefile - --enable-shared - $(use_enable static-libs static) - $(use_enable debug prof) - $(use_enable debug gcov) - $(use_enable imagemagick magick-compat) - $(use_with threads) - $(use_with dynamic-loading modules) - --with-quantum-depth=${depth} - --without-frozenpaths - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options=INSTALLDIRS=vendor - $(use_with bzip2 bzlib) - $(use_with postscript dps) - $(use_with fpx) - $(use_with jbig) - $(use_with webp) - $(use_with jpeg) - --without-jp2 - $(use_with lcms lcms2) - $(use_with lzma) - $(use_with png) - $(use_with tiff) - $(use_with truetype ttf) - $(use_with wmf) - --with-fontpath="${EPREFIX}"/usr/share/fonts - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts - $(use_with svg xml) - $(use_with zlib) - $(use_with X x) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - use perl && emake perl-build -} - -src_test() { - unset DISPLAY # some perl tests fail when DISPLAY is set - default -} - -src_install() { - default - - if use perl; then - emake -C PerlMagick DESTDIR="${D}" install - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die -}
