[Libreoffice-commits] core.git: Branch 'aoo/trunk' - libpng/libpng-1.5.1.patch libpng/libpng-1.5.26.patch libpng/makefile.mk
Pedro Giffuni
pfg at apache.org
Wed Dec 30 12:08:23 PST 2015
libpng/libpng-1.5.1.patch | 277 -----------------------------------------
libpng/libpng-1.5.26.patch | 302 +++++++++++++++++++++++++++++++++++++++++++++
libpng/makefile.mk | 4
3 files changed, 304 insertions(+), 279 deletions(-)
New commits:
commit 1cc4adfc0c3212fcb815fdd5d33002f6e5d79d2a
Author: Pedro Giffuni <pfg at apache.org>
Date: Wed Dec 30 16:21:34 2015 +0000
Attempt to update libpng
libpng is is a dependency for cairo, but cairo is rarely used within
AOO and if required it is usually brought in through the system cairo.
We don't even carry libpng in the dependency list.
Updating this library is mostly innocuous but considering
CVE-2015-8540 it is convenient to keep our copy updated JIC.
diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.26.patch
similarity index 74%
rename from libpng/libpng-1.5.1.patch
rename to libpng/libpng-1.5.26.patch
index b64d924..b8c7ec2 100644
--- a/libpng/libpng-1.5.1.patch
+++ b/libpng/libpng-1.5.26.patch
@@ -1,11 +1,24 @@
---- misc/libpng-1.5.1/makefile.mk 2011-03-24 21:49:50.911397154 +0100
-+++ misc/build/libpng-1.5.1/makefile.mk 2011-03-24 21:47:23.379397048 +0100
-@@ -1 +1,49 @@
+--- misc/libpng-1.5.26/makefile.mk 2011-03-24 21:49:50.911397154 +0100
++++ misc/build/libpng-1.5.26/makefile.mk 2011-03-24 21:47:23.379397048 +0100
+@@ -1 +1,62 @@
-dummy
+#*************************************************************************
-+#
-+# Copyright according the GNU Public License.
-+#
++# Licensed to the Apache Software Foundation (ASF) under one
++# or more contributor license agreements. See the NOTICE file
++# distributed with this work for additional information
++# regarding copyright ownership. The ASF licenses this file
++# to you under the Apache License, Version 2.0 (the
++# "License"); you may not use this file except in compliance
++# with the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing,
++# software distributed under the License is distributed on an
++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# KIND, either express or implied. See the License for the
++# specific language governing permissions and limitations
++# under the License.
+#*************************************************************************
+
+PRJ=..$/..$/..$/..
@@ -51,16 +64,16 @@
+
+.INCLUDE : target.mk
+
---- misc/libpng-1.5.1/pnglibconf.h 2011-03-24 21:49:50.913397154 +0100
-+++ misc/build/libpng-1.5.1/pnglibconf.h 2011-03-24 21:47:23.380397048 +0100
-@@ -1 +1,176 @@
+--- misc/libpng-1.5.26/pnglibconf.h 2011-03-24 21:49:50.913397154 +0100
++++ misc/build/libpng-1.5.26/pnglibconf.h 2011-03-24 21:47:23.380397048 +0100
+@@ -1 +1,188 @@
-dummy
+
+/* libpng STANDARD API DEFINITION */
+
+/* pnglibconf.h - library build configuration */
+
-+/* libpng version 1.5.0 - last changed on January 6, 2011 */
++/* libpng version 1.5.26, December 17, 2015 */
+
+/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
+
@@ -73,166 +86,178 @@
+/* Derived from: scripts/pnglibconf.dfa */
+#ifndef PNGLCONF_H
+#define PNGLCONF_H
-+/* settings */
-+#define PNG_MAX_GAMMA_8 11
-+#define PNG_CALLOC_SUPPORTED
-+#define PNG_QUANTIZE_RED_BITS 5
-+#define PNG_USER_WIDTH_MAX 1000000L
-+#define PNG_QUANTIZE_GREEN_BITS 5
-+#define PNG_API_RULE 0
-+#define PNG_QUANTIZE_BLUE_BITS 5
-+#define PNG_USER_CHUNK_CACHE_MAX 0
-+#define PNG_USER_HEIGHT_MAX 1000000L
-+#define PNG_sCAL_PRECISION 5
-+#define PNG_COST_SHIFT 3
-+#define PNG_WEIGHT_SHIFT 8
-+#define PNG_USER_CHUNK_MALLOC_MAX 0
-+#define PNG_DEFAULT_READ_MACROS 1
-+#define PNG_ZBUF_SIZE 8192
-+#define PNG_GAMMA_THRESHOLD_FIXED 5000
-+/* end of settings */
+/* options */
-+#define PNG_INFO_IMAGE_SUPPORTED
-+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+#define PNG_POINTER_INDEXING_SUPPORTED
-+#define PNG_WARNINGS_SUPPORTED
-+#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-+#define PNG_WRITE_SUPPORTED
-+#define PNG_WRITE_INTERLACING_SUPPORTED
-+#define PNG_WRITE_16BIT_SUPPORTED
++#define PNG_16BIT_SUPPORTED
++#define PNG_ALIGNED_MEMORY_SUPPORTED
++/*#undef PNG_ARM_NEON_API_SUPPORTED*/
++/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
++#define PNG_BENIGN_ERRORS_SUPPORTED
++#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
++#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
++#define PNG_CHECK_cHRM_SUPPORTED
++#define PNG_CONSOLE_IO_SUPPORTED
++#define PNG_CONVERT_tIME_SUPPORTED
+#define PNG_EASY_ACCESS_SUPPORTED
-+#define PNG_ALIGN_MEMORY_SUPPORTED
-+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-+#define PNG_USER_LIMITS_SUPPORTED
-+#define PNG_FIXED_POINT_SUPPORTED
+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
+#define PNG_ERROR_TEXT_SUPPORTED
-+#define PNG_READ_SUPPORTED
-+/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/
-+#define PNG_BENIGN_ERRORS_SUPPORTED
-+#define PNG_SETJMP_SUPPORTED
-+#define PNG_WRITE_FLUSH_SUPPORTED
-+#define PNG_MNG_FEATURES_SUPPORTED
++#define PNG_FIXED_POINT_SUPPORTED
++#define PNG_FLOATING_ARITHMETIC_SUPPORTED
+#define PNG_FLOATING_POINT_SUPPORTED
++#define PNG_GET_PALETTE_MAX_SUPPORTED
++#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#define PNG_INCH_CONVERSIONS_SUPPORTED
-+#define PNG_STDIO_SUPPORTED
-+#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-+#define PNG_USER_MEM_SUPPORTED
++#define PNG_INFO_IMAGE_SUPPORTED
+#define PNG_IO_STATE_SUPPORTED
-+#define PNG_SET_USER_LIMITS_SUPPORTED
++#define PNG_MNG_FEATURES_SUPPORTED
++#define PNG_POINTER_INDEXING_SUPPORTED
++#define PNG_PROGRESSIVE_READ_SUPPORTED
++#define PNG_READ_16BIT_SUPPORTED
++#define PNG_READ_ALPHA_MODE_SUPPORTED
+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-+#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-+#define PNG_WRITE_FILTER_SUPPORTED
-+#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-+#define PNG_WRITE_iCCP_SUPPORTED
-+#define PNG_READ_TRANSFORMS_SUPPORTED
++#define PNG_READ_BACKGROUND_SUPPORTED
++#define PNG_READ_BGR_SUPPORTED
++#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
++#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
++#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
++#define PNG_READ_EXPAND_16_SUPPORTED
++#define PNG_READ_EXPAND_SUPPORTED
++#define PNG_READ_FILLER_SUPPORTED
+#define PNG_READ_GAMMA_SUPPORTED
-+#define PNG_READ_bKGD_SUPPORTED
-+#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-+#define PNG_READ_sCAL_SUPPORTED
-+#define PNG_WRITE_hIST_SUPPORTED
-+#define PNG_READ_OPT_PLTE_SUPPORTED
-+#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-+#define PNG_WRITE_gAMA_SUPPORTED
++#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
+#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-+#define PNG_WRITE_pCAL_SUPPORTED
++#define PNG_READ_INTERLACING_SUPPORTED
++#define PNG_READ_INT_FUNCTIONS_SUPPORTED
+#define PNG_READ_INVERT_ALPHA_SUPPORTED
-+#define PNG_WRITE_TRANSFORMS_SUPPORTED
-+#define PNG_READ_sBIT_SUPPORTED
++#define PNG_READ_INVERT_SUPPORTED
++#define PNG_READ_OPT_PLTE_SUPPORTED
++#define PNG_READ_PACKSWAP_SUPPORTED
+#define PNG_READ_PACK_SUPPORTED
-+#define PNG_WRITE_SWAP_SUPPORTED
-+#define PNG_READ_cHRM_SUPPORTED
-+#define PNG_WRITE_tIME_SUPPORTED
-+#define PNG_READ_INTERLACING_SUPPORTED
-+#define PNG_READ_tRNS_SUPPORTED
-+#define PNG_WRITE_pHYs_SUPPORTED
-+#define PNG_WRITE_INVERT_SUPPORTED
++#define PNG_READ_QUANTIZE_SUPPORTED
+#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-+#define PNG_WRITE_sRGB_SUPPORTED
-+#define PNG_READ_oFFs_SUPPORTED
-+#define PNG_WRITE_FILLER_SUPPORTED
-+#define PNG_WRITE_TEXT_SUPPORTED
-+#define PNG_WRITE_SHIFT_SUPPORTED
-+#define PNG_PROGRESSIVE_READ_SUPPORTED
++#define PNG_READ_SCALE_16_TO_8_SUPPORTED
+#define PNG_READ_SHIFT_SUPPORTED
-+#define PNG_CONVERT_tIME_SUPPORTED
-+#define PNG_READ_USER_TRANSFORM_SUPPORTED
-+#define PNG_READ_INT_FUNCTIONS_SUPPORTED
++#define PNG_READ_STRIP_16_TO_8_SUPPORTED
++#define PNG_READ_STRIP_ALPHA_SUPPORTED
++#define PNG_READ_SUPPORTED
++#define PNG_READ_SWAP_ALPHA_SUPPORTED
++#define PNG_READ_SWAP_SUPPORTED
++#define PNG_READ_TEXT_SUPPORTED
++#define PNG_READ_TRANSFORMS_SUPPORTED
++#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+#define PNG_READ_USER_CHUNKS_SUPPORTED
++#define PNG_READ_USER_TRANSFORM_SUPPORTED
++#define PNG_READ_bKGD_SUPPORTED
++#define PNG_READ_cHRM_SUPPORTED
++#define PNG_READ_gAMA_SUPPORTED
+#define PNG_READ_hIST_SUPPORTED
-+#define PNG_READ_16BIT_SUPPORTED
-+#define PNG_READ_SWAP_ALPHA_SUPPORTED
-+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-+#define PNG_SEQUENTIAL_READ_SUPPORTED
-+#define PNG_READ_BACKGROUND_SUPPORTED
-+#define PNG_READ_QUANTIZE_SUPPORTED
+#define PNG_READ_iCCP_SUPPORTED
-+#define PNG_READ_STRIP_ALPHA_SUPPORTED
-+#define PNG_READ_PACKSWAP_SUPPORTED
-+#define PNG_READ_sRGB_SUPPORTED
-+#define PNG_WRITE_tEXt_SUPPORTED
-+#define PNG_READ_gAMA_SUPPORTED
++#define PNG_READ_iTXt_SUPPORTED
++#define PNG_READ_oFFs_SUPPORTED
+#define PNG_READ_pCAL_SUPPORTED
-+#define PNG_READ_EXPAND_SUPPORTED
-+#define PNG_WRITE_sPLT_SUPPORTED
-+#define PNG_READ_SWAP_SUPPORTED
-+#define PNG_READ_tIME_SUPPORTED
+#define PNG_READ_pHYs_SUPPORTED
-+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
++#define PNG_READ_sBIT_SUPPORTED
++#define PNG_READ_sCAL_SUPPORTED
++#define PNG_READ_sPLT_SUPPORTED
++#define PNG_READ_sRGB_SUPPORTED
++#define PNG_READ_tEXt_SUPPORTED
++#define PNG_READ_tIME_SUPPORTED
++#define PNG_READ_tRNS_SUPPORTED
++#define PNG_READ_zTXt_SUPPORTED
++#define PNG_SAVE_INT_32_SUPPORTED
++#define PNG_SEQUENTIAL_READ_SUPPORTED
++#define PNG_SETJMP_SUPPORTED
++/*#undef PNG_SET_OPTION_SUPPORTED*/
++#define PNG_SET_USER_LIMITS_SUPPORTED
++#define PNG_STDIO_SUPPORTED
++#define PNG_TEXT_SUPPORTED
+#define PNG_TIME_RFC1123_SUPPORTED
-+#define PNG_READ_TEXT_SUPPORTED
-+#define PNG_WRITE_BGR_SUPPORTED
++#define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#define PNG_USER_CHUNKS_SUPPORTED
-+#define PNG_CONSOLE_IO_SUPPORTED
++#define PNG_USER_LIMITS_SUPPORTED
++#define PNG_USER_MEM_SUPPORTED
++#define PNG_USER_TRANSFORM_INFO_SUPPORTED
++#define PNG_USER_TRANSFORM_PTR_SUPPORTED
++#define PNG_WARNINGS_SUPPORTED
++#define PNG_WRITE_16BIT_SUPPORTED
++#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
++#define PNG_WRITE_BGR_SUPPORTED
++#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
++#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
++#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
++#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
++#define PNG_WRITE_FILLER_SUPPORTED
++#define PNG_WRITE_FILTER_SUPPORTED
++#define PNG_WRITE_FLUSH_SUPPORTED
++#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
++#define PNG_WRITE_INTERLACING_SUPPORTED
++#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
++#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
++#define PNG_WRITE_INVERT_SUPPORTED
++#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
++#define PNG_WRITE_PACKSWAP_SUPPORTED
+#define PNG_WRITE_PACK_SUPPORTED
-+#define PNG_READ_FILLER_SUPPORTED
++#define PNG_WRITE_SHIFT_SUPPORTED
++#define PNG_WRITE_SUPPORTED
++#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
++#define PNG_WRITE_SWAP_SUPPORTED
++#define PNG_WRITE_TEXT_SUPPORTED
++#define PNG_WRITE_TRANSFORMS_SUPPORTED
++#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
++#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
++#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+#define PNG_WRITE_bKGD_SUPPORTED
-+#define PNG_WRITE_tRNS_SUPPORTED
-+#define PNG_READ_sPLT_SUPPORTED
-+#define PNG_WRITE_sCAL_SUPPORTED
++#define PNG_WRITE_cHRM_SUPPORTED
++#define PNG_WRITE_gAMA_SUPPORTED
++#define PNG_WRITE_hIST_SUPPORTED
++#define PNG_WRITE_iCCP_SUPPORTED
++#define PNG_WRITE_iTXt_SUPPORTED
+#define PNG_WRITE_oFFs_SUPPORTED
-+#define PNG_READ_tEXt_SUPPORTED
++#define PNG_WRITE_pCAL_SUPPORTED
++#define PNG_WRITE_pHYs_SUPPORTED
+#define PNG_WRITE_sBIT_SUPPORTED
-+#define PNG_READ_INVERT_SUPPORTED
-+#define PNG_READ_16_TO_8_SUPPORTED
-+#define PNG_WRITE_cHRM_SUPPORTED
-+#define PNG_16BIT_SUPPORTED
-+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-+#define PNG_READ_BGR_SUPPORTED
-+#define PNG_WRITE_PACKSWAP_SUPPORTED
-+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-+#define PNG_sCAL_SUPPORTED
++#define PNG_WRITE_sCAL_SUPPORTED
++#define PNG_WRITE_sPLT_SUPPORTED
++#define PNG_WRITE_sRGB_SUPPORTED
++#define PNG_WRITE_tEXt_SUPPORTED
++#define PNG_WRITE_tIME_SUPPORTED
++#define PNG_WRITE_tRNS_SUPPORTED
+#define PNG_WRITE_zTXt_SUPPORTED
-+#define PNG_sBIT_SUPPORTED
-+#define PNG_cHRM_SUPPORTED
+#define PNG_bKGD_SUPPORTED
-+#define PNG_tRNS_SUPPORTED
-+#define PNG_WRITE_iTXt_SUPPORTED
-+#define PNG_oFFs_SUPPORTED
-+#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-+#define PNG_USER_TRANSFORM_INFO_SUPPORTED
++#define PNG_cHRM_SUPPORTED
++#define PNG_gAMA_SUPPORTED
+#define PNG_hIST_SUPPORTED
+#define PNG_iCCP_SUPPORTED
-+#define PNG_sRGB_SUPPORTED
-+#define PNG_READ_zTXt_SUPPORTED
-+#define PNG_gAMA_SUPPORTED
++#define PNG_iTXt_SUPPORTED
++#define PNG_oFFs_SUPPORTED
+#define PNG_pCAL_SUPPORTED
-+#define PNG_CHECK_cHRM_SUPPORTED
-+#define PNG_tIME_SUPPORTED
+#define PNG_pHYs_SUPPORTED
-+#define PNG_READ_iTXt_SUPPORTED
-+#define PNG_TEXT_SUPPORTED
-+#define PNG_SAVE_INT_32_SUPPORTED
++#define PNG_sBIT_SUPPORTED
++#define PNG_sCAL_SUPPORTED
+#define PNG_sPLT_SUPPORTED
++#define PNG_sRGB_SUPPORTED
+#define PNG_tEXt_SUPPORTED
++#define PNG_tIME_SUPPORTED
++#define PNG_tRNS_SUPPORTED
+#define PNG_zTXt_SUPPORTED
-+#define PNG_iTXt_SUPPORTED
+/* end of options */
++/* settings */
++#define PNG_API_RULE 0
++#define PNG_DEFAULT_READ_MACROS 1
++#define PNG_GAMMA_THRESHOLD_FIXED 5000
++#define PNG_MAX_GAMMA_8 11
++#define PNG_QUANTIZE_BLUE_BITS 5
++#define PNG_QUANTIZE_GREEN_BITS 5
++#define PNG_QUANTIZE_RED_BITS 5
++#define PNG_USER_CHUNK_CACHE_MAX 1000
++#define PNG_USER_CHUNK_MALLOC_MAX 8000000
++#define PNG_USER_HEIGHT_MAX 1000000
++#define PNG_USER_WIDTH_MAX 1000000
++#define PNG_ZBUF_SIZE 8192
++#define PNG_sCAL_PRECISION 5
++/* end of settings */
+#endif /* PNGLCONF_H */
---- misc/libpng-1.5.1/pngstruct.h 2011-02-03 05:58:17.000000000 +0100
-+++ misc/build/libpng-1.5.1/pngstruct.h 2011-03-24 21:47:23.380397048 +0100
+--- misc/libpng-1.5.26/pngstruct.h 2011-02-03 05:58:17.000000000 +0100
++++ misc/build/libpng-1.5.26/pngstruct.h 2011-03-24 21:47:23.380397048 +0100
@@ -24,7 +24,11 @@
* in this structure and is required for decompressing the LZ compressed
* data in PNG files.
@@ -245,8 +270,8 @@
struct png_struct_def
{
---- misc/libpng-1.5.1/pngtest.c 2011-02-03 05:58:17.000000000 +0100
-+++ misc/build/libpng-1.5.1/pngtest.c 2011-03-24 21:47:23.380397048 +0100
+--- misc/libpng-1.5.26/pngtest.c 2011-02-03 05:58:17.000000000 +0100
++++ misc/build/libpng-1.5.26/pngtest.c 2011-03-24 21:47:23.380397048 +0100
@@ -31,7 +31,12 @@
* of files at once by typing "pngtest -m file1.png file2.png ..."
*/
@@ -260,8 +285,8 @@
#include "png.h"
/* Copied from pngpriv.h but only used in error messages below. */
#ifndef PNG_ZBUF_SIZE
---- misc/libpng-1.5.1/pngvalid.c 2011-02-03 05:58:17.000000000 +0100
-+++ misc/build/libpng-1.5.1/pngvalid.c 2011-03-24 21:47:23.381397048 +0100
+--- misc/libpng-1.5.26/pngvalid.c 2011-02-03 05:58:17.000000000 +0100
++++ misc/build/libpng-1.5.26/pngvalid.c 2011-03-24 21:47:23.381397048 +0100
@@ -51,7 +51,11 @@
#define PNG_READ_16BIT_SUPPORTED
#endif
diff --git a/libpng/makefile.mk b/libpng/makefile.mk
index 387eca4..1539e76 100644
--- a/libpng/makefile.mk
+++ b/libpng/makefile.mk
@@ -38,10 +38,10 @@ all:
# --- Files --------------------------------------------------------
-LIBPNGVERSION=1.5.1
+LIBPNGVERSION=1.5.26
TARFILE_NAME=$(PRJNAME)-$(LIBPNGVERSION)
-TARFILE_MD5=220035f111ea045a51e290906025e8b5
+TARFILE_MD5=3ca98347a5541a2dad55cd6d07ee60a9
PATCH_FILES=$(PRJNAME)-$(LIBPNGVERSION).patch
ADDITIONAL_FILES=makefile.mk pnglibconf.h
More information about the Libreoffice-commits
mailing list