From 70041f4038e722dda7c58ba587fe2ffdb462a8e6 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 2 Aug 2017 19:28:44 -0500 Subject: [PATCH] [libpng16] Bump version to 1.6.32beta08 --- ANNOUNCE | 20 +++++++++++--------- CHANGES | 4 +++- CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 12 ++++++------ libpngpf.3 | 2 +- png.c | 6 +++--- png.h | 16 ++++++++-------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/def.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 24 files changed, 59 insertions(+), 55 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 45e167f5e..788a12411 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.32beta07 - August 3, 2017 +Libpng 1.6.32beta08 - August 3, 2017 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.32beta07.tar.xz (LZMA-compressed, recommended) - 1.6.32beta07.tar.gz + 1.6.32beta08.tar.xz (LZMA-compressed, recommended) + 1.6.32beta08.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1632b07.7z (LZMA-compressed, recommended) - lp1632b07.zip + lp1632b08.7z (LZMA-compressed, recommended) + lp1632b08.zip Other information: - 1.6.32beta07-README.txt - 1.6.32beta07-LICENSE.txt - libpng-1.6.32beta07-*.asc (armored detached GPG signatures) + 1.6.32beta08-README.txt + 1.6.32beta08-LICENSE.txt + libpng-1.6.32beta08-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.31): @@ -54,10 +54,12 @@ Version 1.6.32beta05 [August 2, 2017] Version 1.6.32beta06 [August 2, 2017] Removed png_get_eXIf_1() and png_set_eXIf_1(). -Version 1.6.32beta07 [August 3, 2017] +Version 1.6.32beta07 [Auguest 3, 2017] Check length of all chunks except IDAT against user limit to fix an OSS-fuzz issue. +Version 1.6.32beta08 [August 3, 2017] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index e11d83b7a..b77269b0c 100644 --- a/CHANGES +++ b/CHANGES @@ -5937,10 +5937,12 @@ Version 1.6.32beta05 [August 2, 2017] Version 1.6.32beta06 [August 2, 2017] Removed png_get_eXIf_1() and png_set_eXIf_1(). -Version 1.6.32beta07 [August 3, 2017] +Version 1.6.32beta07 [Auguest 3, 2017] Check length of all chunks except IDAT against user limit to fix an OSS-fuzz issue. +Version 1.6.32beta08 [August 3, 2017] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CMakeLists.txt b/CMakeLists.txt index f101fd0b1..b805cefa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -817,7 +817,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.32beta07 +# VERSION 16.${PNGLIB_RELEASE}.1.6.32beta08 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 0867266b9..47509be12 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.32beta07, August 3, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.32beta08, August 3, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals diff --git a/README b/README index a68080292..002a27df7 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.32beta07 - August 3, 2017 (shared library 16.0) +README for libpng version 1.6.32beta08 - August 3, 2017 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/configure.ac b/configure.ac index e89864652..130854f92 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.32beta07],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.32beta08],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.32beta07 +PNGLIB_VERSION=1.6.32beta08 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=32 diff --git a/libpng-manual.txt b/libpng-manual.txt index 5c9f63b3d..27a70f121 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.32beta07 - August 3, 2017 + libpng version 1.6.32beta08 - August 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.32beta07 - August 3, 2017 + libpng versions 0.97, January 1998, through 1.6.32beta08 - August 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5404,7 +5404,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.32beta07 are Y2K compliant. It is my belief that earlier +upward through 1.6.32beta08 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer diff --git a/libpng.3 b/libpng.3 index dbc4373bb..5c30ded1f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "August 3, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta07 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta08 .SH SYNOPSIS \fB #include \fP @@ -514,7 +514,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.32beta07 - August 3, 2017 + libpng version 1.6.32beta08 - August 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -525,7 +525,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.32beta07 - August 3, 2017 + libpng versions 0.97, January 1998, through 1.6.32beta08 - August 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5918,7 +5918,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.32beta07 are Y2K compliant. It is my belief that earlier +upward through 1.6.32beta08 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -6076,7 +6076,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.32beta07 - August 3, 2017: +Libpng version 1.6.32beta08 - August 3, 2017: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6101,7 +6101,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.32beta07, August 3, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.6.32beta08, August 3, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals diff --git a/libpngpf.3 b/libpngpf.3 index df2e05386..50df41eb7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "April 1, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta07 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta08 (private functions) .SH SYNOPSIS \fB\fB#include \fI\fI"pngpriv.h" diff --git a/png.c b/png.c index ff76b3cb3..2aa32ae8f 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_32beta07 Your_png_h_is_not_version_1_6_32beta07; +typedef png_libpng_version_1_6_32beta08 Your_png_h_is_not_version_1_6_32beta08; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.32beta07 - August 3, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.32beta08 - August 3, 2017" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.6.32beta07 - August 3, 2017\ + return "libpng version 1.6.32beta08 - August 3, 2017\ Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 86e429324..a2cd990bf 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.32beta07, August 3, 2017 + * libpng version 1.6.32beta08, August 3, 2017 * * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.32beta07, August 3, 2017: + * libpng versions 0.97, January 1998, through 1.6.32beta08, August 3, 2017: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.32beta07, August 3, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.32beta08, August 3, 2017 are * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -247,7 +247,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.32beta07 are Y2K compliant. It is my belief that + * upward through 1.6.32beta08 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -309,8 +309,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.32beta07" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta07 - August 3, 2017\n" +#define PNG_LIBPNG_VER_STRING "1.6.32beta08" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta08 - August 3, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -324,7 +324,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 07 +#define PNG_LIBPNG_VER_BUILD 08 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -459,7 +459,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_32beta07; +typedef char* png_libpng_version_1_6_32beta08; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 800a7ae64..7efb50e88 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.32beta07, August 3, 2017 + * libpng version 1.6.32beta08, August 3, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index eee232076..dfa2ad300 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2132,4 +2132,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_32beta07 Your_png_h_is_not_version_1_6_32beta07; +typedef png_libpng_version_1_6_32beta08 Your_png_h_is_not_version_1_6_32beta08; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index d2355ddfb..aa0c54761 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.32beta07 - August 3, 2017 +libpng version 1.6.32beta08 - August 3, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ac5d2b490..47de44a93 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@