CVS commit: pkgsrc/graphics/ImageMagick6

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Jan  1 02:15:27 UTC 2024

Modified Files:
        pkgsrc/graphics/ImageMagick6: Makefile PLIST options.mk

Log Message:
ImageMagick6: reflect security policy options

As noted by wiz@, since this package now offers different security
policy configuration files, we should reflect this choice, as we already
do with ImageMagick(7). To borrow from wiz@'s earlier commit message:

Add options for the security policies. Follow upstream for the default.
This can be changed after installation by copying the appropriate config
file to etc/ImageMagick-6/policy.xml.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/graphics/ImageMagick6/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/ImageMagick6/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/ImageMagick6/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.66 pkgsrc/graphics/ImageMagick6/Makefile:1.67
--- pkgsrc/graphics/ImageMagick6/Makefile:1.66  Sun Dec 31 20:40:31 2023
+++ pkgsrc/graphics/ImageMagick6/Makefile       Mon Jan  1 02:15:27 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2023/12/31 20:40:31 gutteridge Exp $
+# $NetBSD: Makefile,v 1.67 2024/01/01 02:15:27 gutteridge Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick6-${DISTVERSION}
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Package for display and interactive manipulation of images
@@ -62,13 +63,12 @@ CFLAGS+=            -O
 
 PKG_SYSCONFSUBDIR=     ImageMagick-${IM_MAJOR_LIB_VER}
 EGDIR=                 ${PREFIX}/share/examples/ImageMagick6
-CONF_FILES=            ${EGDIR}/coder.xml ${PKG_SYSCONFDIR}/coder.xml
+CONF_FILES+=           ${EGDIR}/coder.xml ${PKG_SYSCONFDIR}/coder.xml
 CONF_FILES+=           ${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml
 CONF_FILES+=           ${EGDIR}/delegates.xml ${PKG_SYSCONFDIR}/delegates.xml
 CONF_FILES+=           ${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml
 CONF_FILES+=           ${EGDIR}/magic.xml ${PKG_SYSCONFDIR}/magic.xml
 CONF_FILES+=           ${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml
-CONF_FILES+=           ${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml
 CONF_FILES+=           ${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml
 CONF_FILES+=           ${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml
 CONF_FILES+=           ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml
@@ -98,6 +98,9 @@ CTF_FILES_SKIP+=      lib/libMagickCore-6.Q16
 CTF_FILES_SKIP+=       lib/libMagickWand-6.Q16.so.5.0.0
 CTF_FILES_SKIP+=       lib/libMagickCore-6.Q16.so.*    # CPU limit exceeded
 
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/config/policy*xml ${DESTDIR}${EGDIR}
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"

Index: pkgsrc/graphics/ImageMagick6/PLIST
diff -u pkgsrc/graphics/ImageMagick6/PLIST:1.10 pkgsrc/graphics/ImageMagick6/PLIST:1.11
--- pkgsrc/graphics/ImageMagick6/PLIST:1.10     Sun Dec 31 20:40:31 2023
+++ pkgsrc/graphics/ImageMagick6/PLIST  Mon Jan  1 02:15:27 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2023/12/31 20:40:31 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.11 2024/01/01 02:15:27 gutteridge Exp $
 bin/Magick++-config6
 bin/Magick-config6
 bin/MagickCore-config6
@@ -170,6 +170,10 @@ share/examples/ImageMagick6/delegates.xm
 share/examples/ImageMagick6/log.xml
 share/examples/ImageMagick6/magic.xml
 share/examples/ImageMagick6/mime.xml
+share/examples/ImageMagick6/policy-limited.xml
+share/examples/ImageMagick6/policy-open.xml
+share/examples/ImageMagick6/policy-secure.xml
+share/examples/ImageMagick6/policy-websafe.xml
 share/examples/ImageMagick6/policy.xml
 share/examples/ImageMagick6/quantization-table.xml
 share/examples/ImageMagick6/thresholds.xml

Index: pkgsrc/graphics/ImageMagick6/options.mk
diff -u pkgsrc/graphics/ImageMagick6/options.mk:1.7 pkgsrc/graphics/ImageMagick6/options.mk:1.8
--- pkgsrc/graphics/ImageMagick6/options.mk:1.7 Thu Dec 21 02:27:26 2023
+++ pkgsrc/graphics/ImageMagick6/options.mk     Mon Jan  1 02:15:27 2024
@@ -1,9 +1,11 @@
-# $NetBSD: options.mk,v 1.7 2023/12/21 02:27:26 charlotte Exp $
+# $NetBSD: options.mk,v 1.8 2024/01/01 02:15:27 gutteridge Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick6
 PKG_SUPPORTED_OPTIONS=         doc fontconfig ghostscript x11 jp2 djvu openexr
 PKG_SUPPORTED_OPTIONS+=                wmf fpx
-PKG_SUGGESTED_OPTIONS=         doc fontconfig ghostscript x11 jp2
+PKG_OPTIONS_REQUIRED_GROUPS=   policy
+PKG_OPTIONS_GROUP.policy=      imagemagick-policy-limited imagemagick-policy-open imagemagick-policy-secure imagemagick-policy-websafe
+PKG_SUGGESTED_OPTIONS=         doc fontconfig ghostscript x11 jp2 imagemagick-policy-open
 PKG_OPTIONS_LEGACY_OPTS+=      jasper:jp2
 
 .include "../../mk/bsd.options.mk"
@@ -72,3 +74,16 @@ CONFIGURE_ARGS+=     --with-fpx
 .else
 CONFIGURE_ARGS+=       --without-fpx
 .endif
+
+.if !empty(PKG_OPTIONS:Mimagemagick-policy-limited)
+CONF_FILES+=           ${EGDIR}/policy-limited.xml ${PKG_SYSCONFDIR}/policy.xml
+.endif
+.if !empty(PKG_OPTIONS:Mimagemagick-policy-open)
+CONF_FILES+=           ${EGDIR}/policy-open.xml ${PKG_SYSCONFDIR}/policy.xml
+.endif
+.if !empty(PKG_OPTIONS:Mimagemagick-policy-secure)
+CONF_FILES+=           ${EGDIR}/policy-secure.xml ${PKG_SYSCONFDIR}/policy.xml
+.endif
+.if !empty(PKG_OPTIONS:Mimagemagick-policy-websafe)
+CONF_FILES+=           ${EGDIR}/policy-websafe.xml ${PKG_SYSCONFDIR}/policy.xml
+.endif