From e9a36d76fb7422cabe9e07613f7ef1db97c70f1f Mon Sep 17 00:00:00 2001 From: bsiegert Date: Tue, 28 Jun 2016 19:32:52 +0000 Subject: Pullup ticket #5049 - requested by taca graphics/optipng: security fix Revisions pulled up: - graphics/optipng/Makefile 1.33 - graphics/optipng/distinfo 1.29 - graphics/optipng/patches/patch-src_optipng_osys.c deleted --- Module Name: pkgsrc Committed By: adam Date: Fri Jun 17 14:03:10 UTC 2016 Modified Files: pkgsrc/graphics/optipng: Makefile distinfo Removed Files: pkgsrc/graphics/optipng/patches: patch-src_optipng_osys.c Log Message: Version 0.7.6 ------------- * Upgraded libpng to version 1.6.21. ! Fixed an assertion failure in the image reduction code. !! Fixed various security-sensitive defects in the BMP decoder. ! Fixed a benign uninitialized memory read in the GIF decoder. ! Fixed a build failure occurring under the Estonian (et_EE) locale. ! Fixed a build failure occurring on Mac OS X, FreeBSD, and possibly other systems that lack POSIX-compliant high-resolution timestamps. ! Fixed a typo causing build failures in 32-bit ANSI C compilation. --- graphics/optipng/Makefile | 4 ++-- graphics/optipng/distinfo | 11 +++++----- graphics/optipng/patches/patch-src_optipng_osys.c | 25 ----------------------- 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 graphics/optipng/patches/patch-src_optipng_osys.c diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile index fbdec4cabcf..f169e052c82 100644 --- a/graphics/optipng/Makefile +++ b/graphics/optipng/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2016/04/01 22:32:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.32.2.1 2016/06/28 19:32:52 bsiegert Exp $ -DISTNAME= optipng-0.7.5 +DISTNAME= optipng-0.7.6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=optipng/} diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo index 1043c5f3c43..4f7a38b7ece 100644 --- a/graphics/optipng/distinfo +++ b/graphics/optipng/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.28 2015/11/03 21:34:11 agc Exp $ +$NetBSD: distinfo,v 1.28.4.1 2016/06/28 19:32:52 bsiegert Exp $ -SHA1 (optipng-0.7.5.tar.gz) = 30b6c333d74fc0f5dc83004aace252fa3321368b -RMD160 (optipng-0.7.5.tar.gz) = 96ffdd9628d03939bb52c98d63c6d1b2cac42313 -SHA512 (optipng-0.7.5.tar.gz) = 6f319965739235387e99244dda5f52533e22b7040301cf680180e383f24361819f66cb3adf1a90923e9509ed08d55bbe442ec363310c385fcf70f551febfbb6f -Size (optipng-0.7.5.tar.gz) = 2141943 bytes -SHA1 (patch-src_optipng_osys.c) = 195d254b20f8657668d49ef8b1f230d7a8fbcd4a +SHA1 (optipng-0.7.6.tar.gz) = 3b3e31430e735589470c4af204354d38823f4989 +RMD160 (optipng-0.7.6.tar.gz) = 0f0ad8e31ab4a75f7fa599e4e8036e04b39a9b84 +SHA512 (optipng-0.7.6.tar.gz) = d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184 +Size (optipng-0.7.6.tar.gz) = 2202237 bytes diff --git a/graphics/optipng/patches/patch-src_optipng_osys.c b/graphics/optipng/patches/patch-src_optipng_osys.c deleted file mode 100644 index 19095c0a2d2..00000000000 --- a/graphics/optipng/patches/patch-src_optipng_osys.c +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-src_optipng_osys.c,v 1.3 2014/10/23 12:24:41 adam Exp $ - -Compatibility fix. - ---- src/optipng/osys.c.orig 2014-02-23 16:37:00.000000000 +0000 -+++ src/optipng/osys.c -@@ -518,12 +518,17 @@ osys_copy_attr(const char *src_path, con - if (chmod(dest_path, sbuf.st_mode) != 0) - result = -1; - --#ifdef AT_FDCWD -+#if defined(AT_FDCWD) && !defined(__APPLE__) - { - struct timespec times[2]; - -+#if defined(__NetBSD__) -+ times[0] = sbuf.st_atimespec; -+ times[1] = sbuf.st_mtimespec; -+#else - times[0] = sbuf.st_atim; - times[1] = sbuf.st_mtim; -+#endif - if (utimensat(AT_FDCWD, dest_path, times, 0) != 0) - result = -1; - } -- cgit v1.2.3