CVS commit: pkgsrc/graphics/tiff

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun May 29 12:24:16 UTC 2022

Modified Files:
        pkgsrc/graphics/tiff: Makefile PLIST distinfo
        pkgsrc/graphics/tiff/patches: patch-Makefile.in
Removed Files:
        pkgsrc/graphics/tiff/patches: patch-CVE-2022-0561 patch-CVE-2022-0907
            patch-CVE-2022-0909 patch-CVE-2022-0924 patch-CVE-2022-22844

Log Message:
graphics/tiff: Update to 4.4.0

Upstream does not provide NEWS.  Skimming over 1300 lines of
ChangeLog, this release contains mostly bufixes, speed improvemnents,
and other minor improvements.

This commit drops 5 patches for CVEs.  These patches all appear to
have been taken from the upstream repo.

One CVE remains:
  https://nvd.nist.gov/vuln/detail/CVE-2018-10126
  http://bugzilla.maptools.org/show_bug.cgi?id=2786
  https://gitlab.com/libtiff/libtiff/-/issues/128


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 pkgsrc/graphics/tiff/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/tiff/PLIST
cvs rdiff -u -r1.102 -r1.103 pkgsrc/graphics/tiff/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/tiff/patches/patch-CVE-2022-0561
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/tiff/patches/patch-CVE-2022-0907 \
    pkgsrc/graphics/tiff/patches/patch-CVE-2022-0909 \
    pkgsrc/graphics/tiff/patches/patch-CVE-2022-0924 \
    pkgsrc/graphics/tiff/patches/patch-CVE-2022-22844
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/tiff/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/graphics/tiff/Makefile
diff -u pkgsrc/graphics/tiff/Makefile:1.152 pkgsrc/graphics/tiff/Makefile:1.153
--- pkgsrc/graphics/tiff/Makefile:1.152 Fri Mar 25 09:32:49 2022
+++ pkgsrc/graphics/tiff/Makefile       Sun May 29 12:24:16 2022
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.152 2022/03/25 09:32:49 nia Exp $
+# $NetBSD: Makefile,v 1.153 2022/05/29 12:24:16 gdt Exp $
 
-DISTNAME=      tiff-4.3.0
-PKGREVISION=   2
+VERSION_BASE=  4.4.0
+# Accomodate testing unreleased versions.
+#VERSION_RC=   rc1
+DISTNAME=      tiff-${VERSION_BASE}${VERSION_RC}
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.osgeo.org/libtiff/
 
@@ -10,6 +12,8 @@ HOMEPAGE=     http://simplesystems.org/libti
 COMMENT=       Library and tools for reading and writing TIFF data files
 LICENSE=       mit
 
+WRKSRC=                ${WRKDIR}/tiff-${VERSION_BASE}
+
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
 USE_LANGUAGES=         c c++

Index: pkgsrc/graphics/tiff/PLIST
diff -u pkgsrc/graphics/tiff/PLIST:1.29 pkgsrc/graphics/tiff/PLIST:1.30
--- pkgsrc/graphics/tiff/PLIST:1.29     Tue Apr 20 13:12:54 2021
+++ pkgsrc/graphics/tiff/PLIST  Sun May 29 12:24:16 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2021/04/20 13:12:54 gdt Exp $
+@comment $NetBSD: PLIST,v 1.30 2022/05/29 12:24:16 gdt Exp $
 bin/fax2ps
 bin/fax2tiff
 bin/pal2rgb
@@ -237,4 +237,4 @@ share/doc/tiff/html/v4.0.8.html
 share/doc/tiff/html/v4.0.9.html
 share/doc/tiff/html/v4.1.0.html
 share/doc/tiff/html/v4.2.0.html
-share/doc/tiff/html/v${PKGVERSION}.html
+share/doc/tiff/html/v4.3.0.html

Index: pkgsrc/graphics/tiff/distinfo
diff -u pkgsrc/graphics/tiff/distinfo:1.102 pkgsrc/graphics/tiff/distinfo:1.103
--- pkgsrc/graphics/tiff/distinfo:1.102 Fri Mar 25 09:32:49 2022
+++ pkgsrc/graphics/tiff/distinfo       Sun May 29 12:24:16 2022
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.102 2022/03/25 09:32:49 nia Exp $
+$NetBSD: distinfo,v 1.103 2022/05/29 12:24:16 gdt Exp $
 
-BLAKE2s (tiff-4.3.0.tar.gz) = 28ba59df6d3d7a967dc168645bfc78f047ac8f7f548050abbbd0560f9dd21c75
-SHA512 (tiff-4.3.0.tar.gz) = e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
-Size (tiff-4.3.0.tar.gz) = 2808254 bytes
-SHA1 (patch-CVE-2022-0561) = a40f12dc11d431d6373d7799d1d2664ea3eabee1
-SHA1 (patch-CVE-2022-0907) = 92a50bbba3cd0aa6b0bf3b85ce46d3948d4dd19d
-SHA1 (patch-CVE-2022-0909) = 747db983e9dd0b79860eaaf975f698a129bf044d
-SHA1 (patch-CVE-2022-0924) = 82ecc85556f01e6363694c86465bc20723ac3261
-SHA1 (patch-CVE-2022-22844) = 268d67ea1a24c6078006c37bf5c56b00a6a0183f
-SHA1 (patch-Makefile.in) = de93f4a2cea4bffc117482fdc6875adfb9aa67e0
+BLAKE2s (tiff-4.4.0.tar.gz) = 4d7e2a0dcf15c0c69bcf5f7e9e89f9f381207905ea619f4457ffed17c4b659d0
+SHA512 (tiff-4.4.0.tar.gz) = 78ffab7667d0feb8d38571bc482390fc6dd20b93a798ab3a8b5cc7d5ab00b44a37f67eb8f19421e4ab33ad89ab40e382128f8a4bbdf097e0efb6d9fca5ac6f9e
+Size (tiff-4.4.0.tar.gz) = 2841082 bytes
+SHA1 (patch-Makefile.in) = 96101d4c8208346b4e8778e816a0a7f4e0b03450

Index: pkgsrc/graphics/tiff/patches/patch-Makefile.in
diff -u pkgsrc/graphics/tiff/patches/patch-Makefile.in:1.1 pkgsrc/graphics/tiff/patches/patch-Makefile.in:1.2
--- pkgsrc/graphics/tiff/patches/patch-Makefile.in:1.1  Mon Jun 14 20:45:22 2021
+++ pkgsrc/graphics/tiff/patches/patch-Makefile.in      Sun May 29 12:24:16 2022
@@ -1,14 +1,16 @@
-$NetBSD: patch-Makefile.in,v 1.1 2021/06/14 20:45:22 schmonz Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2022/05/29 12:24:16 gdt Exp $
 
 From MacPorts:
 Rename VERSION to VERSION.txt so that it does not collide with the C++
 version header on case-insensitive filesystems.
 
-<https://gitlab.com/libtiff/libtiff/-/issues/252>
+https://gitlab.com/libtiff/libtiff/-/issues/252
+\todo Upstream has resolved the problem a different way and we should
+likely drop this patch.
 
---- Makefile.in.orig   2021-04-16 10:56:02.000000000 +0000
+--- Makefile.in.orig   2022-05-20 16:11:32.000000000 +0000
 +++ Makefile.in
-@@ -424,7 +424,7 @@ docfiles = \
+@@ -425,7 +425,7 @@ docfiles = \
        README.md \
        RELEASE-DATE \
        TODO \
@@ -16,7 +18,7 @@ version header on case-insensitive files
 +      VERSION.txt
  
  EXTRA_DIST = \
-       cmake \
+       placeholder.h \
 @@ -992,7 +992,7 @@ distcheck-hook:
  
  release: