diff --git a/ANNOUNCE b/ANNOUNCE index e593178f5..b42d15abf 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,36 +1,31 @@ -Libpng 1.5.26rc01 - December 14, 2015 +Libpng 1.5.26 - December 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. +This is a public release of libpng, intended for use in production codes. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.26rc01.tar.xz (LZMA-compressed, recommended) - 1.5.26rc01.tar.gz + libpng-1.5.26.tar.xz (LZMA-compressed, recommended) + libpng-1.5.26.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1526r01.7z (LZMA-compressed, recommended) - lp1526r01.zip + lpng1526.7z (LZMA-compressed, recommended) + lpng1526.zip Other information: - 1.5.26rc01-README.txt - 1.5.26rc01-LICENSE.txt - libpng-1.5.26rc01-*.asc (armored detached GPG signatures) + libpng-1.5.26-README.txt + libpng-1.5.26-LICENSE.txt + libpng-1.5.26-*.asc (armored detached GPG signatures) Changes since the last public release (1.5.25): - -version 1.5.26beta01 [December 11, 2015] Fixed an out-of-range read in png_check_keyword() (Bug report from Qixue Xiao, CVE-2015-8540). - -version 1.5.26rc01 [December 14, 2015] Corrected copyright dates in source files. Moved png_check_keyword() from pngwutil.c to pngset.c Added keyword checks to pngset.c (John Bowler). diff --git a/CHANGES b/CHANGES index 216754a65..02ab412f1 100644 --- a/CHANGES +++ b/CHANGES @@ -4451,6 +4451,9 @@ version 1.5.26rc01 [December 14, 2015] Moved png_check_keyword() from pngwutil.c to pngset.c Added keyword checks to pngset.c (John Bowler). +version 1.5.26 [December 17, 2015] + No changes. + 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 9949b42b9..51365a751 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.26rc01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.26 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index cad3ba892..ceeb3f782 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.5.26rc01, December 14, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.26, December 17, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -108,4 +108,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 14, 2015 +December 17, 2015 diff --git a/README b/README index 939f10597..bef1304f9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.26rc01 - December 14, 2015 (shared library 15.0) +README for libpng version 1.5.26 - December 17, 2015 (shared library 15.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 b/configure index 8db3909aa..e8a0a6840 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.5.26rc01. +# Generated by GNU Autoconf 2.69 for libpng 1.5.26. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.26rc01' -PACKAGE_STRING='libpng 1.5.26rc01' +PACKAGE_VERSION='1.5.26' +PACKAGE_STRING='libpng 1.5.26' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.5.26rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.26 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.26rc01:";; + short | recursive ) echo "Configuration of libpng 1.5.26:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.26rc01 +libpng configure 1.5.26 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2002,7 +2002,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.5.26rc01, which was +It was created by libpng $as_me 1.5.26, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2865,7 +2865,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.26rc01' + VERSION='1.5.26' cat >>confdefs.h <<_ACEOF @@ -2982,7 +2982,7 @@ fi -PNGLIB_VERSION=1.5.26rc01 +PNGLIB_VERSION=1.5.26 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=26 @@ -14124,7 +14124,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.5.26rc01, which was +This file was extended by libpng $as_me 1.5.26, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14190,7 +14190,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.5.26rc01 +libpng config.status 1.5.26 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 922364786..6d2ca0ccd 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.26rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.26], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.26rc01 +PNGLIB_VERSION=1.5.26 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=26 diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index cff84d426..070757c01 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1,7 +1,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.5.25 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [December 17, 2015] * Copyright (c) 2014-2015 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/libpng-manual.txt b/libpng-manual.txt index 63ddb98ec..ea85749d7 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.5.26rc01 - December 14, 2015 + libpng version 1.5.26 - December 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.5.26rc01 - December 14, 2015 + libpng versions 0.97, January 1998, through 1.5.26 - December 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4515,7 +4515,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.5.26rc01 are Y2K compliant. It is my belief that earlier +upward through 1.5.26 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 e46fe8ab0..f86c83661 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 14, 2015" +.TH LIBPNG 3 "December 17, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.26rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.26 .SH SYNOPSIS \fB #include \fP @@ -496,7 +496,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.5.26rc01 - December 14, 2015 + libpng version 1.5.26 - December 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -507,7 +507,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.26rc01 - December 14, 2015 + libpng versions 0.97, January 1998, through 1.5.26 - December 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5011,7 +5011,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.5.26rc01 are Y2K compliant. It is my belief that earlier +upward through 1.5.26 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 @@ -5166,7 +5166,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.26rc01 - December 14, 2015: +Libpng version 1.5.26 - December 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). @@ -5191,7 +5191,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.5.26rc01, December 14, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.26, December 17, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -5289,7 +5289,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 14, 2015 +December 17, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 93df8bea2..1c2e179a8 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 14, 2015" +.TH LIBPNGPF 3 "December 17, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.26rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.26 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 6ad904066..4f467f359 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 14, 2015" +.TH PNG 5 "December 17, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 23300f877..cd7da5922 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_5_26rc01 Your_png_h_is_not_version_1_5_26rc01; +typedef png_libpng_version_1_5_26 Your_png_h_is_not_version_1_5_26; /* 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 @@ -655,14 +655,14 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.26rc01 - December 14, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.5.26 - December 17, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-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.5.26rc01 - December 14, 2015\ + return "libpng version 1.5.26 - December 17, 2015\ Copyright (c) 1998-2002,2004,2006-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 df8f6e798..c4f2bab15 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.26rc01, December 14, 2015 + * libpng version 1.5.26, December 17, 2015 * * Copyright (c) 1998-2002,2004,2006-2015 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.5.26rc01, December 14, 2015: + * libpng versions 0.97, January 1998, through 1.5.26, December 17, 2015: * 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.5.26rc01, December 14, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.5.26, December 17, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -211,13 +211,13 @@ * Y2K compliance in libpng: * ========================= * - * December 14, 2015 + * December 17, 2015 * * 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.5.26rc01 are Y2K compliant. It is my belief that + * upward through 1.5.26 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 @@ -278,9 +278,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.26rc01" +#define PNG_LIBPNG_VER_STRING "1.5.26" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.26rc01 - December 14, 2015\n" + " libpng version 1.5.26 - December 17, 2015\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -294,7 +294,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -311,7 +311,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -441,7 +441,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_5_26rc01; +typedef char* png_libpng_version_1_5_26; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to diff --git a/pngconf.h b/pngconf.h index b3bcbdb2d..62588337d 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.26rc01, December 14, 2015 + * libpng version 1.5.26, December 17, 2015 * * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index c018033a7..8bdccccaf 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * Last changed in libpng 1.5.26 [(PENDING RELEASE)] + * Last changed in libpng 1.5.26 [December 17, 2015] * Copyright (c) 1998-2002,2004,2006-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.) diff --git a/pngrutil.c b/pngrutil.c index 2652ff9cb..632c5c8e0 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.5.25 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [December 17, 2015] * Copyright (c) 1998-2002,2004,2006-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.) diff --git a/pngset.c b/pngset.c index 58e5ec3e2..61be6bc62 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.5.26 [(PENDING RELEASE)] + * Last changed in libpng 1.5.26 [December 17, 2015] * Copyright (c) 1998-2002,2004,2006-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.) diff --git a/pngtest.c b/pngtest.c index c0338b755..5a470bbe6 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.5.25 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [December 17, 2015] * Copyright (c) 1998-2002,2004,2006-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.) @@ -2070,4 +2070,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_26rc01 Your_png_h_is_not_version_1_5_26rc01; +typedef png_libpng_version_1_5_26 Your_png_h_is_not_version_1_5_26; diff --git a/pngwutil.c b/pngwutil.c index f2caf421e..d5f097fb9 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.5.26 [(PENDING RELEASE)] + * Last changed in libpng 1.5.26 [December 17, 2015] * Copyright (c) 1998-2002,2004,2006-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.) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 3efd7dc9d..bc28dc5d6 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.26rc01 - December 14, 2015 +libpng version 1.5.26 - December 17, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 5f9c9e9cb..8977a271d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@