CVS commit: [pkgsrc-2026Q3] pkgsrc/graphics/GraphicsMagick

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Nov  9 08:43:08 UTC 2026

Modified Files:
        pkgsrc/graphics/GraphicsMagick [pkgsrc-2026Q3]: Makefile.common
            distinfo
        pkgsrc/graphics/GraphicsMagick/patches [pkgsrc-2026Q3]: patch-configure

Log Message:
Pullup ticket #7339 - requested by taca
graphics/GraphicsMagick: Security fix

Revisions pulled up:
- graphics/GraphicsMagick/Makefile                              1.162
- graphics/GraphicsMagick/Makefile.common                       1.33
- graphics/GraphicsMagick/distinfo                              1.63
- graphics/GraphicsMagick/patches/patch-configure               1.7

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Mon Oct 26 07:24:18 UTC 2026

   Modified Files:
        pkgsrc/graphics/GraphicsMagick: Makefile Makefile.common distinfo
        pkgsrc/graphics/GraphicsMagick/patches: patch-configure

   Log Message:
   GraphicsMagick: Update to 1.3.49

   This is a security update that fixes two potential arithmetic overflow
   problems.

   Verified to build on NetBSD, FreeBSD, OpenBSD, Linux, Darwin powerpc and
   arm64.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 pkgsrc/graphics/GraphicsMagick/Makefile.common
cvs rdiff -u -r1.62 -r1.62.2.1 pkgsrc/graphics/GraphicsMagick/distinfo
cvs rdiff -u -r1.6 -r1.6.2.1 \
    pkgsrc/graphics/GraphicsMagick/patches/patch-configure

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

Modified files:

Index: pkgsrc/graphics/GraphicsMagick/Makefile.common
diff -u pkgsrc/graphics/GraphicsMagick/Makefile.common:1.32 pkgsrc/graphics/GraphicsMagick/Makefile.common:1.32.2.1
--- pkgsrc/graphics/GraphicsMagick/Makefile.common:1.32 Sat Aug  1 14:28:46 2026
+++ pkgsrc/graphics/GraphicsMagick/Makefile.common      Mon Nov  9 08:43:08 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.32 2026/08/01 14:28:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.32.2.1 2026/11/09 08:43:08 maya Exp $
 #
 # used by graphics/GraphicsMagick/Makefile
 # used by graphics/p5-GraphicsMagick/Makefile
 
 GM_MAJOR_VER=  1.3
-GM_MINOR_VER=  48
+GM_MINOR_VER=  49
 DISTVERSION=   ${GM_MAJOR_VER}.${GM_MINOR_VER}
 DISTNAME=      GraphicsMagick-${DISTVERSION}
 CATEGORIES=    graphics

Index: pkgsrc/graphics/GraphicsMagick/distinfo
diff -u pkgsrc/graphics/GraphicsMagick/distinfo:1.62 pkgsrc/graphics/GraphicsMagick/distinfo:1.62.2.1
--- pkgsrc/graphics/GraphicsMagick/distinfo:1.62        Sat Aug  1 14:28:46 2026
+++ pkgsrc/graphics/GraphicsMagick/distinfo     Mon Nov  9 08:43:08 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.62 2026/08/01 14:28:46 adam Exp $
+$NetBSD: distinfo,v 1.62.2.1 2026/11/09 08:43:08 maya Exp $
 
-BLAKE2s (GraphicsMagick-1.3.48.tar.xz) = dda3feca7968c9ea1fbd9a1459a0b36fe5e50a43149cf8c3f2637a334eeaa7c8
-SHA512 (GraphicsMagick-1.3.48.tar.xz) = baf4f82794628a116b568c2932bb1bf7c36ba89d0cb51fdd0209ad655f05883ae711319e5cc43cce09642aa3fc4b711731be00393f757eeb038440e15cc4437d
-Size (GraphicsMagick-1.3.48.tar.xz) = 6081828 bytes
+BLAKE2s (GraphicsMagick-1.3.49.tar.xz) = 8316966c4b42cfb8f999f97c4131f75ca4211e6a6b67334b2ce505cfe8eeb5c9
+SHA512 (GraphicsMagick-1.3.49.tar.xz) = ad721c9b57fe94a1d46a6d051156c5072d24742d974650c9200877b813d3a36d2154a8c25c40af3d06fb8f91c0fa4688905b52f49f49ea2c87d627bedb101d3a
+Size (GraphicsMagick-1.3.49.tar.xz) = 6136612 bytes
 SHA1 (patch-config_delegates.mgk.in) = 56e90088424d0f07545abdbe355c6ce97e66dd77
-SHA1 (patch-configure) = efe9d38dee7f10457a36e89d7059e4e152a1f39e
+SHA1 (patch-configure) = 53bd87ed60ea1500ec2596c45fdbbce039f89088

Index: pkgsrc/graphics/GraphicsMagick/patches/patch-configure
diff -u pkgsrc/graphics/GraphicsMagick/patches/patch-configure:1.6 pkgsrc/graphics/GraphicsMagick/patches/patch-configure:1.6.2.1
--- pkgsrc/graphics/GraphicsMagick/patches/patch-configure:1.6  Mon Jun 29 12:00:28 2026
+++ pkgsrc/graphics/GraphicsMagick/patches/patch-configure      Mon Nov  9 08:43:08 2026
@@ -1,38 +1,60 @@
-$NetBSD: patch-configure,v 1.6 2026/06/29 12:00:28 adam Exp $
+$NetBSD: patch-configure,v 1.6.2.1 2026/11/09 08:43:08 maya Exp $
 
 Do not save configure args; they reference workdir.
 
---- configure.orig     2026-05-13 14:14:52.000000000 +0000
+--- configure.orig     2026-10-25 21:49:18.802270567 +0000
 +++ configure
-@@ -36236,31 +36236,8 @@ MAGICK_API_LIBS=`echo $MAGICK_API_LIBS |
+@@ -36394,53 +36394,6 @@ MAGICK_API_LIBS=`echo $MAGICK_API_LIBS | sed -e 's/  *
+ MAGICK_API_DEP_LIBS=`echo $MAGICK_API_DEP_LIBS | sed -e 's/  */ /g'`
+ MAGICK_API_LIBS=`echo $MAGICK_API_LIBS | sed -e 's/  */ /g'`
  
- # Save configure/build parameters for later reference
- 
--printf "%s\n" "#define GM_BUILD_CONFIGURE_ARGS \"$0 ${ac_configure_args}\"" >>confdefs.h
- 
- 
--printf "%s\n" "#define GM_BUILD_HOST \"${host}\"" >>confdefs.h
+-# Save configure/build parameters for later reference
 -
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_CONFIGURE_ARGS "$0 ${ac_configure_args}"
+-_ACEOF
 -
--printf "%s\n" "#define GM_BUILD_CC \"${CC}\"" >>confdefs.h
 -
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_HOST "${host}"
+-_ACEOF
 -
--printf "%s\n" "#define GM_BUILD_CXX \"${CXX}\"" >>confdefs.h
 -
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_CC "${CC}"
+-_ACEOF
 -
--printf "%s\n" "#define GM_BUILD_CFLAGS \"${CFLAGS}\"" >>confdefs.h
 -
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_CXX "${CXX}"
+-_ACEOF
 -
--printf "%s\n" "#define GM_BUILD_CPPFLAGS \"${CPPFLAGS}\"" >>confdefs.h
 -
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_CFLAGS "${CFLAGS}"
+-_ACEOF
 -
--printf "%s\n" "#define GM_BUILD_CXXFLAGS \"${CXXFLAGS}\"" >>confdefs.h
 -
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_CPPFLAGS "${CPPFLAGS}"
+-_ACEOF
 -
--printf "%s\n" "#define GM_BUILD_LDFLAGS \"${LDFLAGS}\"" >>confdefs.h
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_CXXFLAGS "${CXXFLAGS}"
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_LDFLAGS "${LDFLAGS}"
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_LIBS "${MAGICK_API_DEP_LIBS}"
+-_ACEOF
 -
 -
--printf "%s\n" "#define GM_BUILD_LIBS \"${MAGICK_API_DEP_LIBS}\"" >>confdefs.h
- 
- 
  # Pass only user-provided LIBS as "global" libraries
+ LIBS=$LIBS_USER
+