CVS commit: pkgsrc/graphics/tiff

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Sep 18 11:39:36 UTC 2024

Modified Files:
        pkgsrc/graphics/tiff: Makefile PLIST distinfo options.mk

Log Message:
geography/tiff: Update to 4.7.0

Packaging changes:

  - drop option to enable unsupported tools, because now they are
    enabled again

Major changes

  This version restores in the default build the availability of the
  tools that had been dropped in v4.6.0 (cf RFC 2: Restoring Needed
  LibTIFF Tools)

Library changes

  New/improved functionalities:

    Add TIFFOpenOptionsSetMaxCumulatedMemAlloc(). This function
    complements TIFFOpenOptionsSetMaxSingleMemAlloc() to define the
    maximum cumulated memory allocations in byte, for a given TIFF
    handle, that libtiff internal memory allocation functions are
    allowed.

API/ABI breaks:

    None


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 pkgsrc/graphics/tiff/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/tiff/PLIST
cvs rdiff -u -r1.107 -r1.108 pkgsrc/graphics/tiff/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/tiff/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/tiff/Makefile
diff -u pkgsrc/graphics/tiff/Makefile:1.165 pkgsrc/graphics/tiff/Makefile:1.166
--- pkgsrc/graphics/tiff/Makefile:1.165 Sun Dec 17 17:56:37 2023
+++ pkgsrc/graphics/tiff/Makefile       Wed Sep 18 11:39:36 2024
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.165 2023/12/17 17:56:37 wiz Exp $
+# $NetBSD: Makefile,v 1.166 2024/09/18 11:39:36 gdt Exp $
 
-VERSION_BASE=  4.6.0
+VERSION_BASE=  4.7.0
 # Accomodate testing unreleased versions.
-#VERSION_RC=   rc3
-PKGREVISION=   3
+VERSION_RC=
 DISTNAME=      tiff-${VERSION_BASE}${VERSION_RC}
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.osgeo.org/libtiff/
@@ -32,6 +31,7 @@ CONFIGURE_ARGS+=      --disable-zstd
 
 PKGCONFIG_OVERRIDE=    libtiff-4.pc.in
 
+# NetBSD 10 amd64: pass except 4 cases, because it uses non-POSIX diff -Z
 TEST_TARGET=           check
 
 post-install:

Index: pkgsrc/graphics/tiff/PLIST
diff -u pkgsrc/graphics/tiff/PLIST:1.34 pkgsrc/graphics/tiff/PLIST:1.35
--- pkgsrc/graphics/tiff/PLIST:1.34     Mon Feb 12 13:13:07 2024
+++ pkgsrc/graphics/tiff/PLIST  Wed Sep 18 11:39:36 2024
@@ -1,9 +1,20 @@
-@comment $NetBSD: PLIST,v 1.34 2024/02/12 13:13:07 gdt Exp $
-${PLIST.unsupported}bin/tiff2pdf
-${PLIST.unsupported}bin/tiff2ps
+@comment $NetBSD: PLIST,v 1.35 2024/09/18 11:39:36 gdt Exp $
+bin/fax2ps
+bin/fax2tiff
+bin/pal2rgb
+bin/ppm2tiff
+bin/raw2tiff
+bin/tiff2bw
+bin/tiff2pdf
+bin/tiff2ps
+bin/tiff2rgba
+bin/tiffcmp
 bin/tiffcp
+bin/tiffcrop
+bin/tiffdither
 bin/tiffdump
 bin/tiffinfo
+bin/tiffmedian
 bin/tiffset
 bin/tiffsplit
 include/tiff.h
@@ -14,9 +25,25 @@ include/tiffvers.h
 lib/libtiff.la
 lib/libtiffxx.la
 lib/pkgconfig/libtiff-4.pc
+man/man1/fax2ps.1
+man/man1/fax2tiff.1
+man/man1/pal2rgb.1
+man/man1/ppm2tiff.1
+man/man1/raw2tiff.1
+man/man1/rgb2ycbcr.1
+man/man1/thumbnail.1
+man/man1/tiff2bw.1
+man/man1/tiff2pdf.1
+man/man1/tiff2ps.1
+man/man1/tiff2rgba.1
+man/man1/tiffcmp.1
 man/man1/tiffcp.1
+man/man1/tiffcrop.1
+man/man1/tiffdither.1
 man/man1/tiffdump.1
+man/man1/tiffgt.1
 man/man1/tiffinfo.1
+man/man1/tiffmedian.1
 man/man1/tiffset.1
 man/man1/tiffsplit.1
 man/man3/TIFFAccessTagMethods.3
@@ -171,6 +198,7 @@ share/doc/tiff/manual/_sources/project/b
 share/doc/tiff/manual/_sources/project/index.rst.txt
 share/doc/tiff/manual/_sources/project/license.rst.txt
 share/doc/tiff/manual/_sources/project/mailinglist.rst.txt
+share/doc/tiff/manual/_sources/project/psc.rst.txt
 share/doc/tiff/manual/_sources/releases/historical.rst.txt
 share/doc/tiff/manual/_sources/releases/index.rst.txt
 share/doc/tiff/manual/_sources/releases/v3.4beta007.rst.txt
@@ -230,7 +258,11 @@ share/doc/tiff/manual/_sources/releases/
 share/doc/tiff/manual/_sources/releases/v4.4.0.rst.txt
 share/doc/tiff/manual/_sources/releases/v4.5.0.rst.txt
 share/doc/tiff/manual/_sources/releases/v4.5.1.rst.txt
-share/doc/tiff/manual/_sources/releases/v${PKGVERSION}.rst.txt
+share/doc/tiff/manual/_sources/releases/v4.6.0.rst.txt
+share/doc/tiff/manual/_sources/releases/v4.7.0.rst.txt
+share/doc/tiff/manual/_sources/rfcs/index.rst.txt
+share/doc/tiff/manual/_sources/rfcs/rfc1_psc.rst.txt
+share/doc/tiff/manual/_sources/rfcs/rfc2_restoring_needed_tools.rst.txt
 share/doc/tiff/manual/_sources/specification/bigtiff.rst.txt
 share/doc/tiff/manual/_sources/specification/coverage-bigtiff.rst.txt
 share/doc/tiff/manual/_sources/specification/coverage.rst.txt
@@ -238,9 +270,25 @@ share/doc/tiff/manual/_sources/specifica
 share/doc/tiff/manual/_sources/specification/technote2.rst.txt
 share/doc/tiff/manual/_sources/terms.rst.txt
 share/doc/tiff/manual/_sources/tools.rst.txt
+share/doc/tiff/manual/_sources/tools/fax2ps.rst.txt
+share/doc/tiff/manual/_sources/tools/fax2tiff.rst.txt
+share/doc/tiff/manual/_sources/tools/pal2rgb.rst.txt
+share/doc/tiff/manual/_sources/tools/ppm2tiff.rst.txt
+share/doc/tiff/manual/_sources/tools/raw2tiff.rst.txt
+share/doc/tiff/manual/_sources/tools/rgb2ycbcr.rst.txt
+share/doc/tiff/manual/_sources/tools/thumbnail.rst.txt
+share/doc/tiff/manual/_sources/tools/tiff2bw.rst.txt
+share/doc/tiff/manual/_sources/tools/tiff2pdf.rst.txt
+share/doc/tiff/manual/_sources/tools/tiff2ps.rst.txt
+share/doc/tiff/manual/_sources/tools/tiff2rgba.rst.txt
+share/doc/tiff/manual/_sources/tools/tiffcmp.rst.txt
 share/doc/tiff/manual/_sources/tools/tiffcp.rst.txt
+share/doc/tiff/manual/_sources/tools/tiffcrop.rst.txt
+share/doc/tiff/manual/_sources/tools/tiffdither.rst.txt
 share/doc/tiff/manual/_sources/tools/tiffdump.rst.txt
+share/doc/tiff/manual/_sources/tools/tiffgt.rst.txt
 share/doc/tiff/manual/_sources/tools/tiffinfo.rst.txt
+share/doc/tiff/manual/_sources/tools/tiffmedian.rst.txt
 share/doc/tiff/manual/_sources/tools/tiffset.rst.txt
 share/doc/tiff/manual/_sources/tools/tiffsplit.rst.txt
 share/doc/tiff/manual/_static/basic.css
@@ -331,6 +379,7 @@ share/doc/tiff/manual/project/bugs.html
 share/doc/tiff/manual/project/index.html
 share/doc/tiff/manual/project/license.html
 share/doc/tiff/manual/project/mailinglist.html
+share/doc/tiff/manual/project/psc.html
 share/doc/tiff/manual/releases/historical.html
 share/doc/tiff/manual/releases/index.html
 share/doc/tiff/manual/releases/v3.4beta007.html
@@ -390,7 +439,11 @@ share/doc/tiff/manual/releases/v4.3.0.ht
 share/doc/tiff/manual/releases/v4.4.0.html
 share/doc/tiff/manual/releases/v4.5.0.html
 share/doc/tiff/manual/releases/v4.5.1.html
-share/doc/tiff/manual/releases/v${PKGVERSION}.html
+share/doc/tiff/manual/releases/v4.6.0.html
+share/doc/tiff/manual/releases/v4.7.0.html
+share/doc/tiff/manual/rfcs/index.html
+share/doc/tiff/manual/rfcs/rfc1_psc.html
+share/doc/tiff/manual/rfcs/rfc2_restoring_needed_tools.html
 share/doc/tiff/manual/search.html
 share/doc/tiff/manual/searchindex.js
 share/doc/tiff/manual/specification/bigtiff.html
@@ -400,8 +453,24 @@ share/doc/tiff/manual/specification/inde
 share/doc/tiff/manual/specification/technote2.html
 share/doc/tiff/manual/terms.html
 share/doc/tiff/manual/tools.html
+share/doc/tiff/manual/tools/fax2ps.html
+share/doc/tiff/manual/tools/fax2tiff.html
+share/doc/tiff/manual/tools/pal2rgb.html
+share/doc/tiff/manual/tools/ppm2tiff.html
+share/doc/tiff/manual/tools/raw2tiff.html
+share/doc/tiff/manual/tools/rgb2ycbcr.html
+share/doc/tiff/manual/tools/thumbnail.html
+share/doc/tiff/manual/tools/tiff2bw.html
+share/doc/tiff/manual/tools/tiff2pdf.html
+share/doc/tiff/manual/tools/tiff2ps.html
+share/doc/tiff/manual/tools/tiff2rgba.html
+share/doc/tiff/manual/tools/tiffcmp.html
 share/doc/tiff/manual/tools/tiffcp.html
+share/doc/tiff/manual/tools/tiffcrop.html
+share/doc/tiff/manual/tools/tiffdither.html
 share/doc/tiff/manual/tools/tiffdump.html
+share/doc/tiff/manual/tools/tiffgt.html
 share/doc/tiff/manual/tools/tiffinfo.html
+share/doc/tiff/manual/tools/tiffmedian.html
 share/doc/tiff/manual/tools/tiffset.html
 share/doc/tiff/manual/tools/tiffsplit.html

Index: pkgsrc/graphics/tiff/distinfo
diff -u pkgsrc/graphics/tiff/distinfo:1.107 pkgsrc/graphics/tiff/distinfo:1.108
--- pkgsrc/graphics/tiff/distinfo:1.107 Mon Oct 16 15:38:19 2023
+++ pkgsrc/graphics/tiff/distinfo       Wed Sep 18 11:39:36 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.107 2023/10/16 15:38:19 gdt Exp $
+$NetBSD: distinfo,v 1.108 2024/09/18 11:39:36 gdt Exp $
 
-BLAKE2s (tiff-4.6.0.tar.gz) = 6bbdc12df52352509c6e5982c0afe737715443d42f1efc8990411deb7d3afe5f
-SHA512 (tiff-4.6.0.tar.gz) = 80a117780fe5e2519b5c6661efa90a8a1e4591eb6300068b611ff9887285641c0782d9835482f589d6d109c3be6ffab8831c3561bb40e2456258deb1e896f08e
-Size (tiff-4.6.0.tar.gz) = 3584534 bytes
+BLAKE2s (tiff-4.7.0.tar.gz) = 6daf895aab5da61e4d9058a39659ec629a4172794938e5c42b70a457ba2be691
+SHA512 (tiff-4.7.0.tar.gz) = a77a050d1d8777c6d86077c3c26e8d35f98717fe14bb3c049e2b82fbfbb374e96f83a0c1ff67ffb21591a9a7abf0d3e18c3d7695c96939326cc19a9712dd2492
+Size (tiff-4.7.0.tar.gz) = 3896583 bytes
 SHA1 (patch-configure) = 48c3f6103e35049e0bd4a5f32a508cd9439c1f3f

Index: pkgsrc/graphics/tiff/options.mk
diff -u pkgsrc/graphics/tiff/options.mk:1.3 pkgsrc/graphics/tiff/options.mk:1.4
--- pkgsrc/graphics/tiff/options.mk:1.3 Mon Feb 12 13:13:07 2024
+++ pkgsrc/graphics/tiff/options.mk     Wed Sep 18 11:39:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2024/02/12 13:13:07 gdt Exp $
+# $NetBSD: options.mk,v 1.4 2024/09/18 11:39:36 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tiff
-PKG_SUPPORTED_OPTIONS= lzw tiff-unsupported
+PKG_SUPPORTED_OPTIONS= lzw
 PKG_SUGGESTED_OPTIONS= lzw
 
 .include "../../mk/bsd.options.mk"
@@ -14,40 +14,3 @@ CONFIGURE_ARGS+=     --enable-lzw
 .else
 CONFIGURE_ARGS+=       --disable-lzw
 .endif
-
-###
-### Unsupported tools
-###
-
-# Upstream has withdrawn many command-line tools.  Most have been
-# removed from the distfile.  tiff2ps and tiff2pdf are present but are
-# not built by default.  Upstream notes:
-#
-#   Starting with libtiff v4.6.0, the source code for most TIFF tools
-#   (except tiffinfo, tiffdump, tiffcp and tiffset) was discontinued,
-#   due to the lack of contributors able to address reported security
-#   issues. tiff2ps and tiff2pdf source code has been moved in a
-#   unsupported category, no longer built by default, but are still
-#   part of the the source distribution.  Other retired utilities are
-#   in a archive/ directory, only available in the libtiff git
-#   repository. Issues related to unsupported and archived tools will
-#   no longer be accepted in the libtiff bug tracker.
-#
-# Therefore, any depending package or workflow that uses tiff2ps or
-# tiffp2df is now buggy and should be fixed.  This option exists to
-# make it easier for people to accommodate those packages/workflows
-# until the problems are resolved.  Currently, the only known such
-# package is hylafax.
-#
-# This option is subject to removal if its presence causes any
-# trouble.
-
-PLIST_VARS+=           unsupported
-
-.if !empty(PKG_OPTIONS:Mtiff-unsupported)
-CONFIGURE_ARGS+=       --enable-tools-unsupported
-PLIST.unsupported=      yes
-
-WARNINGS+=     "Unsupported tools built:  Additional vulnerabilities are likely."
-WARNINGS+=     "Unsupported tools built:  Bugs may not be reported upstream."
-.endif