diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-03-16 18:48:52 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-16 18:48:52 +0000 |
| commit | f265f17242b04ae036b4dc174fa95401d895dbc5 (patch) | |
| tree | 8daa848087a673b8bf5dad576b0a08048d551da7 /media-gfx/imagemagick | |
| parent | d08ea43e9ada434f42f4be8e115b67ab22ce38af (diff) | |
gentoo auto-resync : 16:03:2024 - 18:48:51
Diffstat (limited to 'media-gfx/imagemagick')
| -rw-r--r-- | media-gfx/imagemagick/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch | 47 | ||||
| -rw-r--r-- | media-gfx/imagemagick/files/policy-hardening.snippet | 9 |
3 files changed, 0 insertions, 58 deletions
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 120a928e600e..8959f4660cba 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,6 +1,4 @@ -AUX imagemagick-7.1.1.24-c99.patch 1796 BLAKE2B 38b6834affb557d24d05a0242e249e73ec6b1994c2eb1d8fa1e81eed758a38f8383c2c0ac2af3746f4835dd7065c295e077d22033293316ebd747fc886bb2c48 SHA512 1977ab84a0b53fbeafa4c95ef7d2d792ab3459685e0ee96871cd75440a8f190c7d0e6adb639fa75db33d80efe09010f5d08ef443ccd8d458faa95fdde980ccc4 AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5516260e8a8f243ab8bc61f95f6833185c3a997f5b046dc24690aeebfad925e0e180d98791aae1ad910e9aa069f0108dbd89 SHA512 647c367470deaaaa1ee14a02f80c8ed63de294ea7211a9010fad029bc9b254e27bc41c461561c28c2e24166fc17d0023238755160f8f22af641b0858e4bdceea -AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080 SHA512 3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04 SHA512 0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch deleted file mode 100644 index affcb61f1fed..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://bugs.gentoo.org/920788 - -From f6e90ad1a649c4032b957fa101d30c14de3b7e5d Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Wed, 27 Dec 2023 22:37:42 +0000 -Subject: [PATCH] configure.ac: fixup LFS check for autoconf-2.72 - -There are two problems with the check: -1) The 'unknown' case has a problem which is rejected by stricter C compilers -because it has -Wimplicit-int and -Wimplicit-function-declaration warnings. Fix that. - -2) For the 'other' case, we were using the value of ac_cv_sys_file_offset_bits for --D_FILE_OFFSET_BITS to pass down into the Perl module build, but autoconf-2.72 -drops the use of ac_cv_sys_file_offset_bits in cf09f48841b66fe76f606dd6018bb3a93242a7c9, -so this ends up defining '-D_FILE_OFFSET_BITS=' which then breaks the build. - -I've added a hack for 2) to preserve the old behavior. - -Signed-off-by: Sam James <sam@gentoo.org> ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 57c21edb77..99aa9c21af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -503,7 +503,8 @@ if test "$enable_largefile" != no; then - unknown) - AC_MSG_CHECKING([for native large file support]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h> -- main () { -+ #include <stdlib.h> -+ int main () { - exit(!(sizeof(off_t) == 8)); - }])], - [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64) -@@ -511,6 +512,9 @@ if test "$enable_largefile" != no; then - [AC_MSG_RESULT([no])]) - ;; - *) -+ if test "$ac_cv_sys_file_offset_bits" = ''; then -+ ac_cv_sys_file_offset_bits=64; -+ fi - LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" - ;; - esac diff --git a/media-gfx/imagemagick/files/policy-hardening.snippet b/media-gfx/imagemagick/files/policy-hardening.snippet deleted file mode 100644 index c1a91b0b8744..000000000000 --- a/media-gfx/imagemagick/files/policy-hardening.snippet +++ /dev/null @@ -1,9 +0,0 @@ -<policymap> - <!-- https://www.kb.cert.org/vuls/id/332928 mitigation / https://bugs.gentoo.org/664236 --> - <policy domain="coder" rights="none" pattern="PS" /> - <policy domain="coder" rights="none" pattern="PS2" /> - <policy domain="coder" rights="none" pattern="PS3" /> - <policy domain="coder" rights="none" pattern="EPS" /> - <policy domain="coder" rights="none" pattern="PDF" /> - <policy domain="coder" rights="none" pattern="XPS" /> - |