pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: [pkgsrc-2026Q2] pkgsrc/graphics
Module Name: pkgsrc
Committed By: bsiegert
Date: Mon Jul 13 13:40:53 UTC 2026
Modified Files:
pkgsrc/graphics/GraphicsMagick [pkgsrc-2026Q2]: Makefile
Makefile.common PLIST distinfo
pkgsrc/graphics/GraphicsMagick/patches [pkgsrc-2026Q2]:
patch-config_delegates.mgk.in patch-configure
pkgsrc/graphics/p5-GraphicsMagick [pkgsrc-2026Q2]: Makefile
Removed Files:
pkgsrc/graphics/GraphicsMagick/patches [pkgsrc-2026Q2]:
patch-coders_jxl.c
Log Message:
Pullup ticket #7160 - requested by taca
graphics/GraphicsMagick: security fix
Revisions pulled up:
- graphics/GraphicsMagick/Makefile 1.158
- graphics/GraphicsMagick/Makefile.common 1.31
- graphics/GraphicsMagick/PLIST 1.36-1.37
- graphics/GraphicsMagick/distinfo 1.61
- graphics/GraphicsMagick/patches/patch-coders_jxl.c deleted
- graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in 1.3
- graphics/GraphicsMagick/patches/patch-configure 1.6
- graphics/p5-GraphicsMagick/Makefile 1.88
---
Module Name: pkgsrc
Committed By: adam
Date: Mon Jun 29 12:00:29 UTC 2026
Modified Files:
pkgsrc/graphics/GraphicsMagick: Makefile Makefile.common PLIST distinfo
pkgsrc/graphics/GraphicsMagick/patches: patch-config_delegates.mgk.in
patch-configure
pkgsrc/graphics/p5-GraphicsMagick: Makefile
Removed Files:
pkgsrc/graphics/GraphicsMagick/patches: patch-coders_jxl.c
Log Message:
GraphicsMagick p5-GraphicsMagick: updated to 1.3.47
1.3.47
Security Fixes:
DPX: Fix subsampling validation logic which was failing due to incorrect logic. This avoids a divide by zero possibility.
JNG writer: Properly handle and report the case where ImageToBlob()returns NULL.
MNG writer: Enforce that MNG only supports a color palette up to 256 colors (ImageMagick CVE-2026-28690).
MagickXImageWindowCommand(): Assure that static buffer does not overflow if the user keeps a numeric key depressed (ImageMagick CVE-2026-33535).
PCD: Prevent an out of bounds read (ImageMagick security advisory GHSA-wrhr-rf8j-r842).
PNG writer: Detect and report an excessively large profile, an other unexpected conditions (ImageMagick CVE-2026-30883).
RenderFreetype(): Use MagickConfirmAccess() to verify that font file name is allowed to be read.
TIFF EXIF IFD writer: Detect and prevent infinite looping (EXIF IFD writer code may be excluded by the -DEXPERIMENTAL_EXIF_TAGS=0 define).
TIFF EXIF IFD writer: Only transfer tags from EXIF and GPS IFDs. Do not transfer tags from the main IFDs.
YUV: Fix validation of 'sampling-factor' argument. (ImageMagick CVE-2026-25799). Given that the argument normally comes from a user (rather than an input file) this seems to be a minor security
issue at most.
PS, PS2, PS3: Enforce that width and height dimensions, and total pixels, to/from Ghostscript are within the same limits as specified for GraphicsMagick. This helps avoid Ghostscript-based denial
of service opportunities.
SVG: Add validations for element id syntax. Reject invalid attribute values which contain single quotes.
XCF: Report an error if there are no layers. Fix two unsigned integer overflow cases.
DescribeImage(): Avoid heap write overflow while parsing the image directory.
Bug fixes:
ColorFloodfillImage(): Disable OpenMP since it was observed to create corrupt images.
DCM/DICOM: Fix bit shift for 16-bit short, which corrupted results for some images.
DrawImage(): Fix memory leak which might occur under severe conditions.
Magick++: Use HAVE_PTHREAD to enable thread-safe code. This bug has been present since 2003!
Magick++: If monochrome is disabled, then clear the image is_monochrome flag if it is set.
Magick++: No longer throw a C++ exception from the MutexLock destructor.
JP2: Fix a bug which caused lossless compression to not be engaged by '-define jp2:rate=1.0'.
JPEG: Allow writing CMYK JPEG without specifically requesting it (SourceForge issue 768). This fixes a regression introduced in the last release.
JPEG: For components == 1 (gray), fix reading PseudoClass images.
ModuleAliases: Added a mapping from magick "MPRI" to module "MPR". This missing mapping caused the "MPRI" coder to not work for non-module builds. As a result, the 'mogrify' "hald-clut", "map",
"mask", and "tile" subcommands were not working. Any use of "MPRI:N" syntax to save an image for later (from the command-line or via the APIs) would have failed.
HEIF: Check the return status of heif_image_handle_get_preferred_decoding_colorspace() in order to avoid consuming uninitialized memory. While this might appear to be a security issue, it appears
to be reasonably benign.
Apple PICT: Since the implementation originating from ImageMagick, the rowBytes transition from from byte to short while reading byteCount was 200. However, it should have been 250! See
"https://github.com/ImageMagick/ImageMagick/issues/7837"; for details. The reader and writer have been changed to use 250. This means that PICT files written by the fixed GraphicsMagick will not be
readable by older GraphicsMagick versions (but the fixed GraphicsMagick can read older existing files).
PNM: Improve ASCII formats error checking.
HEIF (HEIC, AVIF, etc.): The identify command was very slow with HEIF, although it always reported accurate information. Now identify is fast but may return wrong results if the image is rotated.
Use '-define heif:ignore-transformations=false' to assure that the values returned are accurate.
TIFF: Be more pessimistic about claims from libtiff and require that it produce a scanline, strip, or tile, before allocating pixels from the pixel cache. This helps prevent small files from using
excessive resources.
Rendering (-draw/MVG): use the resource-limited memory allocator to provide more resource limit control (for primitive info and graphic contexts).
GIF: Store image comment in first image frame rather than the last frame.
Add missing prototypes for some functions and declare some functions as 'static' which were accidentally left visible.
PerlMagick: PerlMagick is now "const correct" and data which could be const is now declared as such.
MAT: Fix memory leaks.
XPM/PICON: Verify that the expected number of pixels were transferred to the image.
SetImageType(): Assure that callers of SetImageType() do check for its failure, and return appropriate status.
API Updates:
Wand API: Added the MagickSetBackgroundColor() function to support setting the default background color.
Drawing API: DrawNewContext(), is a new function to allocate an empty drawing context.
Wand API: The wand/drawing_wand.c functions which duplicate code in magick/draw.c are gutted and replaced with calls into magick/draw.c.
Magick++: Add access confirmation functions and enumerations to Magick namespace so that file/URL access confirmation functions may be used. A sample implementation is included in the 'zoom' demo
program.
New Features:
PNM: Support reading PBM raw (P1), PGM raw (P2), and PPM raw (P3) files which lack a newline character at the end of the last line.
HEIF (HEIC, AVCI, AVIF, MP4, etc.): Memory limits and many more libheif resource limits are now applied/available. Support reading multiple image frames. Support arbitrary image depths up to 16
bits. Deduce file type by consulting libheif. Support reading HEIF image from an in-memory BLOB, or memory mapped file.
HEIF (HEIC, AVCI, AVIF, MP4, etc.): Support both RGB interleaved and planar decode modes at once. Use the heif:interleaved-rgb-decode=yes/no define to select which mode is used.
HEIF (HEIC, AVCI, AVIF, MP4, etc.): Add support for -define heif:tile-threads=number to specify how many tiles may be decoded at once.
The 'convert' and 'mogrify' subcommands now support -remap, which is equivalent to -map. This is to improve compatibility with ImageMagick, which changed from -map to -remap some time after the
GraphicsMagick fork in 2022.
Command arguments which currently accept "Opacity" now accept "Alpha" as a synonym. This is to improve compatibility with ImageMagick
Command arguments which currently accept "CopyOpacity" now accept "CopyAlpha" as a synonym. This is to improve compatibility with ImageMagick.
Resource Limited Memory: Added module, function, and line parameters for the purpose of tracing, and to capture the source location where the allocation was made.
Resource limit for number of simultaneous images: Add an 'ImagesResource' limit and '-limit images' to place a limit on discrete raster images which may be loaded into the program simultaneously.
The resource which is limited is the number of Image pixel cache stores with allocated pixels rather than reference-counted "Image" handles.
WBMP: Support alternate file extensions "WBM" and "WBP".
OSS-Fuzz: The oss-fuzz build script is completely re-written and supports building almost all of the available library dependencies.
TIFF: Added support for LERC compression in TIFF reader and writer, as welll as update Magick++, PerlMagick, and TclMagick to be able to access it.
Behavior Changes:
Apple PICT: Older GraphicsMagick will be unable to read the PICT files that newer versions write, but newer GraphicsMagick can still read files which were written by ImageMagick or GraphicsMagick
in the broken format.
C API: MagickRealloc() now behaves like standard realloc() and the MagickReallocMemory() macro takes responsibility for freeing the original memory upon a reallocation failure.
Rendering (-draw/MVG): The default image canvas color is now the background color (default white), which may be transparent. Previously, the image was always set to opaque.
General Implementation Improvements:
FormatString(): Deprecate FormatString(), and replace all usages with MagickFormatString(), or a suitable equivalent. Code previously depended on many string buffers being allocated with size
'MaxTextExtent' to avoid buffer overflow. The updates result in MagickFormatString() being passed the actual underlying buffer size in most cases (except for when the API design prevents it). This
allows underlying buffer sizes to be optimially-sized, but that has not been done yet.
---
Module Name: pkgsrc
Committed By: adam
Date: Mon Jun 29 12:02:13 UTC 2026
Modified Files:
pkgsrc/graphics/GraphicsMagick: PLIST
Log Message:
GraphicsMagick: better PLIST
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.157.2.1 pkgsrc/graphics/GraphicsMagick/Makefile
cvs rdiff -u -r1.30 -r1.30.22.1 \
pkgsrc/graphics/GraphicsMagick/Makefile.common
cvs rdiff -u -r1.35 -r1.35.16.1 pkgsrc/graphics/GraphicsMagick/PLIST
cvs rdiff -u -r1.60 -r1.60.8.1 pkgsrc/graphics/GraphicsMagick/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/graphics/GraphicsMagick/patches/patch-coders_jxl.c
cvs rdiff -u -r1.2 -r1.2.62.1 \
pkgsrc/graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in
cvs rdiff -u -r1.5 -r1.5.28.1 \
pkgsrc/graphics/GraphicsMagick/patches/patch-configure
cvs rdiff -u -r1.87 -r1.87.2.1 pkgsrc/graphics/p5-GraphicsMagick/Makefile
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
diff -u pkgsrc/graphics/GraphicsMagick/Makefile:1.157 pkgsrc/graphics/GraphicsMagick/Makefile:1.157.2.1
--- pkgsrc/graphics/GraphicsMagick/Makefile:1.157 Thu May 14 16:41:08 2026
+++ pkgsrc/graphics/GraphicsMagick/Makefile Mon Jul 13 13:40:52 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.157 2026/05/14 16:41:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.157.2.1 2026/07/13 13:40:52 bsiegert Exp $
-PKGREVISION= 19
.include "Makefile.common"
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
Index: pkgsrc/graphics/GraphicsMagick/Makefile.common
diff -u pkgsrc/graphics/GraphicsMagick/Makefile.common:1.30 pkgsrc/graphics/GraphicsMagick/Makefile.common:1.30.22.1
--- pkgsrc/graphics/GraphicsMagick/Makefile.common:1.30 Wed Nov 15 13:20:53 2023
+++ pkgsrc/graphics/GraphicsMagick/Makefile.common Mon Jul 13 13:40:52 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.30 2023/11/15 13:20:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.30.22.1 2026/07/13 13:40:52 bsiegert Exp $
#
# used by graphics/GraphicsMagick/Makefile
# used by graphics/p5-GraphicsMagick/Makefile
GM_MAJOR_VER= 1.3
-GM_MINOR_VER= 42
+GM_MINOR_VER= 47
DISTVERSION= ${GM_MAJOR_VER}.${GM_MINOR_VER}
DISTNAME= GraphicsMagick-${DISTVERSION}
CATEGORIES= graphics
Index: pkgsrc/graphics/GraphicsMagick/PLIST
diff -u pkgsrc/graphics/GraphicsMagick/PLIST:1.35 pkgsrc/graphics/GraphicsMagick/PLIST:1.35.16.1
--- pkgsrc/graphics/GraphicsMagick/PLIST:1.35 Sat Sep 7 08:53:57 2024
+++ pkgsrc/graphics/GraphicsMagick/PLIST Mon Jul 13 13:40:52 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2024/09/07 08:53:57 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.35.16.1 2026/07/13 13:40:52 bsiegert Exp $
bin/GraphicsMagick++-config
bin/GraphicsMagick-config
bin/GraphicsMagickWand-config
@@ -89,8 +89,10 @@ include/GraphicsMagick/wand/wand_symbols
lib/${PKGNAME}/config/delegates.mgk
lib/${PKGNAME}/config/type-ghostscript.mgk
lib/${PKGNAME}/config/type-solaris.mgk
+lib/${PKGNAME}/config/type-urw-base35-otf.mgk
lib/${PKGNAME}/config/type-windows.mgk
lib/${PKGNAME}/config/type.mgk
+lib/${PKGNAME}/modules-Q8/coders/aai.la
lib/${PKGNAME}/modules-Q8/coders/art.la
lib/${PKGNAME}/modules-Q8/coders/avs.la
lib/${PKGNAME}/modules-Q8/coders/bmp.la
@@ -252,7 +254,10 @@ share/doc/GraphicsMagick/www/ChangeLog-2
share/doc/GraphicsMagick/www/ChangeLog-2020.html
share/doc/GraphicsMagick/www/ChangeLog-2021.html
share/doc/GraphicsMagick/www/ChangeLog-2022.html
-share/doc/GraphicsMagick/www/Changelog.html
+share/doc/GraphicsMagick/www/ChangeLog-2023.html
+share/doc/GraphicsMagick/www/ChangeLog-2024.html
+share/doc/GraphicsMagick/www/ChangeLog-2025.html
+share/doc/GraphicsMagick/www/ChangeLog.html
share/doc/GraphicsMagick/www/Changes.html
share/doc/GraphicsMagick/www/Copyright.html
share/doc/GraphicsMagick/www/FAQ.html
Index: pkgsrc/graphics/GraphicsMagick/distinfo
diff -u pkgsrc/graphics/GraphicsMagick/distinfo:1.60 pkgsrc/graphics/GraphicsMagick/distinfo:1.60.8.1
--- pkgsrc/graphics/GraphicsMagick/distinfo:1.60 Mon Sep 1 14:55:27 2025
+++ pkgsrc/graphics/GraphicsMagick/distinfo Mon Jul 13 13:40:52 2026
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.60 2025/09/01 14:55:27 kikadf Exp $
+$NetBSD: distinfo,v 1.60.8.1 2026/07/13 13:40:52 bsiegert Exp $
-BLAKE2s (GraphicsMagick-1.3.42.tar.xz) = 0a0fbc4559bc93c98d329819b0cf87611f8e6cc38a02865cbea454df24bb1e0a
-SHA512 (GraphicsMagick-1.3.42.tar.xz) = b512c9c4c06ec60f7d31e140da08f2bc16d492a2dab82778f1b38c074a25340159e59bfbaa30b2997a6fbd10a500ae1bda527e3c3854e4462bcae837e818428a
-Size (GraphicsMagick-1.3.42.tar.xz) = 5553692 bytes
-SHA1 (patch-coders_jxl.c) = fe72e6a52839a55f6f8c56ade0e439f4631d8ef9
-SHA1 (patch-config_delegates.mgk.in) = c52192a35bede530d310688a576ef2181a9f073c
-SHA1 (patch-configure) = 327dcb718ebaf65f2d2c97440c1cc7fdb9e03482
+BLAKE2s (GraphicsMagick-1.3.47.tar.xz) = ccde62fa6ddb0f927a910efbbf640b6bda932af5ca5c8327eaaca6ea19823089
+SHA512 (GraphicsMagick-1.3.47.tar.xz) = 2a353555683f3d0fe5fdaf60d8fce3d6ccc5974b4184bc2140ddb426a833410355fa0bb53fbb5a81c5f1e905200e111a847634328a9f5e61dee9a88df3a42a00
+Size (GraphicsMagick-1.3.47.tar.xz) = 6075948 bytes
+SHA1 (patch-config_delegates.mgk.in) = 56e90088424d0f07545abdbe355c6ce97e66dd77
+SHA1 (patch-configure) = efe9d38dee7f10457a36e89d7059e4e152a1f39e
Index: pkgsrc/graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in
diff -u pkgsrc/graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in:1.2 pkgsrc/graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in:1.2.62.1
--- pkgsrc/graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in:1.2 Tue Nov 20 10:19:29 2018
+++ pkgsrc/graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in Mon Jul 13 13:40:53 2026
@@ -1,17 +1,17 @@
-$NetBSD: patch-config_delegates.mgk.in,v 1.2 2018/11/20 10:19:29 adam Exp $
+$NetBSD: patch-config_delegates.mgk.in,v 1.2.62.1 2026/07/13 13:40:53 bsiegert Exp $
Avoid tools directory in installed file.
---- config/delegates.mgk.in.orig 2018-11-17 16:13:19.000000000 +0000
+--- config/delegates.mgk.in.orig 2025-10-29 15:45:31.000000000 +0000
+++ config/delegates.mgk.in
-@@ -107,8 +107,8 @@
+@@ -119,8 +119,8 @@
<!-- Read color PDF using Poppler's pdftoppm -->
<delegate decode="poppler-color" stealth="True" command='"pdftoppm" "-freetype" "yes" "-rx" "-aa" "yes" "-aaVector" "yes" "72" "-ry" "72" "%s" ">" "%s"' />
-- <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
-- <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
-+ <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && mv -f `basename "%o"` "%o"' />
-+ <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && mv -f `basename "%o"` "%o"' />
+- <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
+- <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
++ <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && mv -f `basename "%o"` "%o"' />
++ <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && mv -f `basename "%o"` "%o"' />
<!-- Read HTML file -->
<delegate decode="htm" command='"@HTMLDecodeDelegate@" -U -o "%o" "%i"' />
<!-- Read HTML file -->
Index: pkgsrc/graphics/GraphicsMagick/patches/patch-configure
diff -u pkgsrc/graphics/GraphicsMagick/patches/patch-configure:1.5 pkgsrc/graphics/GraphicsMagick/patches/patch-configure:1.5.28.1
--- pkgsrc/graphics/GraphicsMagick/patches/patch-configure:1.5 Wed Jan 25 06:40:46 2023
+++ pkgsrc/graphics/GraphicsMagick/patches/patch-configure Mon Jul 13 13:40:53 2026
@@ -1,16 +1,38 @@
-$NetBSD: patch-configure,v 1.5 2023/01/25 06:40:46 adam Exp $
+$NetBSD: patch-configure,v 1.5.28.1 2026/07/13 13:40:53 bsiegert Exp $
Do not save configure args; they reference workdir.
---- configure.orig 2022-12-26 16:56:04.000000000 +0000
+--- configure.orig 2026-05-13 14:14:52.000000000 +0000
+++ configure
-@@ -30779,9 +30779,6 @@ MAGICK_API_LIBS=`echo $MAGICK_API_LIBS |
+@@ -36236,31 +36236,8 @@ MAGICK_API_LIBS=`echo $MAGICK_API_LIBS |
# 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_CONFIGURE_ARGS \"$0 ${ac_configure_args}\"" >>confdefs.h
- cat >>confdefs.h <<_ACEOF
+-printf "%s\n" "#define GM_BUILD_HOST \"${host}\"" >>confdefs.h
+-
+-
+-printf "%s\n" "#define GM_BUILD_CC \"${CC}\"" >>confdefs.h
+-
+-
+-printf "%s\n" "#define GM_BUILD_CXX \"${CXX}\"" >>confdefs.h
+-
+-
+-printf "%s\n" "#define GM_BUILD_CFLAGS \"${CFLAGS}\"" >>confdefs.h
+-
+-
+-printf "%s\n" "#define GM_BUILD_CPPFLAGS \"${CPPFLAGS}\"" >>confdefs.h
+-
+-
+-printf "%s\n" "#define GM_BUILD_CXXFLAGS \"${CXXFLAGS}\"" >>confdefs.h
+-
+-
+-printf "%s\n" "#define GM_BUILD_LDFLAGS \"${LDFLAGS}\"" >>confdefs.h
+-
+-
+-printf "%s\n" "#define GM_BUILD_LIBS \"${MAGICK_API_DEP_LIBS}\"" >>confdefs.h
+
+
+ # Pass only user-provided LIBS as "global" libraries
Index: pkgsrc/graphics/p5-GraphicsMagick/Makefile
diff -u pkgsrc/graphics/p5-GraphicsMagick/Makefile:1.87 pkgsrc/graphics/p5-GraphicsMagick/Makefile:1.87.2.1
--- pkgsrc/graphics/p5-GraphicsMagick/Makefile:1.87 Thu May 14 16:41:15 2026
+++ pkgsrc/graphics/p5-GraphicsMagick/Makefile Mon Jul 13 13:40:53 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.87 2026/05/14 16:41:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.87.2.1 2026/07/13 13:40:53 bsiegert Exp $
-PKGREVISION= 15
.include "../../graphics/GraphicsMagick/Makefile.common"
PKGNAME= p5-GraphicsMagick-${DISTVERSION}
Home |
Main Index |
Thread Index |
Old Index