From 0a158f3506502dfa23edfc42790dfaed82efba17 Mon Sep 17 00:00:00 2001 From: Cosmin Truta Date: Wed, 14 Sep 2022 22:42:00 +0300 Subject: Release libpng version 1.6.38 --- ANNOUNCE | 37 +++++++++++-------------------------- CHANGES | 6 +++++- CMakeLists.txt | 4 ++-- README | 4 ++-- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 10 +++++----- libpngpf.3 | 4 ++-- png.5 | 6 +++--- png.c | 4 ++-- png.h | 18 +++++++++--------- pngconf.h | 2 +- pngtest.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.darwin | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.msys | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 22 files changed, 67 insertions(+), 78 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 83bf76ebb..9c9bb1891 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,13 +1,5 @@ -libpng 1.6.38.git -================= - -This is a development version, not intended to be a public release. -It will be replaced by a public release, or by another development -version, at a later time. - - -libpng 1.6.37 - April 14, 2019 -============================== +libpng 1.6.38 - September 14, 2022 +================================== This is a public release of libpng, intended for use in production code. @@ -17,13 +9,13 @@ Files available for download Source files with LF line endings (for Unix/Linux): - * libpng-1.6.37.tar.xz (LZMA-compressed, recommended) - * libpng-1.6.37.tar.gz + * libpng-1.6.38.tar.xz (LZMA-compressed, recommended) + * libpng-1.6.38.tar.gz Source files with CRLF line endings (for Windows): - * lp1637.7z (LZMA-compressed, recommended) - * lp1637.zip + * lp1638.7z (LZMA-compressed, recommended) + * lp1638.zip Other information: @@ -33,20 +25,13 @@ Other information: * TRADEMARK.md -Changes since the previous public release (version 1.6.36) +Changes since the previous public release (version 1.6.37) ---------------------------------------------------------- - * Fixed a use-after-free vulnerability (CVE-2019-7317) in png_image_free. - * Fixed a memory leak in the ARM NEON implementation of png_do_expand_palette. - * Fixed a memory leak in pngtest.c. - * Fixed two vulnerabilities (CVE-2018-14048, CVE-2018-14550) in - contrib/pngminus; refactor. - * Changed the license of contrib/pngminus to MIT; refresh makefile and docs. - (Contributed by Willem van Schaik) - * Fixed a typo in the libpng license v2. - (Contributed by Miguel Ojeda) - * Added makefiles for AddressSanitizer-enabled builds. - * Cleaned up various makefiles. + * Added configurations and scripts for continuous integration. + * Fixed various errors in the handling of tRNS, hIST and eXIf. + * Implemented many stability improvements across all platforms. + * Updated the internal documentation. Send comments/corrections/commendations to png-mng-implement at lists.sf.net. diff --git a/CHANGES b/CHANGES index 9aefd8923..9a8686968 100644 --- a/CHANGES +++ b/CHANGES @@ -6103,7 +6103,11 @@ Version 1.6.37 [April 14, 2019] Added makefiles for AddressSanitizer-enabled builds. Cleaned up various makefiles. -Version 1.6.38 [TODO] +Version 1.6.38 [September 14, 2022] + Added configurations and scripts for continuous integration. + Fixed various errors in the handling of tRNS, hIST and eXIf. + Implemented many stability improvements across all platforms. + Updated the internal documentation. Send comments/corrections/commendations to png-mng-implement at lists.sf.net. Subscription is required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index eeb0157cd..8652564b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,8 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) set(PNGLIB_REVISION 38) -#set(PNGLIB_SUBREVISION 0) -set(PNGLIB_SUBREVISION "git") +set(PNGLIB_SUBREVISION 0) +#set(PNGLIB_SUBREVISION "git") set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_REVISION}) set(PNGLIB_SHARED_SOVERSION ${PNGLIB_MAJOR}${PNGLIB_MINOR}) diff --git a/README b/README index f46a59972..e6e72aa54 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -README for libpng version 1.6.38.git -==================================== +README for libpng version 1.6.38 +================================ 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 b/configure index cf2e63275..b66bb113a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libpng 1.6.38.git. +# Generated by GNU Autoconf 2.71 for libpng 1.6.38. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.6.38.git' -PACKAGE_STRING='libpng 1.6.38.git' +PACKAGE_VERSION='1.6.38' +PACKAGE_STRING='libpng 1.6.38' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1411,7 +1411,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.6.38.git to adapt to many kinds of systems. +\`configure' configures libpng 1.6.38 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.6.38.git:";; + short | recursive ) echo "Configuration of libpng 1.6.38:";; esac cat <<\_ACEOF @@ -1663,7 +1663,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.6.38.git +libpng configure 1.6.38 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1919,7 +1919,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.6.38.git, which was +It was created by libpng $as_me 1.6.38, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3196,7 +3196,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.6.38.git' + VERSION='1.6.38' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3328,7 +3328,7 @@ fi -PNGLIB_VERSION=1.6.38.git +PNGLIB_VERSION=1.6.38 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=38 @@ -14894,7 +14894,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.6.38.git, which was +This file was extended by libpng $as_me 1.6.38, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14962,7 +14962,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libpng config.status 1.6.38.git +libpng config.status 1.6.38 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f12da2672..7b6d5b929 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.38.git],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.38],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,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.38.git +PNGLIB_VERSION=1.6.38 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=38 diff --git a/libpng-manual.txt b/libpng-manual.txt index 6d8e8eb88..19b1e0c35 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 - Copyright (c) 2018-2019 Cosmin Truta + Copyright (c) 2018-2022 Cosmin Truta Copyright (c) 1998-2018 Glenn Randers-Pehrson This document is released under the libpng license. @@ -9,9 +9,9 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng version 1.6.36, December 2018, through 1.6.37 - April 2019 + libpng version 1.6.36, December 2018, through 1.6.38 - September 2022 Updated and distributed by Cosmin Truta - Copyright (c) 2018-2019 Cosmin Truta + Copyright (c) 2018-2022 Cosmin Truta libpng versions 0.97, January 1998, through 1.6.35 - July 2018 Updated and distributed by Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 4bd961a1b..b7fc18296 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 14, 2019" +.TH LIBPNG 3 "September 14, 2022" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.37 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.38 .SH SYNOPSIS \fB#include \fP @@ -519,7 +519,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 - Copyright (c) 2018-2019 Cosmin Truta + Copyright (c) 2018-2022 Cosmin Truta Copyright (c) 1998-2018 Glenn Randers-Pehrson This document is released under the libpng license. @@ -528,9 +528,9 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng version 1.6.36, December 2018, through 1.6.37 - April 2019 + libpng version 1.6.36, December 2018, through 1.6.38 - September 2022 Updated and distributed by Cosmin Truta - Copyright (c) 2018-2019 Cosmin Truta + Copyright (c) 2018-2022 Cosmin Truta libpng versions 0.97, January 1998, through 1.6.35 - July 2018 Updated and distributed by Glenn Randers-Pehrson diff --git a/libpngpf.3 b/libpngpf.3 index 6909c70a3..3da3b863d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 14, 2019" +.TH LIBPNGPF 3 "September 14, 2022" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.37 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.38 (private functions) .SH SYNOPSIS diff --git a/png.5 b/png.5 index c2da95c45..20e6aa70a 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 14, 2019" +.TH PNG 5 "September 14, 2022" .SH NAME png \- Portable Network Graphics (PNG) format @@ -43,7 +43,7 @@ or W3C Recommendation https://www.w3.org/TR/REC-png-961001 .SH AUTHORS -This man page: Cosmin Truta, Glenn Randers-Pehrson +This man page: Glenn Randers-Pehrson, Cosmin Truta .LP Portable Network Graphics (PNG) Specification (Second Edition) Information technology - Computer graphics and image processing - @@ -60,7 +60,7 @@ Thomas Boutell and others (png-list). .LP This man page is .br -Copyright (c) 2018-2019 Cosmin Truta. +Copyright (c) 2018 Cosmin Truta. .br Copyright (c) 1998-2006 Glenn Randers-Pehrson. .br diff --git a/png.c b/png.c index 12f405016..fc0956426 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_38_git Your_png_h_is_not_version_1_6_38_git; +typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -815,7 +815,7 @@ png_get_copyright(png_const_structrp png_ptr) return PNG_STRING_COPYRIGHT #else return PNG_STRING_NEWLINE \ - "libpng version 1.6.38.git" PNG_STRING_NEWLINE \ + "libpng version 1.6.38" PNG_STRING_NEWLINE \ "Copyright (c) 2018-2022 Cosmin Truta" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ diff --git a/png.h b/png.h index 15129f7ec..5fb494fb1 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.38.git + * libpng version 1.6.38 - September 14, 2022 * * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson @@ -15,7 +15,7 @@ * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger * libpng versions 0.97, January 1998, through 1.6.35, July 2018: * Glenn Randers-Pehrson - * libpng versions 1.6.36, December 2018, through 1.6.37, April 2019: + * libpng versions 1.6.36, December 2018, through 1.6.38, September 2022: * Cosmin Truta * See also "Contributing Authors", below. */ @@ -239,7 +239,7 @@ * ... * 1.5.30 15 10530 15.so.15.30[.0] * ... - * 1.6.37 16 10637 16.so.16.37[.0] + * 1.6.38 16 10638 16.so.16.38[.0] * * Henceforth the source version will match the shared-library major and * minor numbers; the shared-library major version number will be used for @@ -278,8 +278,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.38.git" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.38.git\n" +#define PNG_LIBPNG_VER_STRING "1.6.38" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.38 - September 14, 2022\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -292,7 +292,7 @@ /* This should be zero for a public release, or non-zero for a * development version. [Deprecated] */ -#define PNG_LIBPNG_VER_BUILD 1 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -309,7 +309,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_STABLE /* Careful here. At one time, Guy wanted to use 082, but that * would be octal. We must not include leading zeros. @@ -318,7 +318,7 @@ * From version 1.0.1 it is: * XXYYZZ, where XX=major, YY=minor, ZZ=release */ -#define PNG_LIBPNG_VER 10638 /* 1.6.38.git */ +#define PNG_LIBPNG_VER 10638 /* 1.6.38 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -428,7 +428,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_38_git; +typedef char* png_libpng_version_1_6_38; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 78882aefb..89d28f83a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine-configurable file for libpng * - * libpng version 1.6.38.git + * libpng version 1.6.38 * * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson diff --git a/pngtest.c b/pngtest.c index dd5113dbc..6f1830029 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2155,4 +2155,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_38_git Your_png_h_is_not_version_1_6_38_git; +typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38; diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index c1da02cdb..028c3b8ae 100644 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.6.38.git +version=1.6.38 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 19afcc325..70ae04140 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng16 Name: libpng Description: Loads and saves PNG files -Version: 1.6.38.git +Version: 1.6.38 Libs: -L${libdir} -lpng16 Cflags: -I${includedir} diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index e41a3e63f..247343f02 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -23,7 +23,7 @@ ZLIBINC=/usr/include # Library name: LIBNAME = libpng16 PNGMAJ = 16 -RELEASE = 37 +RELEASE = 38 # Shared library names: LIBSO=$(LIBNAME).dylib diff --git a/scripts/makefile.linux b/scripts/makefile.linux index beffbbb73..1d8c66301 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng16 PNGMAJ = 16 -RELEASE = 37 +RELEASE = 38 # Shared library names: LIBSO=$(LIBNAME).so diff --git a/scripts/makefile.msys b/scripts/makefile.msys index 9b4149e07..d5fadc16b 100644 --- a/scripts/makefile.msys +++ b/scripts/makefile.msys @@ -19,7 +19,7 @@ exec_prefix=$(prefix) # Library name: LIBNAME = libpng16 PNGMAJ = 16 -RELEASE = 37 +RELEASE = 38 # Shared library names: LIBSO=$(LIBNAME).dll diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index fafd1b281..48cac07d5 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ MANDIR= ${LOCALBASE}/man INCSDIR=${LOCALBASE}/include SHLIB_MAJOR= 16 -SHLIB_MINOR= 1.6.38.git +SHLIB_MINOR= 1.6.38 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index ad1da0380..97d11b867 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -12,7 +12,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 16 -SHLIB_MINOR= 1.6.38.git +SHLIB_MINOR= 1.6.38 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 967011ced..89d5b4c8a 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,6 +1,6 @@ /* pnglibconf.h - library build configuration */ -/* libpng version 1.6.38.git */ +/* libpng version 1.6.38 */ /* Copyright (c) 2018-2022 Cosmin Truta */ /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */ -- cgit v1.2.1