CVS commit: pkgsrc/graphics/ImageMagick6

["Robert Bagdan" <kikadf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kikadf
Date:           Mon Aug  4 16:09:34 UTC 2025

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

Log Message:
graphics/ImageMagick6: update to 6.9.13.26

Fix for:
CVE-2025-53014, https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-hm4x-r5hc-794f
CVE-2025-53019, https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-cfh4-9f7v-fhrc
CVE-2025-53101, https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-qh3h-j545-h8c9


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/graphics/ImageMagick6/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/ImageMagick6/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/ImageMagick6/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/ImageMagick6/PLIST.doc
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/ImageMagick6/distinfo
cvs rdiff -u -r1.9 -r1.10 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.79 pkgsrc/graphics/ImageMagick6/Makefile:1.80
--- pkgsrc/graphics/ImageMagick6/Makefile:1.79  Thu Apr 24 14:14:10 2025
+++ pkgsrc/graphics/ImageMagick6/Makefile       Mon Aug  4 16:09:34 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.79 2025/04/24 14:14:10 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2025/08/04 16:09:34 kikadf Exp $
 
-PKGREVISION= 9
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick6-${DISTVERSION}

Index: pkgsrc/graphics/ImageMagick6/Makefile.common
diff -u pkgsrc/graphics/ImageMagick6/Makefile.common:1.19 pkgsrc/graphics/ImageMagick6/Makefile.common:1.20
--- pkgsrc/graphics/ImageMagick6/Makefile.common:1.19   Thu Jan  4 01:32:08 2024
+++ pkgsrc/graphics/ImageMagick6/Makefile.common        Mon Aug  4 16:09:34 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.19 2024/01/04 01:32:08 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.20 2025/08/04 16:09:34 kikadf Exp $
 
 IM_MAJOR_VER=          6.9.13
-IM_MINOR_VER=          3
+IM_MINOR_VER=          26
 IM_MAJOR_LIB_VER=      6
 
 .if (${IM_MINOR_VER} != NONE)

Index: pkgsrc/graphics/ImageMagick6/PLIST
diff -u pkgsrc/graphics/ImageMagick6/PLIST:1.11 pkgsrc/graphics/ImageMagick6/PLIST:1.12
--- pkgsrc/graphics/ImageMagick6/PLIST:1.11     Mon Jan  1 02:15:27 2024
+++ pkgsrc/graphics/ImageMagick6/PLIST  Mon Aug  4 16:09:34 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2024/01/01 02:15:27 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.12 2025/08/04 16:09:34 kikadf Exp $
 bin/Magick++-config6
 bin/Magick-config6
 bin/MagickCore-config6
@@ -180,6 +180,7 @@ share/examples/ImageMagick6/thresholds.x
 share/examples/ImageMagick6/type-apple.xml
 share/examples/ImageMagick6/type-dejavu.xml
 share/examples/ImageMagick6/type-ghostscript.xml
+share/examples/ImageMagick6/type-urw-base35-type1.xml
 share/examples/ImageMagick6/type-urw-base35.xml
 share/examples/ImageMagick6/type-windows.xml
 share/examples/ImageMagick6/type.xml

Index: pkgsrc/graphics/ImageMagick6/PLIST.doc
diff -u pkgsrc/graphics/ImageMagick6/PLIST.doc:1.2 pkgsrc/graphics/ImageMagick6/PLIST.doc:1.3
--- pkgsrc/graphics/ImageMagick6/PLIST.doc:1.2  Sat Jul 22 10:09:06 2023
+++ pkgsrc/graphics/ImageMagick6/PLIST.doc      Mon Aug  4 16:09:34 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.doc,v 1.2 2023/07/22 10:09:06 adam Exp $
+@comment $NetBSD: PLIST.doc,v 1.3 2025/08/04 16:09:34 kikadf Exp $
 man/man1/ImageMagick6.1
 man/man1/Magick++-config6.1
 man/man1/Magick-config6.1
@@ -163,6 +163,7 @@ share/doc/ImageMagick-6/www/Magick++/REA
 share/doc/ImageMagick-6/www/Magick++/STL.html
 share/doc/ImageMagick-6/www/Magick++/TypeMetric.html
 share/doc/ImageMagick-6/www/Magick++/index.html
+share/doc/ImageMagick-6/www/Magick++/logo.png
 share/doc/ImageMagick-6/www/Magick++/magick.css
 share/doc/ImageMagick-6/www/Magick++/montage-sample-framed.jpg
 share/doc/ImageMagick-6/www/Magick++/right_triangle.png
@@ -239,8 +240,9 @@ share/doc/ImageMagick-6/www/api/transfor
 share/doc/ImageMagick-6/www/api/version.html
 share/doc/ImageMagick-6/www/api/wand-view.html
 share/doc/ImageMagick-6/www/architecture.html
-share/doc/ImageMagick-6/www/assets/magick.css
-share/doc/ImageMagick-6/www/assets/magick.js
+share/doc/ImageMagick-6/www/assets/bootstrap.bundle.min.js
+share/doc/ImageMagick-6/www/assets/bootstrap.min.css
+share/doc/ImageMagick-6/www/assets/color-modes.js
 share/doc/ImageMagick-6/www/changelog.html
 share/doc/ImageMagick-6/www/cipher.html
 share/doc/ImageMagick-6/www/cite.html
@@ -294,6 +296,7 @@ share/doc/ImageMagick-6/www/opencl.html
 share/doc/ImageMagick-6/www/openmp.html
 share/doc/ImageMagick-6/www/perl-magick.html
 share/doc/ImageMagick-6/www/porting.html
+share/doc/ImageMagick-6/www/privacy-policy.html
 share/doc/ImageMagick-6/www/quantize.html
 share/doc/ImageMagick-6/www/resources.html
 share/doc/ImageMagick-6/www/search.html

Index: pkgsrc/graphics/ImageMagick6/distinfo
diff -u pkgsrc/graphics/ImageMagick6/distinfo:1.17 pkgsrc/graphics/ImageMagick6/distinfo:1.18
--- pkgsrc/graphics/ImageMagick6/distinfo:1.17  Thu Jan  4 01:32:08 2024
+++ pkgsrc/graphics/ImageMagick6/distinfo       Mon Aug  4 16:09:34 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2024/01/04 01:32:08 gutteridge Exp $
+$NetBSD: distinfo,v 1.18 2025/08/04 16:09:34 kikadf Exp $
 
-BLAKE2s (ImageMagick-6.9.13-3.tar.xz) = eef042b1cc600c0e6549943b3dc7889a59b2d307f8793cd3b795c5ca34daf486
-SHA512 (ImageMagick-6.9.13-3.tar.xz) = 3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
-Size (ImageMagick-6.9.13-3.tar.xz) = 9616088 bytes
+BLAKE2s (ImageMagick-6.9.13-26.tar.xz) = 2ac947683a770470ccff42af75ee171f923eb8ff640ccecd876b305da9c9e3e5
+SHA512 (ImageMagick-6.9.13-26.tar.xz) = 23b563de77c77f354f5c95e4b246964f94313d4e555597ac7f962b9826e3aad98fee0c9f0c5468381c34670aa75d2436f8f97d46bdc8def01b5bdd9adb3c3dbf
+Size (ImageMagick-6.9.13-26.tar.xz) = 9621256 bytes
 SHA1 (patch-Makefile.in) = 8360c4e0903bdbc73dd40f9a466f40996c53ce44

Index: pkgsrc/graphics/ImageMagick6/options.mk
diff -u pkgsrc/graphics/ImageMagick6/options.mk:1.9 pkgsrc/graphics/ImageMagick6/options.mk:1.10
--- pkgsrc/graphics/ImageMagick6/options.mk:1.9 Tue Apr  2 22:37:53 2024
+++ pkgsrc/graphics/ImageMagick6/options.mk     Mon Aug  4 16:09:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2024/04/02 22:37:53 nia Exp $
+# $NetBSD: options.mk,v 1.10 2025/08/04 16:09:34 kikadf Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick6
 PKG_SUPPORTED_OPTIONS=         doc fontconfig ghostscript x11 jp2 djvu openexr
@@ -75,8 +75,8 @@ CONFIGURE_ARGS+=      --with-fpx
 CONFIGURE_ARGS+=       --without-fpx
 .endif
 
-.if !empty(PKG_OPTIONS:Mfpx)
-.include "../../graphics/pango/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mpango)
+.include "../../devel/pango/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-pango
 .else
 CONFIGURE_ARGS+=       --without-pango