CVS commit: [pkgsrc-2026Q1] pkgsrc/graphics/png

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu May 21 02:35:18 UTC 2026

Modified Files:
        pkgsrc/graphics/png [pkgsrc-2026Q1]: Makefile distinfo options.mk

Log Message:
Pullup ticket #7122 - requested by taca
graphics/png: Security fix

Revisions pulled up:
- graphics/png/Makefile                                         1.224
- graphics/png/distinfo                                         1.170
- graphics/png/options.mk                                       1.5

---
   Module Name: pkgsrc
   Committed By:        tnn
   Date:                Sun May 17 13:45:31 UTC 2026

   Modified Files:
        pkgsrc/graphics/png: distinfo options.mk

   Log Message:
   png: update apng patch

---
   Module Name: pkgsrc
   Committed By:        tnn
   Date:                Sun May 17 13:50:09 UTC 2026

   Modified Files:
        pkgsrc/graphics/png: Makefile

   Log Message:
   png: bump revision

   (for https://github.com/pnggroup/libpng/security/advisories/GHSA-c4v6-gxrq-6g2x)


To generate a diff of this commit:
cvs rdiff -u -r1.220.2.3 -r1.220.2.4 pkgsrc/graphics/png/Makefile
cvs rdiff -u -r1.166.2.3 -r1.166.2.4 pkgsrc/graphics/png/distinfo
cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/graphics/png/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/png/Makefile
diff -u pkgsrc/graphics/png/Makefile:1.220.2.3 pkgsrc/graphics/png/Makefile:1.220.2.4
--- pkgsrc/graphics/png/Makefile:1.220.2.3      Thu May  7 22:24:04 2026
+++ pkgsrc/graphics/png/Makefile        Thu May 21 02:35:18 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.220.2.3 2026/05/07 22:24:04 maya Exp $
+# $NetBSD: Makefile,v 1.220.2.4 2026/05/21 02:35:18 maya Exp $
 
 DISTNAME=      libpng-1.6.58
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/lib//}
 CATEGORIES=    graphics
 MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=libpng/}

Index: pkgsrc/graphics/png/distinfo
diff -u pkgsrc/graphics/png/distinfo:1.166.2.3 pkgsrc/graphics/png/distinfo:1.166.2.4
--- pkgsrc/graphics/png/distinfo:1.166.2.3      Thu May  7 22:24:04 2026
+++ pkgsrc/graphics/png/distinfo        Thu May 21 02:35:18 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.166.2.3 2026/05/07 22:24:04 maya Exp $
+$NetBSD: distinfo,v 1.166.2.4 2026/05/21 02:35:18 maya Exp $
 
-BLAKE2s (apng-20260116.patch) = b60bc1c57608e79afb87ba55fb152137d1910ba986d6aacad6d600392096b48a
-SHA512 (apng-20260116.patch) = f8de2168a1a8ed546de7eb6c3da993f99139f385ceaf008ecd8dc64869bb86a4cf61b749ee4060fa207a89917ead7c61d35e409ff477b6240e1a7bc141e2de24
-Size (apng-20260116.patch) = 49195 bytes
+BLAKE2s (libpng-1.6.58-apng.patch.gz) = c51ac8a4548215fa387ab451500a8a2b7bc96f3578da03ce3bf54bc35e0bde03
+SHA512 (libpng-1.6.58-apng.patch.gz) = 95a6f5bb7148b5c48dccd73811d7bcf9752a631a7bb4f4856670a7da12a7159581ac1bce1749318343794e0f5cb86972711ba2ec0f523c168f0991fa940687d5
+Size (libpng-1.6.58-apng.patch.gz) = 10671 bytes
 BLAKE2s (libpng-1.6.58.tar.xz) = c53b047d1fe8e03f7414951d234c9b88bb5fa2a9a1d5f6e2ce955e67f936658c
 SHA512 (libpng-1.6.58.tar.xz) = 5937d6409d7ad564c9dba7969c5d39eea8bbc01936f433bf5936c872ec290dea353783f89bded91e124b3b3b15518320097de365acd3b0bcc922a0e90c94adc8
 Size (libpng-1.6.58.tar.xz) = 1070096 bytes

Index: pkgsrc/graphics/png/options.mk
diff -u pkgsrc/graphics/png/options.mk:1.4 pkgsrc/graphics/png/options.mk:1.4.2.1
--- pkgsrc/graphics/png/options.mk:1.4  Wed Jan 21 09:18:19 2026
+++ pkgsrc/graphics/png/options.mk      Thu May 21 02:35:18 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2026/01/21 09:18:19 tnn Exp $
+# $NetBSD: options.mk,v 1.4.2.1 2026/05/21 02:35:18 maya Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.png
 PKG_SUPPORTED_OPTIONS= apng
@@ -7,9 +7,9 @@ PKG_SUGGESTED_OPTIONS=  # do not suggest 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mapng) || make(distinfo) || make(mdi)
-APNGPATCHVERSION=              20260116
-APNGPATCH=                     apng-${APNGPATCHVERSION}.patch
+APNGPATCHVERSION=              1.6.58
+APNGPATCH=                     libpng-${APNGPATCHVERSION}-apng.patch.gz
 PATCHFILES+=                   ${APNGPATCH}
-SITES.${APNGPATCH}=            -https://hg-edge.mozilla.org/mozilla-central/raw-file/d19a323e9b878d874ee71f46f4277c68e69b7822/media/libpng/apng.patch
+SITES.${APNGPATCH}=            ${MASTER_SITE_SOURCEFORGE:=libpng-apng/libpng16/${APNGPATCHVERSION}/}
 PATCH_DIST_STRIP.${APNGPATCH}= -p1
 .endif