download.lst | 4 ++--
external/poppler/UnpackedTarball_poppler.mk | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit c1174a72ebc969ac6710c6834fc218d91db76876
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Sep 21 14:03:00 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Sep 21 14:04:10 2022 +0200
poppler: apply patch always, because sdext depends on API change
Change-Id: Ic087ffec38ad36a5540d0bf2ebd4138606495b08
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index ca7989c5ecaa..cc3e30651871 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -20,11 +20,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/gcc7-EntityInfo.patch.1 \
))
-ifeq ($(OS),WNT)
+# patch is required for MSVC but changes the API used by sdext so apply always
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-vs2015-buildfix.patch.1 \
))
-endif
# std::make_unique is only available in C++14
# use "env -i" to avoid Cygwin "environment is too large for exec"
commit e05171e4877534549e829e98c9b946b7251e9040
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 21 16:43:27 2022 +0900
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Sep 21 12:44:25 2022 +0200
update expat to 2.4.9
Fixes CVE-2022-40674
(https://github.com/libexpat/libexpat/blob/R_2_4_9/expat/Changes)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140173
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 1bff2caff1bbb39fe431c455aeab1f0234200d8d)
Change-Id: I459cf5f5de31e7cf5420d3df6b11893d5c4ca4dd
diff --git a/download.lst b/download.lst
index 0110ebcc6a90..216284fe873a 100644
--- a/download.lst
+++ b/download.lst
@@ -40,8 +40,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
export ETONYEK_SHA256SUM :=
e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
export ETONYEK_VERSION_MICRO := 9
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
-export EXPAT_SHA256SUM :=
de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b
-export EXPAT_TARBALL := expat-2.4.6.tar.xz
+export EXPAT_SHA256SUM :=
6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354
+export EXPAT_TARBALL := expat-2.4.9.tar.xz
export FIREBIRD_SHA256SUM :=
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
export FONTCONFIG_SHA256SUM :=
cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
