summaryrefslogtreecommitdiff
path: root/external/expat/UnpackedTarball_expat.mk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-08-03 14:03:27 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-04 00:35:17 +0200
commit2351570154e43fe919e5b9dd756bbe13a6b9c60d (patch)
tree2cfc9d8d137b79b1bb290c694d347f74f7f43917 /external/expat/UnpackedTarball_expat.mk
parent2b4ebf00d21f6305966c78f82336f9ac76425804 (diff)
CVE-2017-11742: Expat 2.2.3
Reviewed-on: https://gerrit.libreoffice.org/40718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f680e5a441cecba4d238f031fc417ef3bccfd792) Change-Id: I1a1de789eaa5a78d2dc0e41ef861d10fa97b689b Reviewed-on: https://gerrit.libreoffice.org/40749 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'external/expat/UnpackedTarball_expat.mk')
-rw-r--r--external/expat/UnpackedTarball_expat.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk
index 5d803dcf303a..f90fc8552568 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,expat,\
external/expat/expat-winapi.patch \
- external/expat/expat.getrandom_detection.patch.1 \
))
# This is a bit hackish.
@@ -25,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\
$(eval $(call gb_UnpackedTarball_set_post_action,expat,\
$(if $(filter $(BUILD_X64),TRUE), \
+ cp lib/loadlibrary.c lib/loadlibrary_x64.c && \
cp lib/xmlparse.c lib/xmlparse_x64.c && \
cp lib/xmltok.c lib/xmltok_x64.c && \
cp lib/xmlrole.c lib/xmlrole_x64.c) \