CVS commit: pkgsrc/graphics/giflib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 12 18:29:17 UTC 2026

Modified Files:
        pkgsrc/graphics/giflib: Makefile Makefile.common distinfo
Added Files:
        pkgsrc/graphics/giflib/patches: patch-tests_makefile

Log Message:
giflib: update to 6.1.3.

* Fix SF bugs #194, #195, #196, #197: these were in the gif_fiont.c
  code, which is a historical relic not affecting general library clients.

* Fix SF bug #193, double free on malicious GIF when built with reallocarray.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/graphics/giflib/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/giflib/Makefile.common
cvs rdiff -u -r1.32 -r1.33 pkgsrc/graphics/giflib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/giflib/patches/patch-tests_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/giflib/Makefile
diff -u pkgsrc/graphics/giflib/Makefile:1.61 pkgsrc/graphics/giflib/Makefile:1.62
--- pkgsrc/graphics/giflib/Makefile:1.61        Tue Mar 10 20:40:57 2026
+++ pkgsrc/graphics/giflib/Makefile     Sun Apr 12 18:29:17 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2026/03/10 20:40:57 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2026/04/12 18:29:17 wiz Exp $
 
 .include "Makefile.common"
 
@@ -6,13 +6,12 @@ COMMENT=      GIF image format library
 
 CONFLICTS+=    libungif-[0-9]*
 
-# clang: error: no such file or directory: 'dgif_lib.o'
-# clang: error: no such file or directory: 'egif_lib.o'
-#MAKE_JOBS_SAFE=               no
-
 INSTALL_TARGET=                install-include
 INSTALL_TARGET+=       install-lib
 
-TEST_TARGET=           check
+# needs tools
+TEST_TARGET=           gifbuild gifecho giffilter gifinto gifsponge giftext giftool gifwedge check
+# as of 6.1.3
+# 51 tests, 9 failures.
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/giflib/Makefile.common
diff -u pkgsrc/graphics/giflib/Makefile.common:1.17 pkgsrc/graphics/giflib/Makefile.common:1.18
--- pkgsrc/graphics/giflib/Makefile.common:1.17 Tue Mar 10 20:40:57 2026
+++ pkgsrc/graphics/giflib/Makefile.common      Sun Apr 12 18:29:17 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.17 2026/03/10 20:40:57 wiz Exp $
+# $NetBSD: Makefile.common,v 1.18 2026/04/12 18:29:17 wiz Exp $
 # used by graphics/giflib/Makefile
 # used by graphics/giflib-util/Makefile
 
-DISTNAME=      giflib-6.1.2
+DISTNAME=      giflib-6.1.3
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=giflib/}
 

Index: pkgsrc/graphics/giflib/distinfo
diff -u pkgsrc/graphics/giflib/distinfo:1.32 pkgsrc/graphics/giflib/distinfo:1.33
--- pkgsrc/graphics/giflib/distinfo:1.32        Tue Mar 10 20:40:57 2026
+++ pkgsrc/graphics/giflib/distinfo     Sun Apr 12 18:29:17 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.32 2026/03/10 20:40:57 wiz Exp $
+$NetBSD: distinfo,v 1.33 2026/04/12 18:29:17 wiz Exp $
 
-BLAKE2s (giflib-6.1.2.tar.gz) = 4a11ffb04a0e4b68025385a55e5d96141349612c91444b66152f8b9fba045004
-SHA512 (giflib-6.1.2.tar.gz) = 523cf2a9941c6ddb903bf5ec22ecbf5a283c9470c1c85229360ab4137227a9e4a64b799e3ff0ca1f9f3b9de0fafe197a43fccd3c043239e76561f7b5ede59193
-Size (giflib-6.1.2.tar.gz) = 469032 bytes
+BLAKE2s (giflib-6.1.3.tar.gz) = 7f203040568182e0dd0660f7775af295df02baa389c2b12b91c1578af78c92ef
+SHA512 (giflib-6.1.3.tar.gz) = fb1d6319694745e8cdac7c57e96bd3a87dbfd978f2bfd00e826742db53398011c43f9a6e7f4375b0e77b162358ddfa14d85bce652680fb5967b72c46775c0edb
+Size (giflib-6.1.3.tar.gz) = 470579 bytes
 SHA1 (patch-Makefile) = 6f702c821b4da37ce126a6c896ac1b75884f09b6
+SHA1 (patch-tests_makefile) = 6b143b612ae0b8b8425b470523f5765f3e110d7f

Added files:

Index: pkgsrc/graphics/giflib/patches/patch-tests_makefile
diff -u /dev/null pkgsrc/graphics/giflib/patches/patch-tests_makefile:1.1
--- /dev/null   Sun Apr 12 18:29:17 2026
+++ pkgsrc/graphics/giflib/patches/patch-tests_makefile Sun Apr 12 18:29:17 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-tests_makefile,v 1.1 2026/04/12 18:29:17 wiz Exp $
+
+NetBSD's head(1) does not support --bytes, nor negative arguments to -c.
+
+--- tests/makefile.orig        2026-04-12 18:24:32.471859148 +0000
++++ tests/makefile
+@@ -106,9 +106,9 @@ giffix-rebuild:
+ 
+ giffix-rebuild:
+       @echo "Rebuilding giffix test."
+-      @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico
++      @head -c 387 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico
+ giffix-regress:
+-      @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | ./tapdiffer "giffix: Testing giffix behavior" giffixed.ico
++      @head -c 387 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | ./tapdiffer "giffix: Testing giffix behavior" giffixed.ico
+ 
+ gifinto-regress:
+       @rm -f $@.giflib.tmp