Pullup ticket #4854 - requested by sevan

Pullup ticket #4856 - requested by he
graphics/png: security fix

Revisions pulled up:
- graphics/png/Makefile                                         1.179
- graphics/png/distinfo                                         1.124

---
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Nov 12 16:12:19 UTC 2015

   Modified Files:
           pkgsrc/graphics/png: Makefile distinfo

   Log Message:
   Update png to 1.6.19:

   Libpng 1.6.19 - November 12, 2015
   Changes since the last public release (1.6.18):
     Updated obsolete information about the simplified API macros in the
       manual pages (Bug report by Arc Riley).
     Avoid potentially dereferencing NULL info_ptr in png_info_init_3().
     Rearranged png.h to put the major sections in the same order as
       in libpng17.
     Eliminated unused PNG_COST_SHIFT, PNG_WEIGHT_SHIFT, PNG_COST_FACTOR, and
       PNG_WEIGHT_FACTOR macros.
     Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler
       (Bug report by Viktor Szakats).  Several warnings remain and are
       unavoidable, where we test for overflow.
     Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c
     Fixed uninitialized variable in contrib/gregbook/rpng2-x.c
     Moved config.h.in~ from the "libpng_autotools_files" list to the
       "libpng_autotools_extra" list in autogen.sh because it was causing a
       false positive for missing files (bug report by Robert C. Seacord).
     Removed unreachable "break" statements in png.c, pngread.c, and pngrtran.c
       to suppress clang warnings (Bug report by Viktor Szakats).
     Fixed some bad links in the man page.
     Changed "n bit" to "n-bit" in comments.
     Added signed/unsigned 16-bit safety net. This removes the dubious
       0x8000 flag definitions on 16-bit systems. They aren't supported
       yet the defs *probably* work, however it seems much safer to do this
       and be advised if anyone, contrary to advice, is building libpng 1.6
       on a 16-bit system. It also adds back various switch default clauses
       for GCC; GCC errors out if they are not present (with an appropriately
       high level of warnings).
     Safely convert num_bytes to a png_byte in png_set_sig_bytes() (Robert
       Seacord).
     Fixed the recently reported 1's complement security issue by replacing
       the value that is illegal in the PNG spec, in both signed and unsigned
       values, with 0. Illegal unsigned values (anything greater than or equal
       to  0x80000000) can still pass through, but since these are not illegal
       in ANSI-C (unlike 0x80000000 in the signed case) the checking that
       occurs later can catch them (John Bowler).
     Fixed png_save_int_32 when int is not 2's complement (John Bowler).
     Updated libpng16 with all the recent test changes from libpng17,
       including changes to pngvalid.c to ensure that the original,
       distributed, version of contrib/visupng/cexcept.h can be used
       (John Bowler).
     pngvalid contains the correction to the use of SAVE/STORE_
       UNKNOWN_CHUNKS; a bug revealed by changes in libpng 1.7. More
       tests contain the --strict option to detect warnings and the
       pngvalid-standard test has been corrected so that it does not
       turn on progressive-read. There is a separate test which does
       that. (John Bowler)
     Also made some signed/unsigned fixes.
     Make pngstest error limits version specific. Splitting the machine
       generated error structs out to a file allows the values to be updated
       without changing pngstest.c itself. Since libpng 1.6 and 1.7 have
       slightly different error limits this simplifies maintenance. The
       makepngs.sh script has also been updated to more accurately reflect
       current problems in libpng 1.7 (John Bowler).
     Incorporated new test PNG files into make check.  tests/pngstest-*
       are changed so that the new test files are divided into 8 groups by
       gamma and alpha channel.  These tests have considerably better code
       and pixel-value coverage than contrib/pngsuite; however,coverage is
       still incomplete (John Bowler).
     Removed the '--strict' in 1.6 because of the double-gamma-correction
       warning, updated pngstest-errors.h for the errors detected with the
       new contrib/testspngs PNG test files (John Bowler).
     Worked around rgb-to-gray issues in libpng 1.6.  The previous
       attempts to ignore the errors in the code aren't quite enough to
       deal with the 'channel selection' encoding added to libpng 1.7; abort.
     Fixed 'pow' macros in pngvalid.c. It is legal for 'pow' to be a
       macro, therefore the argument list cannot contain preprocessing
       directives.  Make sure pow is a function where this happens. This is
       a minimal safe fix, the issue only arises in non-performance-critical
       code (bug report by Curtis Leach, fix by John Bowler).
     Added sPLT support to pngtest.c
     Prevent setting or writing over-length PLTE chunk (Cosmin Truta).
     Silently truncate over-length PLTE chunk while reading.
     Libpng incorrectly calculated the output rowbytes when the application
       decreased either the number of channels or the bit depth (or both) in
       a user transform.  This was safe; libpng overallocated buffer space
      (potentially by quite a lot; up to 4 times the amount required) but,
      from 1.5.4 on, resulted in a png_error (John Bowler).
     Fixed some inconsequential cut-and-paste typos in
   png_set_cHRM_XYZ_fixed().
     Clarified COPYRIGHT information to state explicitly that versions
       are derived from previous versions.
     Removed much of the long list of previous versions from png.h and
       libpng.3.

2 files changed, 7 insertions, 6 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index d88c3af0501..f7b43cdac54 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.178 2015/07/26 22:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.178.2.1 2015/11/20 21:00:28 bsiegert Exp $
 
-DISTNAME=	libpng-1.6.18
+DISTNAME=	libpng-1.6.19
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 7d0e0532fcb..97fe8e6c872 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.122 2015/07/26 22:46:53 wiz Exp $
+$NetBSD: distinfo,v 1.122.2.1 2015/11/20 21:00:28 bsiegert Exp $
 
-SHA1 (libpng-1.6.18.tar.xz) = c6e06510d30beba08c96c468ab269fafb2bb256f
-RMD160 (libpng-1.6.18.tar.xz) = 3872ad07e42a75ff707a0c2a02c2302445a0d932
-Size (libpng-1.6.18.tar.xz) = 932324 bytes
+SHA1 (libpng-1.6.19.tar.xz) = 483d72ced11c9258f9d1119105273d9af9ff151c
+RMD160 (libpng-1.6.19.tar.xz) = 41242bbef461f0a495310f358df09b19028f2e2e
+SHA512 (libpng-1.6.19.tar.xz) = 166377ce4f8abfcae0e76bafbdbe94aebef60b9a12c1820eda392e63a8ba7a9e8d7ef4840d8d4853cd487418edd2c4515a889cd9f830d4223a13315e1db4c3b8
+Size (libpng-1.6.19.tar.xz) = 941280 bytes