diff --git a/ANNOUNCE b/ANNOUNCE index 83347a0fa..17fc962d4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.11 - June 14, 2012 +Libpng 1.5.12 - July 11, 2012 This is a public release of libpng, intended for use in production codes. @@ -8,43 +8,26 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.5.11.tar.xz (LZMA-compressed, recommended) - libpng-1.5.11.tar.gz - libpng-1.5.11.tar.bz2 + libpng-1.5.12.tar.xz (LZMA-compressed, recommended) + libpng-1.5.12.tar.gz + libpng-1.5.12.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1511.7z (LZMA-compressed, recommended) - lpng1511.zip + lpng1512.7z (LZMA-compressed, recommended) + lpng1512.zip Other information: - libpng-1.5.11-README.txt - libpng-1.5.11-LICENSE.txt + libpng-1.5.12-README.txt + libpng-1.5.12-LICENSE.txt -Changes since the last public release (1.5.10): - Revised scripts/makefile.darwin: use system zlib; remove quotes around - architecture list; add missing ppc architecture; add architecture options - to shared library link; don't try to create a shared lib based on missing - RELEASE variable. - Enable png_set_check_for_invalid_index() for both read and write. - Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED/#endif in pngpriv.h around - declaration of png_handle_unknown(). - Added -lssp_nonshared in a comment in scripts/makefile.freebsd - and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE. - Revised CMakeLists.txt to not attempt to make a symlink under mingw. - Added two images to contrib/pngsuite (1-bit and 2-bit transparent grayscale), - and renamed three whose names were inconsistent with those in - pngsuite/README.txt. - Do not depend upon a GCC feature macro being available for use in generating - the linker mapfile symbol prefix. - Made fixes for new optimization warnings from gcc 4.7.0. The compiler - performed an optimization which is safe but then warned about it. - Changing the type of 'palette_number' in pngvalid.c removes the warning. - Improved efficiency of new do_check_palette_indexes() function. - Don't check palette indexes if num_palette is 0 (as it can be in MNG files). - Include zlib.h in contrib/gregbook and contrib/visupng examples. +Changes since the last public release (1.5.11): + + Removed scripts/makefile.cegcc from the *.zip and *.7z distributions; it + depends on configure, which is not included in those archives. + Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 16f2ebcf8..83f8f0846 100644 --- a/CHANGES +++ b/CHANGES @@ -3891,6 +3891,11 @@ Version 1.5.11rc05 [June 7, 2012] Version 1.5.11 [June 14, 2012] Include zlib.h in contrib/gregbook and contrib/visupng examples. +Version 1.5.12 [July 11, 2012] + Removed scripts/makefile.cegcc from the *.zip and *.7z distributions; it + depends on configure, which is not included in those archives. + Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386. + 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 27c3ea66d..318a1196c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 5) -set(PNGLIB_RELEASE 11) +set(PNGLIB_RELEASE 12) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -225,7 +225,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.11 +# VERSION 15.${PNGLIB_RELEASE}.1.5.12 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index e8e66ae7d..3a67d5458 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.5.11, June 14, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, are Copyright (c) 2004, 2006-2012 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 14, 2012 +July 11, 2012 diff --git a/Makefile.in b/Makefile.in index 2ff35f74a..9d086a6b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1116,7 +1116,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/README b/README index c8b437f4e..3f5b0d6b6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.11 - June 14, 2012 (shared library 15.0) +README for libpng version 1.5.12 - July 11, 2012 (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 deddd3e75..d751d5157 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.68 for libpng 1.5.11. +# Generated by GNU Autoconf 2.68 for libpng 1.5.12. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.11' -PACKAGE_STRING='libpng 1.5.11' +PACKAGE_VERSION='1.5.12' +PACKAGE_STRING='libpng 1.5.12' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1321,7 +1321,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.11 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,7 +1391,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.11:";; + short | recursive ) echo "Configuration of libpng 1.5.12:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.11 +libpng configure 1.5.12 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1925,7 +1925,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.11, which was +It was created by libpng $as_me 1.5.12, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2740,7 +2740,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.11' + VERSION='1.5.12' cat >>confdefs.h <<_ACEOF @@ -2804,10 +2804,10 @@ fi -PNGLIB_VERSION=1.5.11 +PNGLIB_VERSION=1.5.12 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=11 +PNGLIB_RELEASE=12 @@ -13417,7 +13417,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.11, which was +This file was extended by libpng $as_me 1.5.12, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13483,7 +13483,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.11 +libpng config.status 1.5.12 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4dc2a823d..beeeb812c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.11], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.12], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.11 +PNGLIB_VERSION=1.5.12 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=11 +PNGLIB_RELEASE=12 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index 16b4d23ad..1f960125e 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.11 - June 14, 2012 + libpng version 1.5.12 - July 11, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 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.11 - June 14, 2012 + libpng versions 0.97, January 1998, through 1.5.12 - July 11, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4602,13 +4602,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -June 14, 2012 +July 11, 2012 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.11 are Y2K compliant. It is my belief that earlier +upward through 1.5.12 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 that diff --git a/libpng.3 b/libpng.3 index c91f987fd..91afdbef9 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 14, 2012" +.TH LIBPNG 3 "July 11, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.12 .SH SYNOPSIS \fI\fB @@ -981,7 +981,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.11 - June 14, 2012 + libpng version 1.5.12 - July 11, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -992,7 +992,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.11 - June 14, 2012 + libpng versions 0.97, January 1998, through 1.5.12 - July 11, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5584,13 +5584,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -June 14, 2012 +July 11, 2012 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.11 are Y2K compliant. It is my belief that earlier +upward through 1.5.12 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 that @@ -5806,6 +5806,7 @@ the first widely used release: 1.5.11beta01 15 10511 15.so.15.11[.0] 1.5.11rc01-05 15 10511 15.so.15.11[.0] 1.5.11 15 10511 15.so.15.11[.0] + 1.5.12 15 10512 15.so.15.12[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5862,7 +5863,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.11 - June 14, 2012: +Libpng version 1.5.12 - July 11, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5885,7 +5886,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.11, June 14, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, are Copyright (c) 2004,2006-2007 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 @@ -5984,7 +5985,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 14, 2012 +July 11, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index b435bfed9..4b07ce3d4 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 14, 2012" +.TH LIBPNGPF 3 "July 11, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.12 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index d0511b3d0..36edd2ef5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 14, 2012" +.TH PNG 5 "July 11, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index aecfd5ca2..6808c5cb9 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_11 Your_png_h_is_not_version_1_5_11; +typedef png_libpng_version_1_5_12 Your_png_h_is_not_version_1_5_12; /* 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,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.11 - June 14, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.12 - July 11, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.11 - June 14, 2012\ + return "libpng version 1.5.12 - July 11, 2012\ Copyright (c) 1998-2012 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 b1c9e7243..4c37e58a4 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.11 - June 14, 2012 + * libpng version 1.5.12 - July 11, 2012 * Copyright (c) 1998-2012 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.5.11 - June 14, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.12 - July 11, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -177,6 +177,7 @@ * 1.5.11beta01 15 10511 15.so.15.11[.0] * 1.5.11rc01-05 15 10511 15.so.15.11[.0] * 1.5.11 15 10511 15.so.15.11[.0] + * 1.5.12 15 10512 15.so.15.12[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -208,7 +209,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.11, June 14, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, are * Copyright (c) 2004, 2006-2012 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: @@ -320,13 +321,13 @@ * Y2K compliance in libpng: * ========================= * - * June 14, 2012 + * July 11, 2012 * * 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.11 are Y2K compliant. It is my belief that + * upward through 1.5.12 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 @@ -385,9 +386,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.11" +#define PNG_LIBPNG_VER_STRING "1.5.12" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.11 - June 14, 2012\n" + " libpng version 1.5.12 - July 11, 2012\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -395,7 +396,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 5 -#define PNG_LIBPNG_VER_RELEASE 11 +#define PNG_LIBPNG_VER_RELEASE 12 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: @@ -426,7 +427,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10511 /* 1.5.11 */ +#define PNG_LIBPNG_VER 10512 /* 1.5.12 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -548,7 +549,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_11; +typedef char* png_libpng_version_1_5_12; /* 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 314fcc6ff..5c3eb1454 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.11 - June 14, 2012 + * libpng version 1.5.12 - July 11, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 12af28dbb..3de363cdc 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1817,4 +1817,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_11 Your_png_h_is_not_version_1_5_11; +typedef png_libpng_version_1_5_12 Your_png_h_is_not_version_1_5_12; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index a5fc9e953..f458c026b 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.11 - June 14, 2012 +libpng version 1.5.12 - July 11, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c3d775835..801a2ae51 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@