diff --git a/ANNOUNCE b/ANNOUNCE index d5e79ef1a..0e522cc55 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,57 +1,32 @@ -Libpng 1.6.8 - December 19, 2013 +Libpng 1.6.9beta01 - December 19, 2013 -This is a public release of libpng, intended for use in production codes. +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. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.6.8.tar.xz (LZMA-compressed, recommended) - libpng-1.6.8.tar.gz + 1.6.9beta01.tar.xz (LZMA-compressed, recommended) + 1.6.9beta01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng168.7z (LZMA-compressed, recommended) - lpng168.zip + lp169b01.7z (LZMA-compressed, recommended) + lp169b01.zip Other information: - libpng-1.6.8-README.txt - libpng-1.6.8-LICENSE.txt + 1.6.9beta01-README.txt + 1.6.9beta01-LICENSE.txt Gnupg/*.asc (PGP armored detached signatures) -Changes since the last public release (1.6.7): - Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to - #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with - what is in pngpriv.h. - Moved prototype for png_handle_unknown() in pngpriv.h outside of - the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. - Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile - Conditionally compile some unused functions reported by -Wall in - pngminim. - Fixed 'minimal' builds. Various obviously useful minimal configurations - don't build because of missing contrib/libtests test programs and - overly complex dependencies in scripts/pnglibconf.dfa. This change - adds contrib/conftest/*.dfa files that can be used in automatic build - scripts to ensure that these configurations continue to build. - Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder. - Fixed pngvalid 'fail' function declaration on the Intel C Compiler. - This reverts to the previous 'static' implementation and works round - the 'unused static function' warning by using PNG_UNUSED(). - Removed or marked PNG_UNUSED some harmless "dead assignments" reported - by clang scan-build. - Changed tabs to 3 spaces in png_debug macros and changed '"%s"m' - to '"%s" m' to improve portability among compilers. - Changed png_free_default() to free() in pngtest.c - Tidied up pngfix inits and fixed pngtest no-write builds. - Handle zero-length PLTE chunk or NULL palette with png_error() - instead of png_chunk_report(), which by default issues a warning - rather than an error, leading to later reading from a NULL pointer - (png_ptr->palette) in png_do_expand_palette(). This is CVE-2013-6954 - and VU#650142. +Changes since the last public release (1.6.8): + +Version 1.6.9beta01 [December 19, 2013] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 4913e25d0..c77e7ebb1 100644 --- a/CHANGES +++ b/CHANGES @@ -4748,6 +4748,9 @@ Version 1.6.8rc02 [December 14, 2013] and VU#650142. Version 1.6.8 [December 19, 2013] + No changes. + +Version 1.6.9beta01 [December 19, 2013] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index ac628bdc1..ec3d7993f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 8) +set(PNGLIB_RELEASE 9) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -252,7 +252,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.8 +# VERSION 16.${PNGLIB_RELEASE}.1.6.9beta01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index ad4493b74..28c4557d9 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.8, December 19, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.9beta01, December 19, 2013, are Copyright (c) 2004, 2006-2013 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 840d6c3e0..925d8489b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.8 - December 19, 2013 (shared library 16.0) +README for libpng version 1.6.9beta01 - December 19, 2013 (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 a458bbdf9..ac7c0114d 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.8],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.9beta01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,10 +39,10 @@ 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.8 +PNGLIB_VERSION=1.6.9beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=8 +PNGLIB_RELEASE=9 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index ac0ff1b49..b7ac3e735 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.8 - December 19, 2013 + libpng version 1.6.9beta01 - December 19, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.8 - December 19, 2013 + libpng versions 0.97, January 1998, through 1.6.9beta01 - December 19, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5239,7 +5239,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.8 are Y2K compliant. It is my belief that earlier +upward through 1.6.9beta01 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 da9c93087..902ffb14c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "December 19, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.8 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.9beta01 .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.8 - December 19, 2013 + libpng version 1.6.9beta01 - December 19, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.8 - December 19, 2013 + libpng versions 0.97, January 1998, through 1.6.9beta01 - December 19, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5744,7 +5744,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.8 are Y2K compliant. It is my belief that earlier +upward through 1.6.9beta01 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 @@ -5972,6 +5972,7 @@ the first widely used release: 1.6.8beta01-02 16 10608 16.so.16.8[.0] 1.6.8rc01-02 16 10608 16.so.16.8[.0] 1.6.8 16 10608 16.so.16.8[.0] + 1.6.8beta01 16 10609 16.so.16.9[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6028,7 +6029,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.8 - December 19, 2013: +Libpng version 1.6.9beta01 - December 19, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6051,7 +6052,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.8, December 19, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.9beta01, December 19, 2013, 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 diff --git a/libpngpf.3 b/libpngpf.3 index 38e82d94e..da9928ef7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "December 19, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.8 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.9beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index d77197a07..a123ce0fb 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_8 Your_png_h_is_not_version_1_6_8; +typedef png_libpng_version_1_6_9beta01 Your_png_h_is_not_version_1_6_9beta01; /* 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 @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.8 - December 19, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.9beta01 - December 19, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.8 - December 19, 2013\ + return "libpng version 1.6.9beta01 - December 19, 2013\ Copyright (c) 1998-2013 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 00eddac0e..a6e699cf5 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.8 - December 19, 2013 + * libpng version 1.6.9beta01 - 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.) @@ -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.8 - December 19, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.9beta01 - December 19, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -189,6 +189,7 @@ * 1.6.8beta01-02 16 10608 16.so.16.8[.0] * 1.6.8rc01-02 16 10608 16.so.16.8[.0] * 1.6.8 16 10608 16.so.16.8[.0] + * 1.6.9beta01 16 10609 16.so.16.9[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -220,7 +221,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.8, December 19, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.9beta01, December 19, 2013, are * Copyright (c) 2004, 2006-2013 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: @@ -338,7 +339,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.8 are Y2K compliant. It is my belief that + * upward through 1.6.9beta01 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 @@ -398,9 +399,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.8" +#define PNG_LIBPNG_VER_STRING "1.6.9beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.8 - December 19, 2013\n" + " libpng version 1.6.9beta01 - December 19, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -408,13 +409,13 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 8 +#define PNG_LIBPNG_VER_RELEASE 9 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -431,7 +432,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_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -439,7 +440,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 10608 /* 1.6.8 */ +#define PNG_LIBPNG_VER 10609 /* 1.6.9 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -544,7 +545,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_8; +typedef char* png_libpng_version_1_6_9beta01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 587d0edc9..d4e130ce0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.8 - December 19, 2013 + * libpng version 1.6.9beta01 - December 19, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index b37b35856..0291893b9 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1970,4 +1970,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_8 Your_png_h_is_not_version_1_6_8; +typedef png_libpng_version_1_6_9beta01 Your_png_h_is_not_version_1_6_9beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 70ffa51c4..804d3f894 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.8 - December 19, 2013 +libpng version 1.6.9beta01 - December 19, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c540c9501..be842478f 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@