From 326b623edbfb51bdffbe06afa322bbd4f00b4ce0 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 11 Dec 2015 09:46:07 -0600 Subject: [PATCH] [libpng12] Imported from libpng-1.2.56beta01.tar --- ANNOUNCE | 4 ++-- CHANGES | 4 ++-- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- Y2KINFO | 2 +- libpng-1.2.56beta01.txt | 4 ++-- libpng.3 | 12 ++++++------ libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- scripts/README.txt | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 1ccdb88c..9e7cca1e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.56beta01 - December 9, 2015 +Libpng 1.2.56beta01 - December 11, 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. @@ -41,7 +41,7 @@ Other information: Changes since the last public release (1.2.55): Fixed an out-of-range read in png_check_keyword() (Bug report from - Qixue Xiao). + Qixue Xiao, CVE-2015-8540). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index b2eac991..f8663bff 100644 --- a/CHANGES +++ b/CHANGES @@ -2909,9 +2909,9 @@ version 1.2.55rc01 [November 26, 2015] version 1.2.55 and 1.0.65 [December 6, 2015] Discontinued distributing libpng-oldversion-newversion-diff.txt -version 1.2.56beta01 [December 9, 2015] +version 1.2.56beta01 [December 11, 2015] Fixed an out-of-range read in png_check_keyword() (Bug report from - Qixue Xiao). + Qixue Xiao, CVE-2015-8540). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 0905e600..66e1af91 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.56beta01 - December 9, 2015 +Installing libpng version 1.2.56beta01 - December 11, 2015 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 08b23ce2..c33ce6ab 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.2.56beta01, December 9, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.2.56beta01, December 11, 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 @@ -107,4 +107,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 9, 2015 +December 11, 2015 diff --git a/README b/README index 4f0b64fe..8a9c47f9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.56beta01 - December 9, 2015 (shared library 12.0) +README for libpng version 1.2.56beta01 - December 11, 2015 (shared library 12.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/Y2KINFO b/Y2KINFO index 4348f8bd..140fcb6e 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,7 +1,7 @@ Y2K compliance in libpng: ========================= - December 9, 2015 + December 11, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng-1.2.56beta01.txt b/libpng-1.2.56beta01.txt index f94f6031..c15c1979 100644 --- a/libpng-1.2.56beta01.txt +++ b/libpng-1.2.56beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.56beta01 - December 9, 2015 + libpng version 1.2.56beta01 - December 11, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.56beta01 - December 9, 2015 + libpng versions 0.97, January 1998, through 1.2.56beta01 - December 11, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index de90d856..15c1f75f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "December 9, 2015" +.TH LIBPNG 3 "December 11, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.2.56beta01 .SH SYNOPSIS @@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.56beta01 - December 9, 2015 + libpng version 1.2.56beta01 - December 11, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -421,7 +421,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.56beta01 - December 9, 2015 + libpng versions 0.97, January 1998, through 1.2.56beta01 - December 11, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -3726,7 +3726,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.56beta01 - December 9, 2015: +Libpng version 1.2.56beta01 - December 11, 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). @@ -3751,7 +3751,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.2.56beta01, December 9, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.2.56beta01, December 11, 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 @@ -3848,7 +3848,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 9, 2015 +December 11, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c34d6c68..daf9d3e1 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "December 9, 2015" +.TH LIBPNGPF 3 "December 11, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.2.56beta01 (private functions) diff --git a/png.5 b/png.5 index 8b0fb17d..c9f89e52 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 9, 2015" +.TH PNG 5 "December 11, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 80385229..c903cffc 100644 --- a/png.c +++ b/png.c @@ -731,13 +731,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.2.56beta01 - December 9, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.2.56beta01 - December 11, 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 ((png_charp) "libpng version 1.2.56beta01 - December 9, 2015\ + return ((png_charp) "libpng version 1.2.56beta01 - December 11, 2015\ Copyright (c) 1998-2015 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 78903bab..f3da3937 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.56beta01, December 9, 2015 + * libpng version 1.2.56beta01, December 11, 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.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.56beta01, December 9, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.2.56beta01, December 11, 2015: Glenn * See also "Contributing Authors", below. */ @@ -24,7 +24,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.56beta01, December 9, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.56beta01, December 11, 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 @@ -208,7 +208,7 @@ * Y2K compliance in libpng: * ========================= * - * December 9, 2015 + * December 11, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -272,7 +272,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.2.56beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.56beta01 - December 9, 2015\n" + " libpng version 1.2.56beta01 - December 11, 2015\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 diff --git a/pngconf.h b/pngconf.h index 15b5f250..8968bee4 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.56beta01, December 9, 2015 + * libpng version 1.2.56beta01, December 11, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/README.txt b/scripts/README.txt index 6981c314..6131f6a4 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.2.56beta01 - December 9, 2015 +Makefiles for libpng version 1.2.56beta01 - December 11, 2015 makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.56beta01)