diff options
author | pgoyette <pgoyette@pkgsrc.org> | 2017-06-21 02:47:45 +0000 |
---|---|---|
committer | pgoyette <pgoyette@pkgsrc.org> | 2017-06-21 02:47:45 +0000 |
commit | 0a9ae7c11e1de8bdcd90a76cbefaf7dbcf814d2c (patch) | |
tree | 860a664b9f21a7af723e3fc9c53a162c45ff4a5b /graphics | |
parent | 8b86ae2b3b6875960a5814c0e6a9f6f5ddb708b8 (diff) | |
download | pkgsrc-0a9ae7c11e1de8bdcd90a76cbefaf7dbcf814d2c.tar.gz |
One more try to get the patches and distinfo done correctly.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/tiff/distinfo | 8 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-libtiff_tif_dir.h | 8 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-libtiff_tif_dirinfo.c | 8 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-libtiff_tif_dirread.c | 8 |
4 files changed, 7 insertions, 25 deletions
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index dcec4f360ec..14cd4cc9a96 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.85 2017/06/21 02:40:27 pgoyette Exp $ +$NetBSD: distinfo,v 1.86 2017/06/21 02:47:45 pgoyette Exp $ SHA1 (tiff-4.0.8.tar.gz) = 88717c97480a7976c94d23b6d9ed4ac74715267f RMD160 (tiff-4.0.8.tar.gz) = 0d8bc26c98035810c73b8f876f76dc48efba7da8 SHA512 (tiff-4.0.8.tar.gz) = 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6 Size (tiff-4.0.8.tar.gz) = 2065574 bytes SHA1 (patch-configure) = a0032133f06b6ac92bbf52349fabe83f74ea14a6 -SHA1 (patch-libtiff_tif_dir.h) = ac7ce7317331183b81b5e9819f052081ab941aee -SHA1 (patch-libtiff_tif_dirinfo.c) = 3c9ff36a18ed0d74de0365ac2a750544ff8b0152 -SHA1 (patch-libtiff_tif_dirread.c) = bdf576963cdf5c511a57ba31eb4f7a2215b36647 +SHA1 (patch-libtiff_tif_dir.h) = 50f565eac6a7157a7c99923f4b3ffaf31b021644 +SHA1 (patch-libtiff_tif_dirinfo.c) = cd0e4da46f62d888128e558c16ebcc6a867274df +SHA1 (patch-libtiff_tif_dirread.c) = d98b5cb0ceca8f5923c015b09f04da3b8af094e5 diff --git a/graphics/tiff/patches/patch-libtiff_tif_dir.h b/graphics/tiff/patches/patch-libtiff_tif_dir.h index b4cbf03e67b..5394f4f7a37 100644 --- a/graphics/tiff/patches/patch-libtiff_tif_dir.h +++ b/graphics/tiff/patches/patch-libtiff_tif_dir.h @@ -1,4 +1,4 @@ -$NetBSD: patch-libtiff_tif_dir.h,v 1.2 2017/06/21 02:38:21 pgoyette Exp $ +$NetBSD: patch-libtiff_tif_dir.h,v 1.3 2017/06/21 02:47:45 pgoyette Exp $ fix CVE-2014-8128, CVE-2016-5318, CVE-2015-7554 & CVE-2016-10095 per http://bugzilla.maptools.org/show_bug.cgi?id=2580 @@ -15,12 +15,6 @@ 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: patch-libtiff_tif_dir.h,v 1.2 2017/06/21 02:38:21 pgoyette Exp $ */ -+/* $Id: patch-libtiff_tif_dir.h,v 1.2 2017/06/21 02:38:21 pgoyette 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); diff --git a/graphics/tiff/patches/patch-libtiff_tif_dirinfo.c b/graphics/tiff/patches/patch-libtiff_tif_dirinfo.c index d9405b8e4a8..1e9a4f64e9a 100644 --- a/graphics/tiff/patches/patch-libtiff_tif_dirinfo.c +++ b/graphics/tiff/patches/patch-libtiff_tif_dirinfo.c @@ -1,4 +1,4 @@ -$NetBSD: patch-libtiff_tif_dirinfo.c,v 1.2 2017/06/21 02:38:21 pgoyette Exp $ +$NetBSD: patch-libtiff_tif_dirinfo.c,v 1.3 2017/06/21 02:47:45 pgoyette Exp $ fix CVE-2014-8128, CVE-2016-5318, CVE-2015-7554 & CVE-2016-10095 per http://bugzilla.maptools.org/show_bug.cgi?id=2580 @@ -15,12 +15,6 @@ retrieving revision 1.127 diff -w -u -b -r1.126 -r1.127 --- libtiff/tif_dirinfo.c.orig 18 Nov 2016 02:52:13 -0000 1.126 +++ libtiff/tif_dirinfo.c 1 Jun 2017 12:44:04 -0000 1.127 -@@ -1,4 +1,4 @@ --/* $Id: patch-libtiff_tif_dirinfo.c,v 1.2 2017/06/21 02:38:21 pgoyette Exp $ */ -+/* $Id: patch-libtiff_tif_dirinfo.c,v 1.2 2017/06/21 02:38:21 pgoyette Exp $ */ - - /* - * Copyright (c) 1988-1997 Sam Leffler @@ -956,6 +956,109 @@ return 0; } diff --git a/graphics/tiff/patches/patch-libtiff_tif_dirread.c b/graphics/tiff/patches/patch-libtiff_tif_dirread.c index f57479c2f13..dc6f2ecc009 100644 --- a/graphics/tiff/patches/patch-libtiff_tif_dirread.c +++ b/graphics/tiff/patches/patch-libtiff_tif_dirread.c @@ -1,4 +1,4 @@ -$NetBSD: patch-libtiff_tif_dirread.c,v 1.6 2017/06/21 02:38:21 pgoyette Exp $ +$NetBSD: patch-libtiff_tif_dirread.c,v 1.7 2017/06/21 02:47:45 pgoyette Exp $ fix CVE-2014-8128, CVE-2016-5318, CVE-2015-7554 & CVE-2016-10095 per http://bugzilla.maptools.org/show_bug.cgi?id=2580 @@ -15,12 +15,6 @@ retrieving revision 1.209 diff -w -u -b -r1.208 -r1.209 --- libtiff/tif_dirread.c.orig 27 Apr 2017 15:46:22 -0000 1.208 +++ libtiff/tif_dirread.c 1 Jun 2017 12:44:04 -0000 1.209 -@@ -1,4 +1,4 @@ --/* $Id: patch-libtiff_tif_dirread.c,v 1.6 2017/06/21 02:38:21 pgoyette Exp $ */ -+/* $Id: patch-libtiff_tif_dirread.c,v 1.6 2017/06/21 02:38:21 pgoyette Exp $ */ - - /* - * Copyright (c) 1988-1997 Sam Leffler @@ -3580,6 +3580,10 @@ goto bad; dp->tdir_tag=IGNORE; |