From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- media-gfx/graphicsmagick/Manifest | 10 +- .../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 --------------------- .../graphicsmagick/graphicsmagick-1.3.36.ebuild | 4 +- .../graphicsmagick/graphicsmagick-9999.ebuild | 4 +- 8 files changed, 6 insertions(+), 350 deletions(-) delete mode 100644 media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch delete mode 100644 media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch delete mode 100644 media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch delete mode 100644 media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch delete mode 100644 media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild (limited to 'media-gfx/graphicsmagick') diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 8fd6de3d292c..0fe26b7fb5ba 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,12 +1,6 @@ -AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0c9714a776868303bda17af26cca8f3c4160d7f9060d0a8a116ad30a17b416ddd2963da0e66d4ca76fdc351507c51ae30998 SHA512 fa1bdbe718ae8ae49a58f6fc1728f1bb6b869a907f77e41eec92c452f86e05cf821548409f2a5d55dcdb38b8a80d7ef2b1d37d2111c3fd5088a118626479ad2c AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865 -AUX graphicsmagick-1.3.35-CVE-2020-12672.patch 2753 BLAKE2B 864a77b650f5cec350d83bc5eec289736171a141e8609c41d4c66f49a58b2d332cb2ab343f557879a547e6a291665d16c5707ab7573bf48263a838ba24940475 SHA512 57387a3f1e2e07fdf4617b0fc73106b4f00fe1a7dc0d88919b39490213d42180a4617653b48e54749f7d2807dca4d1b052f14389c30b7a059f841c012ca2b1a6 -AUX graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch 988 BLAKE2B 4906fffe43150ef209c4d2f87d433cf78cd5e3c03a9db22426e3c3455028a5ff63c189ace1f46f47e1fa04fe8d78388b76dcabc288a9a75e57b7ebbb68f8c90d SHA512 95776534891eed617b09873fd70af020c6d6370a6765ba7aaf8185268e8b73b774ce2aeb1b284641fb12260ca0047c4543b17a18ed4ef28db725b75f988c7215 -AUX graphicsmagick-1.3.35-oss-fuzz-23042.patch 1350 BLAKE2B 415bd540a7aa194235ce1e6482035dd9b8ee4d4f5192f4d898e178875d453fd8b481efcbe139db602d411f788e3067a95106ba128ab14af63d3848f92c035405 SHA512 d345b54570e3396db81f0f60980633e139f90a54b579ad953a36aa5e16c1edfe7a5186b4e2d5a2e02f759544b372981278b06d2b688324e6b091c841a5bae133 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a -DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4 -EBUILD graphicsmagick-1.3.35-r1.ebuild 3244 BLAKE2B 20a05ba460b52292328b8152c8b8991653bc5478dde0768085df9b1ed53e16aa74d485a6b49054d97fc4c30eadc7d8be959519711023c495208537d3387bf099 SHA512 a9f44ee9b36fc6859c30a46f6d61338ce5d4d5819508cb2c59e042fab00fbbcccab25219e292413536376e1a7fed734268c50cd1afa1ef68b0ef285a2543cf85 -EBUILD graphicsmagick-1.3.36.ebuild 3121 BLAKE2B d43927f189cadec119d1ebf48bb7110fd91a4d898fd8e38c33268d0fd42b9a7395cfdb7702de3935a8dbc73078ccb8051e4bcaf7e9ecceb4417b1cb8b7315119 SHA512 994e4f88adb26d0c244ef4b684d4f47b2cf8c80acea9de42bf734e8f1c1080fa54d91345b0ee77c967a9ad1079ebcf17aad86509dc8b80aa808d47300c16ca4f -EBUILD graphicsmagick-9999.ebuild 3126 BLAKE2B 4ae429e70dcb36ac4aa03bc6dd0dc21f5540751faeb531e962cad24402e0ff1aa078193e3f9c2cd34d09858215041d4b03f61245636b43c1909e79eefbf43a84 SHA512 6a53a3861721ae9d305dee052da5637fc570c1ffe9c1f7588701a0f9c612740f1e75b3c6d931414f08ca2332b5b2ab8dd13c93e8570f41bc32490a23b9f861d0 +EBUILD graphicsmagick-1.3.36.ebuild 3165 BLAKE2B 45ce77b1bc701748867b55ae2cb14e13901a9e41ee8b0da5c144e227688ee82c0eaafb66b0444bb2fd85067f80b16247f36e986c4cde798bcd9faa3aed7794f0 SHA512 f11cec24ecb3eec4767be8ed08bd25e0c86209c9435a7a57ca7d960049092fd3adf3edd490a4e958a53041f4705215d452804b6d9a9f5e78a7a5eddf48b11ff1 +EBUILD graphicsmagick-9999.ebuild 3171 BLAKE2B 7ec34831b9d3297e7fe1acf566f735fb733874da436d0a5346b40021e7a6485c08fd8b112ed149a26d8c8276ffdf2eaa75c34c8f19dc9198904b239c0213197e SHA512 a931780d798844c966fdf35afe2698da6085cee5bec3882349947d7c29c08770272918fe47e615ac68267f916f5ef626db0383400977fe6bf33e07bfcae84109 MISC metadata.xml 1071 BLAKE2B 899c521ae7916dc5702bada0b782b3020084f84397f0ab62aa4ac15d14d74045ee3dca8b9c9c98591481502694a59e33fcfd8467b7da836a8ee16fb16fbd4727 SHA512 50d6c48e7459d3772d0b804785f5b40cce16bc7a1ac6602a1d5475cd5616e725aa111385eab50a5347418073f1c7afc03f66aa4fd8959474835d899b22c9bca8 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 1ebef5400337..000000000000 --- 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 b314ea288e43..000000000000 --- 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 c7921dd2e699..000000000000 --- 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 197a230a3401..000000000000 --- 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(yrows && image->exception.severity!=UndefinedException) - { - if((long) x