Re: CVS commit: pkgsrc/graphics/tiff

Thanks for fixing this... apparently the problem is that what I committed was (for example):

patches/patch-libtiff_tif_dir.h:
$NetBSD$

fix CVE-2014-8128, CVE-2016-5318, CVE-2015-7554 & CVE-2016-10095
per http://bugzilla.maptools.org/show_bug.cgi?id=2580

also CVE-2017-9147
(http://bugzilla.maptools.org/show_bug.cgi?id=2693)

Index: tif_dir.h
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -w -u -b -r1.54 -r1.55
--- libtiff/tif_dir.h.orig 18 Feb 2011 20:53:05 -0000 1.54
+++ libtiff/tif_dir.h 1 Jun 2017 12:44:04 -0000 1.55
@@ -1,4 +1,4 @@
-/* $Id: tif_dir.h,v 1.54 2011-02-18 20:53:05 fwarmerdam Exp $ */
+/* $Id: tif_dir.h,v 1.55 2017-06-01 12:44:04 erouault Exp $ */

/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -291,6 +291,7 @@
extern int _TIFFMergeFields(TIFF*, const TIFFField[], uint32);
extern const TIFFField* _TIFFFindOrRegisterField(TIFF *, uint32, TIFFDataType);
extern TIFFField* _TIFFCreateAnonField(TIFF *, uint32, TIFFDataType);
+extern int _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag);

#if defined(__cplusplus)
}

Which and apparently the multiple cases of $xxx$ caused cvs to do something very very wrong.

The $NetBSD$ at the top was right, but apparently I needed to remove the other tags from the diff to avoid this problem. Sorry about that.

- Tim

On Tue, Jun 20, 2017 at 9:46 PM, Paul Goyette <paul%whooppee.com@localhost> wrote:

OK, I'm making a mess of this. For some reason, it seems that the
changes I made to the patch files got undone by the commit! I guess
that the patch files should NOT contain $NetBSD$ tags in the patches
themselves, only in the patch file's header!

I'm going to make one more attempt to fix this, by removing the
embedded $NetBSD$ tags. Hopefully that will get us building again.

On Wed, 21 Jun 2017, Paul Goyette wrote:

Module Name: pkgsrc
Committed By: pgoyette
Date: Wed Jun 21 02:40:27 UTC 2017

Modified Files:
pkgsrc/graphics/tiff: distinfo

Log Message:
Get the distinfo done right

To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/graphics/tiff/distinfo

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

!DSPAM:5949dcbd71381369621000!

+------------------+--------------------------+----------------------------+
| Paul Goyette | PGP Key fingerprint: | E-mail addresses: |
| (Retired) | FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com |
| Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org |
+------------------+--------------------------+----------------------------+