From 43d90b161006bd6a6bb42aa231eb427edc0f2b75 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 17 Feb 2015 10:44:26 -0600 Subject: [PATCH] [libpng16] Bump version to 1.6.17beta04 --- ANNOUNCE | 18 ++++++++++-------- CHANGES | 2 ++ CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.c | 6 +++--- png.h | 18 +++++++++--------- pngconf.h | 2 +- pngdebug.h | 3 +-- pnginfo.h | 3 +-- pngpriv.h | 4 +--- pngstruct.h | 3 +-- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- 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 +- 28 files changed, 62 insertions(+), 63 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 0281b45f8..8dba919ee 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.17beta03 - February 17, 2015 +Libpng 1.6.17beta04 - February 17, 2015 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.17beta03.tar.xz (LZMA-compressed, recommended) - 1.6.17beta03.tar.gz + 1.6.17beta04.tar.xz (LZMA-compressed, recommended) + 1.6.17beta04.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1617b03.7z (LZMA-compressed, recommended) - lp1617b03.zip + lp1617b04.7z (LZMA-compressed, recommended) + lp1617b04.zip Other information: - 1.6.17beta03-README.txt - 1.6.17beta03-LICENSE.txt - libpng-1.6.17beta03-*.asc (armored detached GPG signatures) + 1.6.17beta04-README.txt + 1.6.17beta04-LICENSE.txt + libpng-1.6.17beta04-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.16): @@ -51,6 +51,8 @@ Version 1.6.17beta03 [February 17, 2015] by the user at build time or run time. This provides a more robust defense against DOS and as-yet undiscovered overflows. +Version 1.6.17beta04 [February 17, 2015] + 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 ba429cd44..a80e933c3 100644 --- a/CHANGES +++ b/CHANGES @@ -5152,6 +5152,8 @@ Version 1.6.17beta03 [February 17, 2015] by the user at build time or run time. This provides a more robust defense against DOS and as-yet undiscovered overflows. +Version 1.6.17beta04 [February 17, 2015] + 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 b54560bbd..ef0846745 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,7 +253,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.17beta03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.17beta04 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 9575ee83c..77d187872 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.17beta03, February 17, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17beta04, February 17, 2015, are Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/README b/README index 544193a0c..c660cd689 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.17beta03 - February 17, 2015 (shared library 16.0) +README for libpng version 1.6.17beta04 - February 17, 2015 (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 4ecca33da..a8f1909c1 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.17beta03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.17beta04],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,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.17beta03 +PNGLIB_VERSION=1.6.17beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=17 diff --git a/libpng-manual.txt b/libpng-manual.txt index 382a34116..f35ae3a8a 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.17beta03 - February 17, 2015 + libpng version 1.6.17beta04 - February 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 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.17beta03 - February 17, 2015 + libpng versions 0.97, January 1998, through 1.6.17beta04 - February 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5281,7 +5281,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.17beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.17beta04 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 b4e158b46..3f4557970 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "February 17, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta04 .SH SYNOPSIS \fB #include \fP @@ -504,7 +504,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.17beta03 - February 17, 2015 + libpng version 1.6.17beta04 - February 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.17beta03 - February 17, 2015 + libpng versions 0.97, January 1998, through 1.6.17beta04 - February 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5785,7 +5785,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.17beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.17beta04 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 @@ -6037,7 +6037,7 @@ the first widely used release: 1.6.16beta01-03 16 10616 16.so.16.16[.0] 1.6.16rc01-02 16 10616 16.so.16.16[.0] 1.6.16 16 10616 16.so.16.16[.0] - 1.6.17beta01-03 16 10617 16.so.16.17[.0] + 1.6.17beta01-04 16 10617 16.so.16.17[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6094,7 +6094,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.17beta03 - February 17, 2015: +Libpng version 1.6.17beta04 - February 17, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6117,7 +6117,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.17beta03, February 17, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17beta04, February 17, 2015, are Copyright (c) 2004,2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/libpngpf.3 b/libpngpf.3 index 6cda9cfd3..10e9752f0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 17, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index dde8d231c..a006f4dde 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_17beta03 Your_png_h_is_not_version_1_6_17beta03; +typedef png_libpng_version_1_6_17beta04 Your_png_h_is_not_version_1_6_17beta04; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -772,13 +772,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.17beta03 - February 17, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.17beta04 - February 17, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.17beta03 - February 17, 2015\ + return "libpng version 1.6.17beta04 - February 17, 2015\ Copyright (c) 1998-2015 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 652aae286..ce9a5cdcf 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.17beta03, February 17, 2015 + * libpng version 1.6.17beta04, February 17, 2015 * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.17beta03, February 17, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.17beta04, February 17, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -212,7 +212,7 @@ * 1.6.16beta01-03 16 10616 16.so.16.16[.0] * 1.6.16rc01-02 16 10616 16.so.16.16[.0] * 1.6.16 16 10616 16.so.16.16[.0] - * 1.6.17beta01-03 16 10617 16.so.16.17[.0] + * 1.6.17beta01-04 16 10617 16.so.16.17[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -244,7 +244,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta03, February 17, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta04, February 17, 2015, are * Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -362,7 +362,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.17beta03 are Y2K compliant. It is my belief that + * upward through 1.6.17beta04 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 @@ -424,9 +424,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.17beta03" +#define PNG_LIBPNG_VER_STRING "1.6.17beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.17beta03 - February 17, 2015\n" + " libpng version 1.6.17beta04 - February 17, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -440,7 +440,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -570,7 +570,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_17beta03; +typedef char* png_libpng_version_1_6_17beta04; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 32da42eb9..9dfbe59a7 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.17beta03, (PENDING RELEASE) + * libpng version 1.6.17beta04, (PENDING RELEASE) * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngdebug.h b/pngdebug.h index b43c59cde..6a01b106e 100644 --- a/pngdebug.h +++ b/pngdebug.h @@ -1,12 +1,11 @@ /* pngdebug.h - Debugging macros for libpng, also used in pngtest.c * + * Last changed in libpng 1.6.8 [December 19, 2013] * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.8 [December 19, 2013] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h diff --git a/pnginfo.h b/pnginfo.h index 122a90a41..c8c874dd1 100644 --- a/pnginfo.h +++ b/pnginfo.h @@ -1,12 +1,11 @@ /* pnginfo.h - header file for PNG reference library * + * Last changed in libpng 1.6.1 [March 28, 2013] * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.1 [March 28, 2013] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h diff --git a/pngpriv.h b/pngpriv.h index 5b0213f42..3804ae9c8 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,13 +1,11 @@ /* pngpriv.h - private declarations for use inside libpng * - * For conditions of distribution and use, see copyright notice in png.h + * Last changed in libpng 1.6.17 [(PENDING RELEASE)] * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.17 [(PENDING RELEASE)] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h diff --git a/pngstruct.h b/pngstruct.h index 7f4de4910..8420d0997 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -1,12 +1,11 @@ /* pngstruct.h - header file for PNG reference library * + * Last changed in libpng 1.6.1 [March 28, 2013] * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.1 [March 28, 2013] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h diff --git a/pngtest.c b/pngtest.c index 5d09f1c6e..943d12b66 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2028,4 +2028,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_17beta03 Your_png_h_is_not_version_1_6_17beta03; +typedef png_libpng_version_1_6_17beta04 Your_png_h_is_not_version_1_6_17beta04; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index ac9f89cc1..d7343b053 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.17beta03 - February 17, 2015 +libpng version 1.6.17beta04 - February 17, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 9e44ae45f..355b22198 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@