diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-11-26 00:03:27 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-11-26 07:04:16 -0600 |
commit | 3a1a5256fad719cf9761d53b326c7c1ab646946f (patch) | |
tree | 680dc94af0671636bda1d0c845080737a5317e91 | |
parent | b5da27d2115fcbce33c957311c96440ec698ffaa (diff) | |
download | libpng-1.5.25rc01.tar.gz |
[libpng15] Imported from libpng-1.5.25rc01.tarv1.5.25rc01
-rw-r--r-- | ANNOUNCE | 27 | ||||
-rw-r--r-- | CHANGES | 10 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rwxr-xr-x | configure | 22 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | contrib/gregbook/rpng2-x.c | 4 | ||||
-rw-r--r-- | libpng-manual.txt | 6 | ||||
-rw-r--r-- | libpng.3 | 18 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | png.h | 22 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 10 | ||||
-rw-r--r-- | scripts/def.c | 2 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/pnglibconf.h.prebuilt | 4 | ||||
-rw-r--r-- | scripts/symbols.def | 2 |
27 files changed, 88 insertions, 81 deletions
@@ -1,5 +1,5 @@ -Libpng 1.5.25beta03 - November 24, 2015 +Libpng 1.5.25rc01 - November 26, 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. @@ -9,21 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.25beta03.tar.xz (LZMA-compressed, recommended) - 1.5.25beta03.tar.gz - 1.5.25beta03.tar.bz2 + 1.5.25rc01.tar.xz (LZMA-compressed, recommended) + 1.5.25rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1525b03.7z (LZMA-compressed, recommended) - lp1525b03.zip + lp1525r01.7z (LZMA-compressed, recommended) + lp1525r01.zip Other information: - 1.5.25beta03-README.txt - 1.5.25beta03-LICENSE.txt - libpng-1.5.25beta03-*.asc (armored detached GPG signatures) + 1.5.25rc01-README.txt + 1.5.25rc01-LICENSE.txt + libpng-1.5.25rc01-*.asc (armored detached GPG signatures) Changes since the last public release (1.5.24): @@ -32,12 +31,16 @@ version 1.5.25beta01 [November 20, 2015] png_handle_sPLT(), and png_handle_pCAL() (Bug report by John Regehr). version 1.5.25beta02 [November 23, 2015] - Fixed bug recently introduced in png_set_PLTE() that uses png_ptr - not info_ptr. + Fixed incorrect implementation of png_set_PLTE() that uses png_ptr + not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126 + vulnerability. -version 1.5.25beta03 [(PENDING RELEASE)] +version 1.5.25beta03 [November 24, 2015] Backported tests from libpng-1.7.0beta69. +version 1.5.25rc01 [November 26, 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 @@ -4429,12 +4429,16 @@ version 1.5.25beta01 [November 20, 2015] png_handle_sPLT(), and png_handle_pCAL() (Bug report by John Regehr). version 1.5.25beta02 [November 23, 2015] - Fixed bug recently introduced in png_set_PLTE() that uses png_ptr - not info_ptr. + Fixed incorrect implementation of png_set_PLTE() that uses png_ptr + not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126 + vulnerability. -version 1.5.25beta03 [(PENDING RELEASE)] +version 1.5.25beta03 [November 24, 2015] Backported tests from libpng-1.7.0beta69. +version 1.5.25rc01 [November 26, 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 176205da9..dd6c64c57 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.25beta03 +# VERSION 15.${PNGLIB_RELEASE}.1.5.25rc01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) @@ -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.25beta03, November 24, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.25rc01, November 26, 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 -November 24, 2015 +November 26, 2015 @@ -1,4 +1,4 @@ -README for libpng version 1.5.25beta03 - November 24, 2015 (shared library 15.0) +README for libpng version 1.5.25rc01 - November 26, 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. @@ -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.25beta03. +# Generated by GNU Autoconf 2.69 for libpng 1.5.25rc01. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.25beta03' -PACKAGE_STRING='libpng 1.5.25beta03' +PACKAGE_VERSION='1.5.25rc01' +PACKAGE_STRING='libpng 1.5.25rc01' 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.25beta03 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.25rc01 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.25beta03:";; + short | recursive ) echo "Configuration of libpng 1.5.25rc01:";; 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.25beta03 +libpng configure 1.5.25rc01 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.25beta03, which was +It was created by libpng $as_me 1.5.25rc01, 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.25beta03' + VERSION='1.5.25rc01' cat >>confdefs.h <<_ACEOF @@ -2982,7 +2982,7 @@ fi -PNGLIB_VERSION=1.5.25beta03 +PNGLIB_VERSION=1.5.25rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=25 @@ -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.25beta03, which was +This file was extended by libpng $as_me 1.5.25rc01, 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.25beta03 +libpng config.status 1.5.25rc01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 029a5ee5a..5812a77cf 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.25beta03], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.25rc01], [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.25beta03 +PNGLIB_VERSION=1.5.25rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=25 diff --git a/contrib/gregbook/rpng2-x.c b/contrib/gregbook/rpng2-x.c index eea95fbd4..0c8ddeba2 100644 --- a/contrib/gregbook/rpng2-x.c +++ b/contrib/gregbook/rpng2-x.c @@ -496,12 +496,12 @@ int main(int argc, char **argv) "\t\t transparent images; overrides -bgcolor\n", num_bgpat-1); #ifdef FEATURE_LOOP - fprintf(stderr, + fprintf(stderr, " -loop\tloops through background images after initial display\n" "\t\t is complete (depends on -bgpat)\n" " sec \tseconds to display each background image (default = 2)\n"); #endif - fprintf(stderr, + fprintf(stderr, " dur \tduration in microseconds to wait after displaying each\n" "\t\t row (for demo purposes)\n" " -timing\tenables delay for every block read, to simulate modem\n" diff --git a/libpng-manual.txt b/libpng-manual.txt index e13c15661..4bb0dc164 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.25beta03 - November 24, 2015 + libpng version 1.5.25rc01 - November 26, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.25beta03 - November 24, 2015 + libpng versions 0.97, January 1998, through 1.5.25rc01 - November 26, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4510,7 +4510,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.25beta03 are Y2K compliant. It is my belief that earlier +upward through 1.5.25rc01 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 24, 2015" +.TH LIBPNG 3 "November 26, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25rc01 .SH SYNOPSIS \fB #include <png.h>\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.25beta03 - November 24, 2015 + libpng version 1.5.25rc01 - November 26, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.25beta03 - November 24, 2015 + libpng versions 0.97, January 1998, through 1.5.25rc01 - November 26, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5006,7 +5006,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.25beta03 are Y2K compliant. It is my belief that earlier +upward through 1.5.25rc01 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 @@ -5105,7 +5105,7 @@ the first widely used release: ... 1.2.53 13 10253 12.so.0.53[.0] ... - 1.5.24 15 10524 15.so.15.24[.0] + 1.5.25 15 10525 15.so.15.25[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5161,7 +5161,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.25beta03 - November 24, 2015: +Libpng version 1.5.25rc01 - November 26, 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). @@ -5186,7 +5186,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.5.25beta03, November 24, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.25rc01, November 26, 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 @@ -5284,7 +5284,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 24, 2015 +November 26, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index ded9d4991..d5bd73796 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 24, 2015" +.TH LIBPNGPF 3 "November 26, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" @@ -1,4 +1,4 @@ -.TH PNG 5 "November 24, 2015" +.TH PNG 5 "November 26, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_25beta03 Your_png_h_is_not_version_1_5_25beta03; +typedef png_libpng_version_1_5_25rc01 Your_png_h_is_not_version_1_5_25rc01; /* 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.25beta03 - November 24, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.5.25rc01 - November 26, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-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.25beta03 - November 24, 2015\ + return "libpng version 1.5.25rc01 - November 26, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.25beta03, November 24, 2015 + * libpng version 1.5.25rc01, November 26, 2015 * * Copyright (c) 1998-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.25beta03, November 24, 2015: + * libpng versions 0.97, January 1998, through 1.5.25rc01, November 26, 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.25beta03, November 24, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.5.25rc01, November 26, 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 @@ -183,7 +183,7 @@ * ... * 1.2.53 13 10253 12.so.0.53[.0] * ... - * 1.5.24 15 10524 15.so.15.24[.0] + * 1.5.25 15 10525 15.so.15.25[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -211,13 +211,13 @@ * Y2K compliance in libpng: * ========================= * - * November 24, 2015 + * November 26, 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.25beta03 are Y2K compliant. It is my belief that + * upward through 1.5.25rc01 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.25beta03" +#define PNG_LIBPNG_VER_STRING "1.5.25rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.25beta03 - November 24, 2015\n" + " libpng version 1.5.25rc01 - November 26, 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 03 +#define PNG_LIBPNG_VER_BUILD 01 /* 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_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* 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_25beta03; +typedef char* png_libpng_version_1_5_25rc01; /* 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 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.25beta03, November 24, 2015 + * libpng version 1.5.25rc01, November 26, 2015 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -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_25beta03 Your_png_h_is_not_version_1_5_25beta03; +typedef png_libpng_version_1_5_25rc01 Your_png_h_is_not_version_1_5_25rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b24fd6f6f..367eb3ea2 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.25beta03 - November 24, 2015 +libpng version 1.5.25rc01 - November 26, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 4ec6152f3..648d6d5e1 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.5.25beta03 - November 24, 2015 + * libpng version 1.5.25rc01 - November 26, 2015 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index e196e8447..36735cdff 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.5.25beta03 - November 24, 2015 +Makefiles for libpng version 1.5.25rc01 - November 26, 2015 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng15.so.15.1.5.25beta03) + (gcc, creates libpng15.so.15.1.5.25rc01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -34,12 +34,12 @@ pnglibconf.h.prebuilt => Stores configuration settings makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng15.so.15.1.5.25beta03) + creates libpng15.so.15.1.5.25rc01) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng15.so.15.1.5.25beta03) + creates libpng15.so.15.1.5.25rc01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng15.so.15.1.5.25beta03) + creates libpng15.so.15.1.5.25rc01) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile diff --git a/scripts/def.c b/scripts/def.c index aa42faeb8..df4577086 100644 --- a/scripts/def.c +++ b/scripts/def.c @@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library"" PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE" PNG_DFN "" PNG_DFN "EXPORTS" -PNG_DFN ";Version 1.5.25beta03" +PNG_DFN ";Version 1.5.25rc01" #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ PNG_DFN "@" SYMBOL_PREFIX "@@" name "@" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 4d819a8fe..89c28f275 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.5.25beta03 +version=1.5.25rc01 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index f6908664f..d2c62c2ee 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng15 Name: libpng Description: Loads and saves PNG files -Version: 1.5.25beta03 +Version: 1.5.25rc01 Libs: -L${libdir} -lpng15 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index ce5585144..2e2a95492 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15 LIB= png15 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.5.25beta03 +SHLIB_MINOR= 1.5.25rc01 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 8c69c1896..dffd623a3 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 15 -SHLIB_MINOR= 1.5.25beta03 +SHLIB_MINOR= 1.5.25rc01 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index d99fa6632..f9e38efa6 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 15 -SHLIB_MINOR= 1.5.25beta03 +SHLIB_MINOR= 1.5.25rc01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 2741ac4a6..df603751c 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,7 +1,7 @@ -/* 1.5.25beta03 STANDARD API DEFINITION */ +/* 1.5.25rc01 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.25beta03 - November 24, 2015 */ +/* libpng version 1.5.25rc01 - November 26, 2015 */ /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ diff --git a/scripts/symbols.def b/scripts/symbols.def index 9abdaf0a4..e9f2a1002 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -1,4 +1,4 @@ -;Version 1.5.25beta03 +;Version 1.5.25rc01 ;-------------------------------------------------------------- ; LIBPNG symbol list as a Win32 DEF file ; Contains all the symbols that can be exported from libpng |