pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ImageMagick6: update to 6.9.13.26



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Sun Aug 3 17:57:25 2025 +0200
Changeset:	f5c4d111974e58a6588da90e2207cbd75256eea6

Modified Files:
	ImageMagick6/Makefile
	ImageMagick6/Makefile.common
	ImageMagick6/PLIST
	ImageMagick6/PLIST.doc
	ImageMagick6/distinfo
	ImageMagick6/options.mk
Added Files:
	ImageMagick6/COMMIT_MSG

Log Message:
ImageMagick6: update to 6.9.13.26

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f5c4d111974e58a6588da90e2207cbd75256eea6

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

diffstat:
 ImageMagick6/COMMIT_MSG      | 6 ++++++
 ImageMagick6/Makefile        | 1 -
 ImageMagick6/Makefile.common | 2 +-
 ImageMagick6/PLIST           | 1 +
 ImageMagick6/PLIST.doc       | 7 +++++--
 ImageMagick6/distinfo        | 6 +++---
 ImageMagick6/options.mk      | 4 ++--
 7 files changed, 18 insertions(+), 9 deletions(-)

diffs:
diff --git a/ImageMagick6/COMMIT_MSG b/ImageMagick6/COMMIT_MSG
new file mode 100644
index 0000000000..719388d657
--- /dev/null
+++ b/ImageMagick6/COMMIT_MSG
@@ -0,0 +1,6 @@
+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
diff --git a/ImageMagick6/Makefile b/ImageMagick6/Makefile
index 696fc609ff..273e3b0a78 100644
--- a/ImageMagick6/Makefile
+++ b/ImageMagick6/Makefile
@@ -1,6 +1,5 @@
 # $NetBSD: Makefile,v 1.79 2025/04/24 14:14:10 wiz Exp $
 
-PKGREVISION= 9
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick6-${DISTVERSION}
diff --git a/ImageMagick6/Makefile.common b/ImageMagick6/Makefile.common
index 02128443c6..ec3a9b126c 100644
--- a/ImageMagick6/Makefile.common
+++ b/ImageMagick6/Makefile.common
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.19 2024/01/04 01:32:08 gutteridge 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)
diff --git a/ImageMagick6/PLIST b/ImageMagick6/PLIST
index f6d674ad84..3a45061170 100644
--- a/ImageMagick6/PLIST
+++ b/ImageMagick6/PLIST
@@ -180,6 +180,7 @@ share/examples/ImageMagick6/thresholds.xml
 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
diff --git a/ImageMagick6/PLIST.doc b/ImageMagick6/PLIST.doc
index e057f35edf..2e9044483d 100644
--- a/ImageMagick6/PLIST.doc
+++ b/ImageMagick6/PLIST.doc
@@ -163,6 +163,7 @@ share/doc/ImageMagick-6/www/Magick++/README.txt
 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/transform.html
 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
diff --git a/ImageMagick6/distinfo b/ImageMagick6/distinfo
index a6b4050e24..d39394fc7c 100644
--- a/ImageMagick6/distinfo
+++ b/ImageMagick6/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.17 2024/01/04 01:32:08 gutteridge 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
diff --git a/ImageMagick6/options.mk b/ImageMagick6/options.mk
index 956969daf3..a5947bab4d 100644
--- a/ImageMagick6/options.mk
+++ b/ImageMagick6/options.mk
@@ -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


Home | Main Index | Thread Index | Old Index