security policy configuration

ImageMagick · Aug 13, 2023 · 6e1a710 · 6e1a710
1 parent 480c736
commit 6e1a710
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 111 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -3553,7 +3553,6 @@ CONFIG_EXTRA_DIST = \
 	config/magic.xml \
 	config/mime.xml \
   config/open-policy.xml \
-	config/policy.xml \
 	config/quantization-table.xml \
   config/secure-policy.xml \
 	config/sRGB.icm \

diff --git a/config/Makefile.am b/config/Makefile.am
@@ -67,7 +67,6 @@ CONFIG_EXTRA_DIST = \
 	config/magic.xml \
 	config/mime.xml \
   config/open-policy.xml \
-	config/policy.xml \
 	config/quantization-table.xml \
   config/secure-policy.xml \
 	config/sRGB.icm \

diff --git a/config/config.h.in b/config/config.h.in
@@ -812,9 +812,6 @@
 /* Define to prepend to default font search path. */
 #undef MAGICK_FONT_PATH
 
-/* Security Policy */
-#undef MAGICK_SECURITY_POLICY
-
 /* Target Host CPU */
 #undef MAGICK_TARGET_CPU
 

diff --git a/config/policy.xml b/config/policy.xml
diff --git a/configure b/configure
@@ -5132,7 +5132,7 @@ MAGICK_PATCHLEVEL_VERSION=94
 
 MAGICK_VERSION=6.9.12-94
 
-MAGICK_GIT_REVISION=6bc911e1d:20230811
+MAGICK_GIT_REVISION=480c7365a:20230812
 
 
 # Substitute library versioning
@@ -5166,7 +5166,7 @@ PACKAGE_LIB_VERSION=0x69C
 
 PACKAGE_LIB_VERSION_NUMBER=6,9,12,94
 
-PACKAGE_RELEASE_DATE=2023-08-11
+PACKAGE_RELEASE_DATE=2023-08-12
 
 
 # Ensure that make can run correctly
@@ -23491,9 +23491,6 @@ printf "%s\n" "$with_security_policy" >&6; }
 
 
 
-printf "%s\n" "#define MAGICK_SECURITY_POLICY \"$MAGICK_SECURITY_POLICY\"" >>confdefs.h
-
-
 # Disable/Enable support for full delegate paths
 
 # Check whether --with-frozenpaths was given.

diff --git a/configure.ac b/configure.ac
@@ -827,8 +827,6 @@ m4_define([_MAGICK_SECURITY_POLICY],
 
 _MAGICK_SECURITY_POLICY([open])
 AC_SUBST([MAGICK_SECURITY_POLICY])
-AC_DEFINE_UNQUOTED([MAGICK_SECURITY_POLICY],["$MAGICK_SECURITY_POLICY"],
-  [Security Policy])
 
 # Disable/Enable support for full delegate paths
 AC_ARG_WITH([frozenpaths],

diff --git a/magick/version.c b/magick/version.c
@@ -629,10 +629,6 @@ MagickExport void ListMagickVersion(FILE *file)
     GetMagickVersion((size_t *) NULL));
   (void) FormatLocaleFile(file,"Copyright: %s\n",GetMagickCopyright());
   (void) FormatLocaleFile(file,"License: %s\n",GetMagickLicense());
-#if defined(MAGICKCORE_MAGICK_SECURITY_POLICY)
-  (void) FormatLocaleFile(file,"Security policy: %s\n",
-    MAGICKCORE_MAGICK_SECURITY_POLICY);
-#endif
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && defined(_MSC_FULL_VER)
   (void) FormatLocaleFile(file,"Visual C++: %d\n",_MSC_FULL_VER);
 #endif