[pkgsrc/pkgsrc-2005Q1]: pkgsrc/graphics/tiff Pullup ticket 495 - requested by...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c9215c0973ba
branches:  pkgsrc-2005Q1
changeset: 491039:c9215c0973ba
user:      snj <snj%pkgsrc.org@localhost>
date:      Thu May 12 23:21:16 2005 +0000

description:
Pullup ticket 495 - requested by Lubomir Sedlacik
security fix for tiff

Revisions pulled up:
- pkgsrc/graphics/tiff/Makefile                 1.67, 1.69
- pkgsrc/graphics/tiff/PLIST                    1.7
- pkgsrc/graphics/tiff/distinfo                 1.26, 1.27, 1.28, 1.29
- pkgsrc/graphics/tiff/options.mk               1.1
- pkgsrc/graphics/tiff/buildlink3.mk            1.12
- pkgsrc/graphics/tiff/patches/patch-aa         1.16
- pkgsrc/graphics/tiff/patches/patch-ab         1.16
- pkgsrc/graphics/tiff/patches/patch-ac         1.16
- pkgsrc/graphics/tiff/patches/patch-ad         1.14
- pkgsrc/graphics/tiff/patches/patch-ae         removed
- pkgsrc/graphics/tiff/patches/patch-af         removed
- pkgsrc/graphics/tiff/patches/patch-ah         removed
- pkgsrc/graphics/tiff/patches/patch-ag         removed

    Module Name:    pkgsrc
    Committed By:   wiz
    Date:           Wed Mar 23 01:17:45 UTC 2005

    Modified Files:
            pkgsrc/graphics/tiff: Makefile PLIST distinfo
            pkgsrc/graphics/tiff/patches: patch-aa
    Added Files:
            pkgsrc/graphics/tiff: options.mk
    Removed Files:
            pkgsrc/graphics/tiff/patches: patch-ab patch-ac patch-ad patch-ae
                patch-af patch-ag patch-ah

    Log Message:
    Update to 3.7.2.
    Package changes:
    Put options in options.mk, and retire support for USE_GIF; turn on
    the lzw option by default (since USE_GIF was on by default).
    C++ library's name changed, to be in sync with tiff distribution's name
    for it (libtiffcxx -> libtiffxx).

    Changes in 3.7.2:
            Maintainance [sic] release. Many bugfixes in the build
            environment and compatibility improvements.
----
    Module Name:    pkgsrc
    Committed By:   recht
    Date:           Thu Mar 24 17:46:29 UTC 2005

    Modified Files:
            pkgsrc/graphics/tiff: distinfo
    Added Files:
            pkgsrc/graphics/tiff/patches: patch-ab

    Log Message:
    Pull in libtiff/Makefile.in rev. 1.54 and 1.55 without the rpath changes
    from libtiff CVS to fix the build on Darwin.
----
    Modified Files:
            pkgsrc/graphics/tiff: distinfo
    Added Files:
            pkgsrc/graphics/tiff/patches: patch-ac

    Log Message:
    Fix for NetBSD LP64 arches by checking if _LP64 is defined.  These arches
    don't define __LP64__.  This is basically same as patch-ab rev. 1.13,
    which was probably removed by mistake.
----
    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Thu May 12 12:53:21 UTC 2005

    Modified Files:
            pkgsrc/graphics/tiff: Makefile buildlink3.mk distinfo
    Added Files:
            pkgsrc/graphics/tiff/patches: patch-ad

    Log Message:
    Security fix:

    "A vulnerability in libTIFF was found, it can be potentially exploited by
     malicious people to compromise a vulnerable system."

    http://secunia.com/advisories/15320/
    http://bugzilla.remotesensing.org/show_bug.cgi?id=3D843

    Bump PKGREVISION, patch from libtiff cvs repository.

diffstat:

 graphics/tiff/Makefile         |  41 +++-----------------
 graphics/tiff/PLIST            |  83 +++++++++++++++++++++--------------------
 graphics/tiff/buildlink3.mk    |   4 +-
 graphics/tiff/distinfo         |  20 ++++------
 graphics/tiff/options.mk       |  15 +++++++
 graphics/tiff/patches/patch-aa |   6 +-
 graphics/tiff/patches/patch-ab |  63 +++++++++++++++++++++++++++----
 graphics/tiff/patches/patch-ac |  24 ++++++------
 graphics/tiff/patches/patch-ad |  75 +++++++++++++++++++++++++++++++------
 graphics/tiff/patches/patch-ae |  13 ------
 graphics/tiff/patches/patch-af |  12 ------
 graphics/tiff/patches/patch-ag |  17 --------
 graphics/tiff/patches/patch-ah |  13 ------
 13 files changed, 205 insertions(+), 181 deletions(-)

diffs (truncated from 501 to 300 lines):

diff -r 7ce23c44304c -r c9215c0973ba graphics/tiff/Makefile
--- a/graphics/tiff/Makefile    Thu May 12 22:41:26 2005 +0000
+++ b/graphics/tiff/Makefile    Thu May 12 23:21:16 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2005/01/17 08:04:25 jlam Exp $
+# $NetBSD: Makefile,v 1.66.2.1 2005/05/12 23:21:16 snj Exp $
 
-DISTNAME=      tiff-3.7.1
-PKGREVISION=   3
+DISTNAME=      tiff-3.7.2
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ftp://ftp.remotesensing.org/pub/libtiff/ \
                http://libtiff.maptools.org/dl/
@@ -20,40 +20,11 @@
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-rpath
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_GIF) && !empty(USE_GIF:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=  lzw
-.endif
+CONFIGURE_ARGS+=       --enable-cxx
+CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/tiff
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.tiff
-PKG_SUPPORTED_OPTIONS= lzw
-.include "../../mk/bsd.options.mk"
-
-###
-### LZW compression support
-###
-.if !empty(PKG_OPTIONS:Mlzw)
-CONFIGURE_ARGS+=       --enable-lzw
-.else
-CONFIGURE_ARGS+=       --disable-lzw
-.endif
+.include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-
-# We explicitly build libtiff without C++ support by patching the
-# configure script (patch-af).  We also add a new target into
-# libtiff/Makefile to create a libtiffcxx.la containing the C++
-# functions (patch-ag).
-#
-post-build:
-       cd ${WRKSRC}/libtiff && ${MAKE} libtiffcxx.la
-
-post-install:
-       cd ${WRKSRC}/libtiff && ${INSTALL_DATA} tiffio.hxx ${PREFIX}/include
-       cd ${WRKSRC}/libtiff && ${LIBTOOL} --mode=install               \
-               ${INSTALL_LIB} libtiffcxx.la ${PREFIX}/lib
-
 .include "../../mk/bsd.pkg.mk"
diff -r 7ce23c44304c -r c9215c0973ba graphics/tiff/PLIST
--- a/graphics/tiff/PLIST       Thu May 12 22:41:26 2005 +0000
+++ b/graphics/tiff/PLIST       Thu May 12 23:21:16 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/01/11 05:29:55 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2005/05/12 23:21:16 snj Exp $
 bin/bmp2tiff
 bin/fax2ps
 bin/fax2tiff
@@ -27,7 +27,7 @@
 include/tiffio.hxx
 include/tiffvers.h
 lib/libtiff.la
-lib/libtiffcxx.la
+lib/libtiffxx.la
 man/man1/bmp2tiff.1
 man/man1/fax2ps.1
 man/man1/fax2tiff.1
@@ -124,48 +124,48 @@
 share/doc/tiff/html/internals.html
 share/doc/tiff/html/intro.html
 share/doc/tiff/html/libtiff.html
-share/doc/tiff/html/man/TIFFClose.3t.html
-share/doc/tiff/html/man/TIFFDataWidth.3t.html
-share/doc/tiff/html/man/TIFFError.3t.html
-share/doc/tiff/html/man/TIFFFlush.3t.html
-share/doc/tiff/html/man/TIFFGetField.3t.html
-share/doc/tiff/html/man/TIFFOpen.3t.html
-share/doc/tiff/html/man/TIFFPrintDirectory.3t.html
-share/doc/tiff/html/man/TIFFRGBAImage.3t.html
-share/doc/tiff/html/man/TIFFReadDirectory.3t.html
-share/doc/tiff/html/man/TIFFReadEncodedStrip.3t.html
-share/doc/tiff/html/man/TIFFReadEncodedTile.3t.html
-share/doc/tiff/html/man/TIFFReadRGBAImage.3t.html
-share/doc/tiff/html/man/TIFFReadRGBAStrip.3t.html
-share/doc/tiff/html/man/TIFFReadRGBATile.3t.html
-share/doc/tiff/html/man/TIFFReadRawStrip.3t.html
-share/doc/tiff/html/man/TIFFReadRawTile.3t.html
-share/doc/tiff/html/man/TIFFReadScanline.3t.html
-share/doc/tiff/html/man/TIFFReadTile.3t.html
-share/doc/tiff/html/man/TIFFSetDirectory.3t.html
-share/doc/tiff/html/man/TIFFSetField.3t.html
-share/doc/tiff/html/man/TIFFWarning.3t.html
-share/doc/tiff/html/man/TIFFWriteDirectory.3t.html
-share/doc/tiff/html/man/TIFFWriteEncodedStrip.3t.html
-share/doc/tiff/html/man/TIFFWriteEncodedTile.3t.html
-share/doc/tiff/html/man/TIFFWriteRawStrip.3t.html
-share/doc/tiff/html/man/TIFFWriteRawTile.3t.html
-share/doc/tiff/html/man/TIFFWriteScanline.3t.html
-share/doc/tiff/html/man/TIFFWriteTile.3t.html
-share/doc/tiff/html/man/TIFFbuffer.3t.html
-share/doc/tiff/html/man/TIFFcodec.3t.html
-share/doc/tiff/html/man/TIFFcolor.3t.html
-share/doc/tiff/html/man/TIFFmemory.3t.html
-share/doc/tiff/html/man/TIFFquery.3t.html
-share/doc/tiff/html/man/TIFFsize.3t.html
-share/doc/tiff/html/man/TIFFstrip.3t.html
-share/doc/tiff/html/man/TIFFswab.3t.html
-share/doc/tiff/html/man/TIFFtile.3t.html
+share/doc/tiff/html/man/TIFFClose.3tiff.html
+share/doc/tiff/html/man/TIFFDataWidth.3tiff.html
+share/doc/tiff/html/man/TIFFError.3tiff.html
+share/doc/tiff/html/man/TIFFFlush.3tiff.html
+share/doc/tiff/html/man/TIFFGetField.3tiff.html
+share/doc/tiff/html/man/TIFFOpen.3tiff.html
+share/doc/tiff/html/man/TIFFPrintDirectory.3tiff.html
+share/doc/tiff/html/man/TIFFRGBAImage.3tiff.html
+share/doc/tiff/html/man/TIFFReadDirectory.3tiff.html
+share/doc/tiff/html/man/TIFFReadEncodedStrip.3tiff.html
+share/doc/tiff/html/man/TIFFReadEncodedTile.3tiff.html
+share/doc/tiff/html/man/TIFFReadRGBAImage.3tiff.html
+share/doc/tiff/html/man/TIFFReadRGBAStrip.3tiff.html
+share/doc/tiff/html/man/TIFFReadRGBATile.3tiff.html
+share/doc/tiff/html/man/TIFFReadRawStrip.3tiff.html
+share/doc/tiff/html/man/TIFFReadRawTile.3tiff.html
+share/doc/tiff/html/man/TIFFReadScanline.3tiff.html
+share/doc/tiff/html/man/TIFFReadTile.3tiff.html
+share/doc/tiff/html/man/TIFFSetDirectory.3tiff.html
+share/doc/tiff/html/man/TIFFSetField.3tiff.html
+share/doc/tiff/html/man/TIFFWarning.3tiff.html
+share/doc/tiff/html/man/TIFFWriteDirectory.3tiff.html
+share/doc/tiff/html/man/TIFFWriteEncodedStrip.3tiff.html
+share/doc/tiff/html/man/TIFFWriteEncodedTile.3tiff.html
+share/doc/tiff/html/man/TIFFWriteRawStrip.3tiff.html
+share/doc/tiff/html/man/TIFFWriteRawTile.3tiff.html
+share/doc/tiff/html/man/TIFFWriteScanline.3tiff.html
+share/doc/tiff/html/man/TIFFWriteTile.3tiff.html
+share/doc/tiff/html/man/TIFFbuffer.3tiff.html
+share/doc/tiff/html/man/TIFFcodec.3tiff.html
+share/doc/tiff/html/man/TIFFcolor.3tiff.html
+share/doc/tiff/html/man/TIFFmemory.3tiff.html
+share/doc/tiff/html/man/TIFFquery.3tiff.html
+share/doc/tiff/html/man/TIFFsize.3tiff.html
+share/doc/tiff/html/man/TIFFstrip.3tiff.html
+share/doc/tiff/html/man/TIFFswab.3tiff.html
+share/doc/tiff/html/man/TIFFtile.3tiff.html
 share/doc/tiff/html/man/fax2ps.1.html
 share/doc/tiff/html/man/fax2tiff.1.html
 share/doc/tiff/html/man/gif2tiff.1.html
 share/doc/tiff/html/man/index.html
-share/doc/tiff/html/man/libtiff.3t.html
+share/doc/tiff/html/man/libtiff.3tiff.html
 share/doc/tiff/html/man/pal2rgb.1.html
 share/doc/tiff/html/man/ppm2tiff.1.html
 share/doc/tiff/html/man/ras2tiff.1.html
@@ -215,7 +215,8 @@
 share/doc/tiff/html/v3.7.0alpha.html
 share/doc/tiff/html/v3.7.0beta.html
 share/doc/tiff/html/v3.7.0beta2.html
-share/doc/tiff/html/v${PKGVERSION}.html
+share/doc/tiff/html/v3.7.1.html
+share/doc/tiff/html/v3.7.2.html
 @dirrm share/doc/tiff/html/man
 @dirrm share/doc/tiff/html/images
 @dirrm share/doc/tiff/html
diff -r 7ce23c44304c -r c9215c0973ba graphics/tiff/buildlink3.mk
--- a/graphics/tiff/buildlink3.mk       Thu May 12 22:41:26 2005 +0000
+++ b/graphics/tiff/buildlink3.mk       Thu May 12 23:21:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/01/11 05:29:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11.2.1 2005/05/12 23:21:16 snj Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TIFF_BUILDLINK3_MK:=   ${TIFF_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 
 .if !empty(TIFF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tiff+=       tiff>=3.6.1
-BUILDLINK_RECOMMENDED.tiff+=   tiff>=3.7.1nb1
+BUILDLINK_RECOMMENDED.tiff+=   tiff>=3.7.2nb1
 BUILDLINK_PKGSRCDIR.tiff?=     ../../graphics/tiff
 .endif # TIFF_BUILDLINK3_MK
 
diff -r 7ce23c44304c -r c9215c0973ba graphics/tiff/distinfo
--- a/graphics/tiff/distinfo    Thu May 12 22:41:26 2005 +0000
+++ b/graphics/tiff/distinfo    Thu May 12 23:21:16 2005 +0000
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.25 2005/02/24 08:45:13 agc Exp $
+$NetBSD: distinfo,v 1.25.2.1 2005/05/12 23:21:16 snj Exp $
 
-SHA1 (tiff-3.7.1.tar.gz) = 001b03350182869c7f5d46e6b27862b85cb06fc3
-RMD160 (tiff-3.7.1.tar.gz) = 96ac6ade88a799afbd31c851abce527cb69ac937
-Size (tiff-3.7.1.tar.gz) = 1253810 bytes
-SHA1 (patch-aa) = 995c418791f2c8ce3f634dac117949048955b625
-SHA1 (patch-ab) = 1e6a2dd379e388f11c5a7b1959240fd66d29b88a
-SHA1 (patch-ac) = 40e817380c5183cf2e1e5461c05600073dec7348
-SHA1 (patch-ad) = 301e0ce2c121e9082e0ff9c5681c2ea1e0e6dcff
-SHA1 (patch-ae) = bb2e2d3a5be49204356c3c504d3a4bd5ba1fd9b2
-SHA1 (patch-af) = 29adfbcaa317df36a41af791e93159ad795c5e0b
-SHA1 (patch-ag) = 8ec28fcea0690275935b4c20f57a8d6d8b114b86
-SHA1 (patch-ah) = 355c36e637f7e230cb555afb50090b9c9d1bad9c
+SHA1 (tiff-3.7.2.tar.gz) = 0eb69e88bf6c430160ad2897cd0ae637d507ed66
+RMD160 (tiff-3.7.2.tar.gz) = fb156e17f55b1d565adbc5247f01d836d5f25824
+Size (tiff-3.7.2.tar.gz) = 1260598 bytes
+SHA1 (patch-aa) = 06ecb34e5eeae5650020b456dddd40c8b9fe9647
+SHA1 (patch-ab) = 0363e36d8c7575b4a55fee587aa4d92ee6c6db0b
+SHA1 (patch-ac) = 80c0abc2e8111a9b7608514cce239c8195e44cee
+SHA1 (patch-ad) = 2e448a0491c4137820ec81cf566cf1962fab6045
diff -r 7ce23c44304c -r c9215c0973ba graphics/tiff/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/tiff/options.mk  Thu May 12 23:21:16 2005 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1.2.2 2005/05/12 23:21:16 snj Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.tiff
+PKG_SUPPORTED_OPTIONS= lzw
+PKG_DEFAULT_OPTIONS=   lzw
+.include "../../mk/bsd.options.mk"
+
+###
+### LZW compression support
+###
+.if !empty(PKG_OPTIONS:Mlzw)
+CONFIGURE_ARGS+=       --enable-lzw
+.else
+CONFIGURE_ARGS+=       --disable-lzw
+.endif
diff -r 7ce23c44304c -r c9215c0973ba graphics/tiff/patches/patch-aa
--- a/graphics/tiff/patches/patch-aa    Thu May 12 22:41:26 2005 +0000
+++ b/graphics/tiff/patches/patch-aa    Thu May 12 23:21:16 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2004/12/28 23:10:09 reed Exp $
+$NetBSD: patch-aa,v 1.15.2.1 2005/05/12 23:21:16 snj Exp $
 
---- man/Makefile.in.orig       Mon Dec 20 11:41:54 2004
+--- man/Makefile.in.orig       2005-03-11 16:49:52.000000000 +0100
 +++ man/Makefile.in
-@@ -373,11 +373,7 @@ install-man3: $(man3_MANS) $(man_MANS)
+@@ -376,11 +376,7 @@ install-man3: $(man3_MANS) $(man_MANS)
        for i in $$list; do \
          if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
          else file=$$i; fi; \
diff -r 7ce23c44304c -r c9215c0973ba graphics/tiff/patches/patch-ab
--- a/graphics/tiff/patches/patch-ab    Thu May 12 22:41:26 2005 +0000
+++ b/graphics/tiff/patches/patch-ab    Thu May 12 23:21:16 2005 +0000
@@ -1,13 +1,58 @@
-$NetBSD: patch-ab,v 1.14 2004/12/28 23:10:10 reed Exp $
+$NetBSD: patch-ab,v 1.14.2.1 2005/05/12 23:21:16 snj Exp $
 
---- html/Makefile.in.orig      2004-12-20 11:41:54.000000000 -0800
-+++ html/Makefile.in
-@@ -224,7 +224,7 @@ target_alias = @target_alias@
+--- libtiff/Makefile.in.orig   Wed Mar  9 10:49:43 2005
++++ libtiff/Makefile.in        Thu Mar 24 01:25:26 2005
+@@ -103,7 +103,8 @@
+       tif_warning.lo tif_write.lo tif_zip.lo
+ am_libtiff_la_OBJECTS = $(am__objects_1)
+ libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS)
+-libtiffxx_la_LIBADD =
++am__DEPENDENCIES_1 = $(top_builddir)/libtiff/libtiff.la
++libtiffxx_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am__objects_2 = tif_stream.lo
+ am_libtiffxx_la_OBJECTS = $(am__objects_2)
+ libtiffxx_la_OBJECTS = $(am_libtiffxx_la_OBJECTS)
+@@ -111,8 +112,8 @@
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_mkg3states_OBJECTS = mkg3states.$(OBJEXT)
+ mkg3states_OBJECTS = $(am_mkg3states_OBJECTS)
+-am__DEPENDENCIES_1 =
+-mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am__DEPENDENCIES_2 = $(top_builddir)/port/libport.la
++mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I.
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -271,7 +272,8 @@
  target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/html
-+docdir = $(prefix)/share/doc/$(PACKAGE)/html
- docfiles = \
-       addingtags.html \
-       bugs.html \
+-LIBPORT = -L$(top_builddir)/port -lport
++LIBPORT = $(top_builddir)/port/libport.la
++LIBTIFF = $(top_builddir)/libtiff/libtiff.la
+ EXTRA_DIST = Makefile.vc tif_config.h.vc tiffconf.h.vc libtiff.def \
+            $(EXTRA_SRCS)
+ 
+@@ -338,15 +340,14 @@
+ noinst_HEADERS = $(EXTRA_HDRS)