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/files | |
| parent | d08ea43e9ada434f42f4be8e115b67ab22ce38af (diff) | |
gentoo auto-resync : 16:03:2024 - 18:48:51
Diffstat (limited to 'media-gfx/imagemagick/files')
| -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 |
2 files changed, 0 insertions, 56 deletions
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" /> - |