diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-03 14:03:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-03 20:52:13 +0200 |
| commit | f680e5a441cecba4d238f031fc417ef3bccfd792 (patch) | |
| tree | bae484c5f2d3f975caed273b92c688b4f8880614 /external/expat | |
| parent | loplugin:constparams in sw part1 (diff) | |
| download | core-f680e5a441cecba4d238f031fc417ef3bccfd792.tar.gz core-f680e5a441cecba4d238f031fc417ef3bccfd792.zip | |
CVE-2017-11742: Expat 2.2.3
Change-Id: I1a1de789eaa5a78d2dc0e41ef861d10fa97b689b
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>
Diffstat (limited to 'external/expat')
| -rw-r--r-- | external/expat/StaticLibrary_expat.mk | 1 | ||||
| -rw-r--r-- | external/expat/StaticLibrary_expat_x64.mk | 1 | ||||
| -rw-r--r-- | external/expat/UnpackedTarball_expat.mk | 2 | ||||
| -rw-r--r-- | external/expat/expat.getrandom_detection.patch.1 | 40 |
4 files changed, 3 insertions, 41 deletions
diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk index bdcc767e2905..31d03d03102e 100644 --- a/external/expat/StaticLibrary_expat.mk +++ b/external/expat/StaticLibrary_expat.mk @@ -48,6 +48,7 @@ $(eval $(call gb_StaticLibrary_add_cflags,expat,\ )) $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\ + UnpackedTarball/expat/lib/loadlibrary \ UnpackedTarball/expat/lib/xmlparse \ UnpackedTarball/expat/lib/xmlrole \ UnpackedTarball/expat/lib/xmltok \ diff --git a/external/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk index a38ba28c80dd..4f92d0fb284e 100644 --- a/external/expat/StaticLibrary_expat_x64.mk +++ b/external/expat/StaticLibrary_expat_x64.mk @@ -25,6 +25,7 @@ $(eval $(call gb_StaticLibrary_add_defs,expat_x64,\ )) $(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_x64,\ + UnpackedTarball/expat/lib/loadlibrary_x64 \ UnpackedTarball/expat/lib/xmlparse_x64 \ UnpackedTarball/expat/lib/xmltok_x64 \ UnpackedTarball/expat/lib/xmlrole_x64 \ diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 6347d4ee3657..1725aefb4c45 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -14,7 +14,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-iOS.patch \ - external/expat/expat.getrandom_detection.patch.1 \ )) # This is a bit hackish. @@ -26,6 +25,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) \ diff --git a/external/expat/expat.getrandom_detection.patch.1 b/external/expat/expat.getrandom_detection.patch.1 deleted file mode 100644 index eaf25df767dd..000000000000 --- a/external/expat/expat.getrandom_detection.patch.1 +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/libexpat/libexpat/issues/52 - -fixes /usr/include/sys/random.h:37:22: error: expected ')' -misdetection of random.h feature, already fixed upstream: -https://github.com/libexpat/libexpat/commit/602e6c78ca750c082b72f8cdf4a38839b312959f - -diff -ur expat.org/configure expat/configure ---- expat.org/configure 2017-07-12 17:04:34.000000000 +0200 -+++ expat/configure 2017-07-12 17:05:59.000000000 +0200 -@@ -16341,7 +16341,7 @@ - } - - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO"; then : - - - $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h -@@ -16386,7 +16386,8 @@ - conftest$ac_exeext conftest.$ac_ext - - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - - - for ac_header in fcntl.h unistd.h -diff -ur expat.org/configure.ac expat/configure.ac ---- expat.org/configure.ac 2017-07-12 17:04:34.000000000 +0200 -+++ expat/configure.ac 2017-07-12 17:05:31.000000000 +0200 -@@ -130,7 +130,7 @@ - - - AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) --AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <stdlib.h> /* for NULL */ - #include <sys/random.h> - int main() { |