From 05ed18e7d187a87e27d0db31ceaea0ba8cc7401b Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 14 Jul 2012 17:05:58 -0500 Subject: [PATCH] [libpng16] Bump version to 1.6.0beta27 --- ANNOUNCE | 18 ++++++++++-------- CHANGES | 2 ++ CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 20 ++++++++++---------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 20 ++++++++++---------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ 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 | 2 +- scripts/symbols.def | 2 +- 24 files changed, 65 insertions(+), 61 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index db6cbec49..91bad57f2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta26 - July 10, 2012 +Libpng 1.6.0beta27 - July 14, 2012 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.0beta26.tar.xz (LZMA-compressed, recommended) - 1.6.0beta26.tar.gz - 1.6.0beta26.tar.bz2 + 1.6.0beta27.tar.xz (LZMA-compressed, recommended) + 1.6.0beta27.tar.gz + 1.6.0beta27.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp160b26.7z (LZMA-compressed, recommended) - lp160b26.zip + lp160b27.7z (LZMA-compressed, recommended) + lp160b27.zip Other information: - 1.6.0beta26-README.txt - 1.6.0beta26-LICENSE.txt + 1.6.0beta27-README.txt + 1.6.0beta27-LICENSE.txt Changes since the last public release (1.5.7): @@ -399,6 +399,8 @@ Version 1.6.0beta26 [July 10, 2012] Moved scripts/chkfmt to contrib/tools. Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386. +Version 1.6.0beta27 [July 14, 2012] + 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 651313d8a..b5c569b12 100644 --- a/CHANGES +++ b/CHANGES @@ -4150,6 +4150,8 @@ Version 1.6.0beta26 [July 10, 2012] Moved scripts/chkfmt to contrib/tools. Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386. +Version 1.6.0beta27 [July 14, 2012] + 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 52a050a60..5d6e987c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,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.0beta26 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0beta27 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 7af5394da..13b2e473c 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.0beta26, July 10, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta27, July 14, 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 -July 10, 2012 +July 14, 2012 diff --git a/README b/README index 21725929a..ba519e6bd 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta26 - July 10, 2012 (shared library 16.0) +README for libpng version 1.6.0beta27 - July 14, 2012 (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 d9307b724..ac0b7e389 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.0beta26],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0beta27],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -37,7 +37,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.0beta26 +PNGLIB_VERSION=1.6.0beta27 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 921f56931..cf80f80a8 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.0beta26 - July 10, 2012 + libpng version 1.6.0beta27 - July 14, 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.6.0beta26 - July 10, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta27 - July 14, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5019,13 +5019,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -July 10, 2012 +July 14, 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.6.0beta26 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta27 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 a9caa6369..3f24f4b23 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "July 10, 2012" +.TH LIBPNG 3 "July 14, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta26 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta27 .SH SYNOPSIS \fI\fB @@ -1007,7 +1007,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.0beta26 - July 10, 2012 + libpng version 1.6.0beta27 - July 14, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1018,7 +1018,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta26 - July 10, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta27 - July 14, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -6027,13 +6027,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -July 10, 2012 +July 14, 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.6.0beta26 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta27 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 @@ -6238,7 +6238,7 @@ the first widely used release: 1.5.7beta01-05 15 10507 15.so.15.7[.0] 1.5.7rc01-03 15 10507 15.so.15.7[.0] 1.5.7 15 10507 15.so.15.7[.0] - 1.6.0beta01-26 16 10600 16.so.16.0[.0] + 1.6.0beta01-27 16 10600 16.so.16.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6295,7 +6295,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta26 - July 10, 2012: +Libpng version 1.6.0beta27 - July 14, 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). @@ -6318,7 +6318,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta26, July 10, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta27, July 14, 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 @@ -6417,7 +6417,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 10, 2012 +July 14, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index a0235f810..bf9b2935b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "July 10, 2012" +.TH LIBPNGPF 3 "July 14, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta26 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta27 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index a597ddc1b..92750b171 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 10, 2012" +.TH PNG 5 "July 14, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 11573e9dc..a3c0f8e8a 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_0beta26 Your_png_h_is_not_version_1_6_0beta26; +typedef png_libpng_version_1_6_0beta27 Your_png_h_is_not_version_1_6_0beta27; /* 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 @@ -748,13 +748,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta26 - July 10, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta27 - July 14, 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.6.0beta26 - July 10, 2012\ + return "libpng version 1.6.0beta27 - July 14, 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 1e461beef..c736df079 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta26 - July 10, 2012 + * libpng version 1.6.0beta27 - July 14, 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.6.0beta26 - July 10, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta27 - July 14, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -166,7 +166,7 @@ * 1.5.7beta01-05 15 10507 15.so.15.7[.0] * 1.5.7rc01-03 15 10507 15.so.15.7[.0] * 1.5.7 15 10507 15.so.15.7[.0] - * 1.6.0beta01-26 16 10600 16.so.16.0[.0] + * 1.6.0beta01-27 16 10600 16.so.16.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -198,7 +198,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta26, July 10, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta27, July 14, 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: @@ -310,13 +310,13 @@ * Y2K compliance in libpng: * ========================= * - * July 10, 2012 + * July 14, 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.6.0beta26 are Y2K compliant. It is my belief that + * upward through 1.6.0beta27 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 @@ -376,9 +376,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.0beta26" +#define PNG_LIBPNG_VER_STRING "1.6.0beta27" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta26 - July 10, 2012\n" + " libpng version 1.6.0beta27 - July 14, 2012\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -392,7 +392,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 26 +#define PNG_LIBPNG_VER_BUILD 27 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -522,7 +522,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_0beta26; +typedef char* png_libpng_version_1_6_0beta27; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index fe2a4f0d6..694f089b6 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta26 - July 10, 2012 + * libpng version 1.6.0beta27 - July 14, 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 775227462..e1d55339c 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1692,4 +1692,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_6_0beta26 Your_png_h_is_not_version_1_6_0beta26; +typedef png_libpng_version_1_6_0beta27 Your_png_h_is_not_version_1_6_0beta27; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c944a9bd0..00486b5a0 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta26 - July 10, 2012 +libpng version 1.6.0beta27 - July 14, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index f627a2212..b9a6d5603 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@