configure.ac | 2 download.lst | 12 - external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch | 79 ---------- external/libtiff/UnpackedTarball_libtiff.mk | 2 external/libtiff/ofz68840.patch | 17 ++ 5 files changed, 25 insertions(+), 87 deletions(-)
New commits: commit 66e432428b5dd455e4069aa775801d4e87c379d6 Author: Michael Stahl <[email protected]> AuthorDate: Wed Oct 1 15:55:08 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 16:41:55 2026 +0100 configure: openssl 3.0.18 evidently needs perl Time::Piece Can't locate Time/Piece.pm in @INC (you may need to install the Time::Piece module) (@INC entries checked: ...) at Makefile.in line 37. Change-Id: Ia47eeb971f7bf91972f46be46330f10e64682799 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191735 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 0622d8d160b54b120e3955b6b0e177a2a25ca0d1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191753 Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit 4d33d0e89c2138e581720fb9d3494c10e792d64d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192875 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit dd659b38a90aae8b07bf3e95c13ef9c9d32f2334) diff --git a/configure.ac b/configure.ac index ceb2259e3d88..6e38bf1881bf 100644 --- a/configure.ac +++ b/configure.ac @@ -6477,7 +6477,7 @@ if test "$with_system_hsqldb" = "yes"; then fi if test "$enable_openssl" = "yes" -a "$with_system_openssl" != "yes"; then # OpenSSL needs that to build - perl_use_string="$perl_use_string ; use FindBin" + perl_use_string="$perl_use_string ; use FindBin ; use Time::Piece" fi if $PERL -e "$perl_use_string">/dev/null 2>&1; then AC_MSG_RESULT([all modules found]) commit 9234ca57bbdb2d76d46b14702b66e0bfb0acd80e Author: Xisco Fauli <[email protected]> AuthorDate: Tue Sep 30 20:48:36 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:16:02 2026 +0100 openssl: upgrade to 3.0.18 Downloaded from https://github.com/openssl/openssl/releases/download/openssl-3.0.18/openssl-3.0.18.tar.gz Change-Id: Ie24873924bf8a0f9d3edb37e4e69e2e64b25ce47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191693 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit b9abb977cbdc90ffc5c60ac5307cede571c168d7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191698 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> (cherry picked from commit 22f28b2e6b33f530a93a7577999ff610c4b5095e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192456 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 2b89d561939e275260cdcf2cb8f0b255ef3c460e) diff --git a/download.lst b/download.lst index 6a5bde7ffa41..5af22d3c3ded 100644 --- a/download.lst +++ b/download.lst @@ -487,8 +487,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce -OPENSSL_TARBALL := openssl-3.0.17.tar.gz +OPENSSL_SHA256SUM := d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b +OPENSSL_TARBALL := openssl-3.0.18.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 2ef4633c29d303068719d97a328809a12d5e3e71 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Jul 3 14:02:46 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:15:55 2026 +0100 openssl: upgrade to 3.0.17 Downloaded from https://github.com/openssl/openssl/releases/download/openssl-3.0.17/openssl-3.0.17.tar.gz Change-Id: I2b796bc9c6917ecc92032d011ef7a3c4bd266c81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187326 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit e0e04ab7eb742b373fadd252c8de17f48177fef8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187335 Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit 71c87ca807f617309417d600111f671ef60141b5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192455 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit f6821e873ea96a1908c4c302ec7ca3ae397b5979) diff --git a/download.lst b/download.lst index c2acd6fd5bb6..6a5bde7ffa41 100644 --- a/download.lst +++ b/download.lst @@ -487,8 +487,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := 57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86 -OPENSSL_TARBALL := openssl-3.0.16.tar.gz +OPENSSL_SHA256SUM := dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce +OPENSSL_TARBALL := openssl-3.0.17.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit cee7daa84ef8d9565e998fec20025588866158ab Author: Xisco Fauli <[email protected]> AuthorDate: Tue Feb 11 17:36:26 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:15:43 2026 +0100 openssl: upgrade to 3.0.16 Downloaded from https://github.com/openssl/openssl/releases/download/openssl-3.0.16/openssl-3.0.16.tar.gz Change-Id: I9eeb10132455be1240cbe7312275d5211dee3600 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181442 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit fe39e60102f34f6dba59828579ee75e4c05486e0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181453 Reviewed-by: Michael Weghorn <[email protected]> (cherry picked from commit 88b2144335753b2d61f26a2930513914153574c5) diff --git a/download.lst b/download.lst index 34c414002603..c2acd6fd5bb6 100644 --- a/download.lst +++ b/download.lst @@ -487,8 +487,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := 23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533 -OPENSSL_TARBALL := openssl-3.0.15.tar.gz +OPENSSL_SHA256SUM := 57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86 +OPENSSL_TARBALL := openssl-3.0.16.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit cf03c7c43c3c4bad62313fe619856dbdb60f11cd Author: Xisco Fauli <[email protected]> AuthorDate: Tue Sep 3 17:01:28 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:15:36 2026 +0100 openssl: upgrade to 3.0.15 Downloaded from https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz Change-Id: Ic1598fe8fafe610c7a3b409c5811bcc52658b130 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172830 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit e21e07f24bfdbe802e3ed8e611a135ab2ad2fe4c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172811 Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit a24287b0afa5058bf243a4c5109479b8d261406c) diff --git a/download.lst b/download.lst index f6845c3d3c19..34c414002603 100644 --- a/download.lst +++ b/download.lst @@ -487,8 +487,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca -OPENSSL_TARBALL := openssl-3.0.14.tar.gz +OPENSSL_SHA256SUM := 23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533 +OPENSSL_TARBALL := openssl-3.0.15.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 37423872667a45714bdc3839cec36cd2986d2cec Author: Xisco Fauli <[email protected]> AuthorDate: Wed Jun 5 11:40:19 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:15:13 2026 +0100 openssl: upgrade to 3.0.14 Downloaded from https://www.openssl.org/source/openssl-3.0.14.tar.gz Change-Id: Ib75738f257210532d0f01f429ec3b78a1a2410a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168456 Reviewed-by: Taichi Haradaguchi <[email protected]> Tested-by: Jenkins (cherry picked from commit b3a70a28b0becc9c872f2a92c35dfdaac4822600) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168434 Tested-by: Christian Lohmaier <[email protected]> Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit db10a874f2ace87095b06874099686a7b988a764) diff --git a/download.lst b/download.lst index b24586fd0a16..f6845c3d3c19 100644 --- a/download.lst +++ b/download.lst @@ -487,8 +487,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 -OPENSSL_TARBALL := openssl-3.0.13.tar.gz +OPENSSL_SHA256SUM := eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca +OPENSSL_TARBALL := openssl-3.0.14.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit e223284707126e60217b3811a38fdb5d49c0ef78 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Sep 18 18:16:36 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:03 2026 +0100 tiff: upgrade to 4.7.1 Downloaded from https://download.osgeo.org/libtiff/tiff-4.7.1.tar.xz Change-Id: I9eda3018e55e771986968ffacf7081538baf432b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191142 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit b3a027d2b7273478773bd0d8624b70f9a48b0952) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192374 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 3d684bb82580195430e6971874ccf008a6c3e965) diff --git a/download.lst b/download.lst index d216daaa45d8..b24586fd0a16 100644 --- a/download.lst +++ b/download.lst @@ -517,8 +517,8 @@ LIBPNG_TARBALL := libpng-1.6.54.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBTIFF_SHA256SUM := 273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017 -LIBTIFF_TARBALL := tiff-4.7.0.tar.xz +LIBTIFF_SHA256SUM := b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba +LIBTIFF_TARBALL := tiff-4.7.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 65f70ede8ba3c3c5ad09e2842b34d20141b9e4e7 Author: Michael Stahl <[email protected]> AuthorDate: Wed Sep 18 11:20:43 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:03 2026 +0100 libtiff: upgrade to release 4.7.0 Fixes CVE-2023-52356 CVE-2024-7006 ofz65182.patch was apparently merged upstream and then reverted; Caolán suggested to drop the patch and see if ofz still finds a problem there. Change-Id: I0967708f19a7151b020372eca3c906b30f693db9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173602 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit d838b0d4af154b5c31818ceaac4bcdf8b2214c94) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173654 Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit b519007d224252c203014f2cc96bdc7883ce263b) diff --git a/download.lst b/download.lst index af7d685a61df..d216daaa45d8 100644 --- a/download.lst +++ b/download.lst @@ -517,8 +517,8 @@ LIBPNG_TARBALL := libpng-1.6.54.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBTIFF_SHA256SUM := e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2 -LIBTIFF_TARBALL := tiff-4.6.0.tar.xz +LIBTIFF_SHA256SUM := 273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017 +LIBTIFF_TARBALL := tiff-4.7.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 2c3508aa16169cec6b1d49aace02e5778cdbb555 Author: Caolán McNamara <[email protected]> AuthorDate: Fri May 24 20:43:42 2024 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:03 2026 +0100 ofz#68840 another putcontig8bitYCbCr22tile issue Change-Id: I6e119cf1b3bec609f94784eb0c439835875d6112 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168031 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 034b68eb3a015553254c7238b13db8f94514080d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173653 Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit b460bb3e36f0cc4a57fa29c7e8717c961a6e44d0) diff --git a/external/libtiff/UnpackedTarball_libtiff.mk b/external/libtiff/UnpackedTarball_libtiff.mk index f7eeb6ace868..f268be5926c6 100644 --- a/external/libtiff/UnpackedTarball_libtiff.mk +++ b/external/libtiff/UnpackedTarball_libtiff.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,1)) $(eval $(call gb_UnpackedTarball_add_patches,libtiff,\ external/libtiff/libtiff.linknolibs.patch \ external/libtiff/0001-ofz-54685-Timeout.patch \ + external/libtiff/ofz68840.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libtiff/ofz68840.patch b/external/libtiff/ofz68840.patch new file mode 100644 index 000000000000..0a8721ebe012 --- /dev/null +++ b/external/libtiff/ofz68840.patch @@ -0,0 +1,17 @@ +--- a/libtiff/tif_tile.c ++++ b/libtiff/tif_tile.c +@@ -233,7 +233,13 @@ + _TIFFMultiply64(tif, samplingrow_size, samplingblocks_ver, module)); + } + else +- return (_TIFFMultiply64(tif, nrows, TIFFTileRowSize64(tif), module)); ++ { ++ uint64_t row_size = TIFFTileRowSize64(tif); ++ /* I think the way this works the expectation is there are always even num of samples */ ++ if (td->td_photometric == PHOTOMETRIC_YCBCR) ++ row_size = TIFFroundup_64(row_size, 2); ++ return (_TIFFMultiply64(tif, nrows, row_size, module)); ++ } + } + tmsize_t TIFFVTileSize(TIFF *tif, uint32_t nrows) + { commit 8654c8892e7fcf9b413f08175be4e7b08e18ce03 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Oct 28 17:16:27 2023 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:03 2026 +0100 upgrade libtiff to 4.6.0 Change-Id: I839f78e5431caac378ce936aa5e34357144ae6b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158593 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 4273ebd28b9d3f50797f9e2dede0d9e8ce26e6f0) diff --git a/download.lst b/download.lst index adea704edfd1..af7d685a61df 100644 --- a/download.lst +++ b/download.lst @@ -517,8 +517,8 @@ LIBPNG_TARBALL := libpng-1.6.54.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBTIFF_SHA256SUM := 3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a -LIBTIFF_TARBALL := tiff-4.5.1.tar.xz +LIBTIFF_SHA256SUM := e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2 +LIBTIFF_TARBALL := tiff-4.6.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch b/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch deleted file mode 100644 index 68353bd9ed20..000000000000 --- a/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 350ff161c8a61b6483a1e4689e09cd47dd0dd5f9 Mon Sep 17 00:00:00 2001 -From: Even Rouault <[email protected]> -Date: Sat, 17 Jun 2023 16:22:38 +0200 -Subject: [PATCH] WebP decoder: validate WebP blob width, height, band count - against TIFF parameters - -to avoid use of uninitialized variable, or decoding corrupted content -without explicit error - -Fixes #581, fixes #582 ---- - libtiff/tif_webp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 51 insertions(+) - -diff --git a/libtiff/tif_webp.c b/libtiff/tif_webp.c -index 07db7cce..ce15391e 100644 ---- a/libtiff/tif_webp.c -+++ b/libtiff/tif_webp.c -@@ -149,6 +149,57 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s) - segment_height = td->td_rowsperstrip; - } - -+ int webp_width, webp_height; -+ if (!WebPGetInfo(tif->tif_rawcp, -+ tif->tif_rawcc > UINT32_MAX ? UINT32_MAX -+ : (uint32_t)tif->tif_rawcc, -+ &webp_width, &webp_height)) -+ { -+ TIFFErrorExtR(tif, module, "WebPGetInfo() failed"); -+ return 0; -+ } -+ if ((uint32_t)webp_width != segment_width || -+ (uint32_t)webp_height != segment_height) -+ { -+ TIFFErrorExtR( -+ tif, module, "WebP blob dimension is %dx%d. Expected %ux%u", -+ webp_width, webp_height, segment_width, segment_height); -+ return 0; -+ } -+ -+#if WEBP_DECODER_ABI_VERSION >= 0x0002 -+ WebPDecoderConfig config; -+ if (!WebPInitDecoderConfig(&config)) -+ { -+ TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed"); -+ return 0; -+ } -+ -+ const bool bWebPGetFeaturesOK = -+ WebPGetFeatures(tif->tif_rawcp, -+ tif->tif_rawcc > UINT32_MAX -+ ? UINT32_MAX -+ : (uint32_t)tif->tif_rawcc, -+ &config.input) == VP8_STATUS_OK; -+ -+ WebPFreeDecBuffer(&config.output); -+ -+ if (!bWebPGetFeaturesOK) -+ { -+ TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed"); -+ return 0; -+ } -+ -+ const int webp_bands = config.input.has_alpha ? 4 : 3; -+ if (webp_bands != sp->nSamples) -+ { -+ TIFFErrorExtR(tif, module, -+ "WebP blob band count is %d. Expected %d", webp_bands, -+ sp->nSamples); -+ return 0; -+ } -+#endif -+ - buffer_size = segment_width * segment_height * sp->nSamples; - if (occ == (tmsize_t)buffer_size) - { --- -2.41.0 - diff --git a/external/libtiff/UnpackedTarball_libtiff.mk b/external/libtiff/UnpackedTarball_libtiff.mk index 32ed699b7491..f7eeb6ace868 100644 --- a/external/libtiff/UnpackedTarball_libtiff.mk +++ b/external/libtiff/UnpackedTarball_libtiff.mk @@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,1)) $(eval $(call gb_UnpackedTarball_add_patches,libtiff,\ external/libtiff/libtiff.linknolibs.patch \ external/libtiff/0001-ofz-54685-Timeout.patch \ - external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch \ )) # vim: set noet sw=4 ts=4: commit e821b52def70fa4e6eef64f08321aed421b0c2ad Author: Michael Stahl <[email protected]> AuthorDate: Tue Jan 13 11:07:32 2026 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:03 2026 +0100 libpng: upgrade to release 1.6.54 Fixes CVE-2026-22695 CVE-2026-22801 Change-Id: Id7c4c4d2ffa583ca1eeec23720a4ce74b819305f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197183 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 4e63ac95e1cce0c56e0277c6ecdade3ff43d1f96) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197189 (cherry picked from commit fae48708bbff1710c179f4b92f16764bea9ffaf2) diff --git a/download.lst b/download.lst index 05c8e4249df4..adea704edfd1 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4 -LIBPNG_TARBALL := libpng-1.6.53.tar.xz +LIBPNG_SHA256SUM := 01c9d8a303c941ec2c511c14312a3b1d36cedb41e2f5168ccdaa85d53b887805 +LIBPNG_TARBALL := libpng-1.6.54.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit afb9eb5347c76bd3c11240be16fc8d58260196aa Author: Xisco Fauli <[email protected]> AuthorDate: Tue Dec 9 00:20:52 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:02 2026 +0100 libpng: upgrade to 1.6.53 Downloaded from http://prdownloads.sourceforge.net/libpng/libpng-1.6.53.tar.xz?download Change-Id: I09a817614658880cf1d4e0a162597b2d675bc4e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195245 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 50b39ceb42dda3234e63eebf8d3baedac58ca0f6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197182 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit fe1abdb770f5a5fea88c9ff81f215914fab465ec) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197188 (cherry picked from commit 3b7e478b80519516ff93f2a94c4f605043be9630) diff --git a/download.lst b/download.lst index f97a77ded97e..05c8e4249df4 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 36bd726228ec93a3b6c22fdb49e94a67b16f2fe9b39b78b7cb65772966661ccc -LIBPNG_TARBALL := libpng-1.6.52.tar.xz +LIBPNG_SHA256SUM := 1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4 +LIBPNG_TARBALL := libpng-1.6.53.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 215d3c7d7a3c85db95b4a302b92f56b292c41574 Author: Michael Stahl <[email protected]> AuthorDate: Thu Dec 4 10:25:37 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:02 2026 +0100 libpng: upgrade to release 1.6.52 Fixes CVE-2025-66293 Change-Id: I1f0aefccf2b80d14e70b423381c121a97e510045 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194979 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit f65e262ac15f247f9fabe6d60d3e69d269c68608) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194989 (cherry picked from commit bd98dc0550939cb8ffa1e6af459c33d7947bf2ca) diff --git a/download.lst b/download.lst index 6666b0fb5b40..f97a77ded97e 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2 -LIBPNG_TARBALL := libpng-1.6.51.tar.xz +LIBPNG_SHA256SUM := 36bd726228ec93a3b6c22fdb49e94a67b16f2fe9b39b78b7cb65772966661ccc +LIBPNG_TARBALL := libpng-1.6.52.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 4f9e3aa8585aa49adbbab77dc851877bb7bab30d Author: Michael Stahl <[email protected]> AuthorDate: Mon Nov 24 10:07:38 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:02 2026 +0100 libpng: upgrade to release 1.6.51 Fixes CVE-2025-64505, CVE-2025-64506, CVE-2025-64720, CVE-2025-65018 Change-Id: Id58827859de899aea020f43835f2b37bf262ed33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194421 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 313c6d0a0d8a65e23e06ebcae08e0249f9f0d749) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194461 Code-Style: Michael Stahl <[email protected]> (cherry picked from commit 10449978859bb6bce23035df0d1048425befdd7f) diff --git a/download.lst b/download.lst index 6a98155227fa..6666b0fb5b40 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307 -LIBPNG_TARBALL := libpng-1.6.50.tar.xz +LIBPNG_SHA256SUM := a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2 +LIBPNG_TARBALL := libpng-1.6.51.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 2375d23c5fccb2ca3f5fe0f094254888deaffd1f Author: Xisco Fauli <[email protected]> AuthorDate: Thu Jul 3 13:29:20 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:02 2026 +0100 libpng: upgrade to 1.6.50 Downloaded from https://sourceforge.net/projects/libpng/files/libpng16/1.6.50/libpng-1.6.50.tar.xz/download Change-Id: I4906134e3343ab541b64e27d47d63519b5a49bd6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187310 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 9ffd4bf12d953159f68d509902112c8b43062a9b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187329 Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit 7f044a87f5a8a4a2f42619a347a1acb4e3b9c23a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194460 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 486afc6805cefee8b5e63284690a19ce1d0a8690) diff --git a/download.lst b/download.lst index 88712fa1db33..6a98155227fa 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 43182aa48e39d64b1ab4ec6b71ab3e910b67eed3a0fff3777cf8cf40d6ef7024 -LIBPNG_TARBALL := libpng-1.6.49.tar.xz +LIBPNG_SHA256SUM := 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307 +LIBPNG_TARBALL := libpng-1.6.50.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 33cc87ee4f4f1ebad0f40d936b4d212e37a45c34 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jun 13 14:24:30 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:02 2026 +0100 libpng: upgrade to 1.6.49 Downloaded from https://sourceforge.net/projects/libpng/files/libpng16/1.6.49/libpng-1.6.49.tar.xz/download Change-Id: I499f8a3d191421fddfe34fcf7d190f1831177de5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186458 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit a32b89d2857b3f15ebb2e72c2131037a28d56270) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186462 Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit e77e0b0d1538dc6ec2556117a0eeb7f00f2cf07f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194459 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 94d40abe7737bb2f2211583b3d97e10c6cc25bef) diff --git a/download.lst b/download.lst index ecbbdfd775fe..88712fa1db33 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03 -LIBPNG_TARBALL := libpng-1.6.48.tar.xz +LIBPNG_SHA256SUM := 43182aa48e39d64b1ab4ec6b71ab3e910b67eed3a0fff3777cf8cf40d6ef7024 +LIBPNG_TARBALL := libpng-1.6.49.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 4b5d891a7d40f68ff13334004ba81de1f268bc23 Author: Xisco Fauli <[email protected]> AuthorDate: Fri May 2 11:02:11 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:02 2026 +0100 libpng: upgrade to 1.6.48 Downloaded from https://sourceforge.net/projects/libpng/files/libpng16/1.6.48/libpng-1.6.48.tar.xz/download Change-Id: I37cef8c885807eb26e45f567256faebd05816dc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184891 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit ccf40aa486d51623698683086f2130644d7ccee3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184897 Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit f861474f0ffed9ad1f4d6d963066949aac281812) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194458 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 68b5af7251ae6689df70b82dd12893b81920e676) diff --git a/download.lst b/download.lst index 53d4fc3881ca..ecbbdfd775fe 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631 -LIBPNG_TARBALL := libpng-1.6.47.tar.xz +LIBPNG_SHA256SUM := 46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03 +LIBPNG_TARBALL := libpng-1.6.48.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit efd1288a98a66ff865726409f7fea2710e542180 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Feb 19 09:30:06 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:01 2026 +0100 libpng: upgrade to 1.6.47 Downloaded from https://sourceforge.net/projects/libpng/files/libpng16/1.6.47/libpng-1.6.47.tar.xz/download Change-Id: I8fc0469fa034b7da7850e42d8ed635b0959952f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181864 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 934f40d2b55bf40756cd596a149dfb7c766efc2f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181888 Reviewed-by: Michael Weghorn <[email protected]> (cherry picked from commit 55d974103b316cc1f476fc8e8af7d31a51241c65) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194457 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 809e11381513bb700ef04841ab61148131125a45) diff --git a/download.lst b/download.lst index d12d4f47fad0..53d4fc3881ca 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1 -LIBPNG_TARBALL := libpng-1.6.46.tar.xz +LIBPNG_SHA256SUM := b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631 +LIBPNG_TARBALL := libpng-1.6.47.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 58fd713df5872a7d23d7c27303be47c06e83be35 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jan 24 21:08:04 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:01 2026 +0100 libpng: upgrade to 1.6.46 Downloaded from https://netix.dl.sourceforge.net/project/libpng/libpng16/1.6.46/libpng-1.6.46.tar.xz Change-Id: I532674663e66e294f92269d2ac0b748b8afb8543 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180730 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 8fad479890379e2f010fbf0be29f8f97e6e85904) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180731 Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit 0236c35b490e660129b9216ca9653ab4e53e55e6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194456 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit e1d4553a0cac1710baa0459714e74a0c8b6df721) diff --git a/download.lst b/download.lst index 9dba88762fed..d12d4f47fad0 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370 -LIBPNG_TARBALL := libpng-1.6.45.tar.xz +LIBPNG_SHA256SUM := f3aa8b7003998ab92a4e9906c18d19853e999f9d3bca9bd1668f54fa81707cb1 +LIBPNG_TARBALL := libpng-1.6.46.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 97752044b2c29082b076605c764f65b8280779b2 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Jan 8 09:25:52 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:01 2026 +0100 libpng: upgrade to 1.6.45 All three patches are upstreamed. Downloaded from https://kumisystems.dl.sourceforge.net/project/libpng/libpng16/1.6.45/libpng-1.6.45.tar.xz?viasf=1 Change-Id: I61d336704b96e2a25d92b4512507cc168648ddec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179930 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 9a8234e081c97fafcda009746828f3d01195fe3b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179951 Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit 5acb7648c3eff7371385df442a627768762a7aa6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194455 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 79e1e6ab90ff5fc3c591d8eb75b62394798f76aa) diff --git a/download.lst b/download.lst index 305cc8f60cd4..9dba88762fed 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e -LIBPNG_TARBALL := libpng-1.6.44.tar.xz +LIBPNG_SHA256SUM := 926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370 +LIBPNG_TARBALL := libpng-1.6.45.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 5b4386312deb3f58d2e1c0c4aad492e29a972b8c Author: Xisco Fauli <[email protected]> AuthorDate: Fri Sep 13 08:00:40 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:01 2026 +0100 libpng: upgrade to 1.6.44 Downloaded from https://unlimited.dl.sourceforge.net/project/libpng/libpng16/1.6.44/libpng-1.6.44.tar.xz Change-Id: I0132e6edb0078d1d4479bb79b7f740c23719d72b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173295 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit 9f3e378282db4152bb7fabb318f4fc2fd5ea6601) diff --git a/download.lst b/download.lst index 93b71aaf5828..305cc8f60cd4 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c -LIBPNG_TARBALL := libpng-1.6.43.tar.xz +LIBPNG_SHA256SUM := 60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e +LIBPNG_TARBALL := libpng-1.6.44.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 5d399e67d7e427069722d5eb53a9253835293dfe Author: Xisco Fauli <[email protected]> AuthorDate: Wed Mar 20 10:49:53 2024 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:01 2026 +0100 libpng: upgrade to 1.6.43 Change-Id: Ia1ddc21dc521cf97b75a64d806417cbfe5dec623 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165050 Tested-by: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit f29222eaf385891620d4868827b27e734752018e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165182 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit 5eaab9fa3d1b9b222ce94aaf2bcdd1c9facf52a9) diff --git a/download.lst b/download.lst index 42dffc8f828e..93b71aaf5828 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450 -LIBPNG_TARBALL := libpng-1.6.42.tar.xz +LIBPNG_SHA256SUM := 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c +LIBPNG_TARBALL := libpng-1.6.43.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 08bd4785e8d8b16a5e3ffff9d7a626d6383291c0 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Feb 19 13:01:54 2024 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:01 2026 +0100 libpng: upgrade to 1.6.42 Change-Id: I03fccf59bb1c2fa51478e812e629ff2ffac0e893 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163593 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 7b2ddc88019852b7731b888e7b8eb669e760a8d7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163830 Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit a34472ed85e7f6ed22ed04638de8161e85178802) diff --git a/download.lst b/download.lst index 4bb4131c05e0..42dffc8f828e 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1 -LIBPNG_TARBALL := libpng-1.6.40.tar.xz +LIBPNG_SHA256SUM := c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450 +LIBPNG_TARBALL := libpng-1.6.42.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 8f2944d208cec36f0d5b01d0156393479237dfe1 Author: Taichi Haradaguchi <[email protected]> AuthorDate: Mon Jul 3 22:01:59 2023 +0900 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jan 27 12:04:01 2026 +0100 libpng: upgrade to release 1.6.40 Change-Id: I2f366045097a6f063e26703b4132710573a40e65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153879 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit 2c733d79d8d1ce630711c5b9bcceb2b6f99eb51a) diff --git a/download.lst b/download.lst index 862c60dfc506..4bb4131c05e0 100644 --- a/download.lst +++ b/download.lst @@ -512,8 +512,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBPNG_SHA256SUM := 1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937 -LIBPNG_TARBALL := libpng-1.6.39.tar.xz +LIBPNG_SHA256SUM := 535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1 +LIBPNG_TARBALL := libpng-1.6.40.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
