download.lst                          |    4 ++--
 external/zlib/UnpackedTarball_zlib.mk |    4 ----
 external/zlib/ubsan.patch             |   11 -----------
 3 files changed, 2 insertions(+), 17 deletions(-)

New commits:
commit b91ebecaaa1582a7cbeda519eb6097a6a866135f
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Mar 31 12:13:23 2022 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Apr 1 10:09:04 2022 +0200

    zlib: upgrade to release 1.2.12
    
    Fixes CVE-2018-25032
    
    external/zlib/ubsan.patch: remove, fixed upstream
    
    Change-Id: I2aa9a9008b9cf7efd970c5fff0df7029204204f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132358
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit bfb6c4c65781a610d21409d974227d73f264f41a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132191
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/download.lst b/download.lst
index edde4d95f8ea..081ea2ad1e5f 100644
--- a/download.lst
+++ b/download.lst
@@ -261,8 +261,8 @@ export WPS_VERSION_MICRO := 12
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-export ZLIB_SHA256SUM := 
4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
-export ZLIB_TARBALL := zlib-1.2.11.tar.xz
+export ZLIB_SHA256SUM := 
7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18
+export ZLIB_TARBALL := zlib-1.2.12.tar.xz
 export ZMF_SHA256SUM := 
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
 export ZMF_TARBALL := libzmf-0.0.2.tar.xz
 export ZXING_SHA256SUM := 
653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a
diff --git a/external/zlib/UnpackedTarball_zlib.mk 
b/external/zlib/UnpackedTarball_zlib.mk
index e74039d25089..dd9fc1c31445 100644
--- a/external/zlib/UnpackedTarball_zlib.mk
+++ b/external/zlib/UnpackedTarball_zlib.mk
@@ -18,8 +18,4 @@ $(eval $(call gb_UnpackedTarball_set_post_action,zlib,\
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,zlib, \
-    external/zlib/ubsan.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/zlib/ubsan.patch b/external/zlib/ubsan.patch
deleted file mode 100644
index 2d7ff8d67967..000000000000
--- a/external/zlib/ubsan.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trees.c
-+++ trees.c
-@@ -870,7 +870,7 @@
-     bi_windup(s);        /* align on byte boundary */
-     put_short(s, (ush)stored_len);
-     put_short(s, (ush)~stored_len);
--    zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
-+    if (stored_len != 0) zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, 
stored_len);
-     s->pending += stored_len;
- #ifdef ZLIB_DEBUG
-     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;

Reply via email to