From 448fad2d02c0d08f6d61233c175e0e9f0a65f534 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 30 Dec 2016 08:18:28 -0600 Subject: [PATCH] [libpng17] Bump version to 1.7.0beta87 --- ANNOUNCE | 18 ++++++++++-------- CHANGES | 2 ++ CMakeLists.txt | 2 +- LICENSE | 6 +++--- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 16 ++++++++-------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 12 ++++++------ png.h | 22 +++++++++++----------- pngconf.h | 2 +- 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 +- 25 files changed, 68 insertions(+), 64 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 9e2190743..35bf14fd3 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta86 - December 29, 2016 +Libpng 1.7.0beta87 - December 30, 2016 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.7.0beta86.tar.xz (LZMA-compressed, recommended) - 1.7.0beta86.tar.gz + 1.7.0beta87.tar.xz (LZMA-compressed, recommended) + 1.7.0beta87.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - /scratch/glennrp/Libpng17/lp170b86.7z (LZMA-compressed, recommended) - /scratch/glennrp/Libpng17/lp170b86.zip + /scratch/glennrp/Libpng17/lp170b87.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng17/lp170b87.zip Other information: - 1.7.0beta86-README.txt - 1.7.0beta86-LICENSE.txt - libpng-1.7.0beta86-*.asc (armored detached GPG signatures) + 1.7.0beta87-README.txt + 1.7.0beta87-LICENSE.txt + libpng-1.7.0beta87-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -1423,6 +1423,8 @@ Version 1.7.0beta86 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report and patch by Patrick Keshishian). +Version 1.7.0beta87 [December 30, 2016] + 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 c49740d7c..4c17d6938 100644 --- a/CHANGES +++ b/CHANGES @@ -5723,6 +5723,8 @@ Version 1.7.0beta86 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report and patch by Patrick Keshishian). +Version 1.7.0beta87 [December 30, 2016] + 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 fff83ff0d..22f3f3d6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -728,7 +728,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta86 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta87 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b87ea6ffb..7202ce8c0 100644 --- a/LICENSE +++ b/LICENSE @@ -10,8 +10,8 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta86, December 29, 2016, are -Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta87, December 30, 2016, are +Copyright (c) 2000-2002, 2004, 2006-2017 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 added to the list of Contributing Authors: @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 29, 2016 +December 30, 2016 diff --git a/README b/README index 5e69ebe5e..24bf0afb5 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta86 - December 29, 2016 (shared library 17.0) +README for libpng version 1.7.0beta87 - December 30, 2016 (shared library 17.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 140e329f1..98ce00399 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.7.0beta86],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta87],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -48,7 +48,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.7.0beta86 +PNGLIB_VERSION=1.7.0beta87 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 77d5b30e8..11f53fe3f 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.7.0beta86 - December 29, 2016 + libpng version 1.7.0beta87 - December 30, 2016 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.7.0beta86 - December 29, 2016 + libpng versions 0.97, January 1998, through 1.7.0beta87 - December 30, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5361,7 +5361,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.7.0beta86 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta87 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 44dc3db0a..6914fc25a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 29, 2016" +.TH LIBPNG 3 "December 30, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta86 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta87 .SH SYNOPSIS \fB #include \fP @@ -500,7 +500,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.7.0beta86 - December 29, 2016 + libpng version 1.7.0beta87 - December 30, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -511,7 +511,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta86 - December 29, 2016 + libpng versions 0.97, January 1998, through 1.7.0beta87 - December 30, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5861,7 +5861,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.7.0beta86 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta87 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 @@ -6021,7 +6021,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta86 - December 29, 2016: +Libpng version 1.7.0beta87 - December 30, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6046,7 +6046,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta86, December 29, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta87, December 30, 2016, are Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -6145,7 +6145,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 29, 2016 +December 30, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 7ab74515b..bd43a355d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 29, 2016" +.TH LIBPNGPF 3 "December 30, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta86 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta87 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 38b29e5e0..e13626586 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 29, 2016" +.TH PNG 5 "December 30, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index ca647ffdb..b4266cf79 100644 --- a/png.c +++ b/png.c @@ -2,7 +2,7 @@ /* png.c - location for general purpose libpng functions * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson + * Copyright (c) 1998-2002,2004,2006-2017 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.) * @@ -15,7 +15,7 @@ #define PNG_SRC_FILE PNG_SRC_FILE_png /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_7_0beta86 Your_png_h_is_not_version_1_7_0beta86; +typedef png_libpng_version_1_7_0beta87 Your_png_h_is_not_version_1_7_0beta87; /* 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 @@ -705,15 +705,15 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta86 - December 29, 2016" PNG_STRING_NEWLINE \ - "Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \ + "libpng version 1.7.0beta87 - December 30, 2016" PNG_STRING_NEWLINE \ + "Copyright (c) 1998-2002,2004,2006-2017 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.7.0beta86 - December 29, 2016\ - Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\ + return "libpng version 1.7.0beta87 - December 30, 2016\ + Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; # endif diff --git a/png.h b/png.h index da20e3135..9533c2393 100644 --- a/png.h +++ b/png.h @@ -1,9 +1,9 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta86, December 29, 2016 + * libpng version 1.7.0beta87, December 30, 2016 * - * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson + * Copyright (c) 1998-2002,2004,2006-2017 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.) * @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta86, December 29, 2016: + * libpng versions 0.97, January 1998, through 1.7.0beta87, December 30, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,8 +25,8 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta86, December 29, 2016, are - * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are + * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta87, December 30, 2016, are + * Copyright (c) 2000-2002, 2004, 2006-2017 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 * added to the list of Contributing Authors: @@ -217,13 +217,13 @@ * Y2K compliance in libpng: * ========================= * - * December 29, 2016 + * December 30, 2016 * * 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.7.0beta86 are Y2K compliant. It is my belief that + * upward through 1.7.0beta87 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 @@ -285,8 +285,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0beta86" -#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta86 - December 29, 2016\n" +#define PNG_LIBPNG_VER_STRING "1.7.0beta87" +#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta87 - December 30, 2016\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -300,7 +300,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 86 +#define PNG_LIBPNG_VER_BUILD 87 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -560,7 +560,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_7_0beta86; +typedef char* png_libpng_version_1_7_0beta87; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index db19ed9f9..a41606972 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta86, December 29, 2016 + * libpng version 1.7.0beta87, December 30, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 46a70fd39..dd58cf781 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2083,4 +2083,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_7_0beta86 Your_png_h_is_not_version_1_7_0beta86; +typedef png_libpng_version_1_7_0beta87 Your_png_h_is_not_version_1_7_0beta87; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index f8a0c9e6c..04d327689 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta86 - December 29, 2016 +libpng version 1.7.0beta87 - December 30, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 7cd700e60..3d140b957 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@