download.lst | 4 +- external/expat/StaticLibrary_expat.mk | 1 external/expat/StaticLibrary_expat_x64.mk | 1 external/expat/UnpackedTarball_expat.mk | 2 - external/expat/expat.getrandom_detection.patch.1 | 40 ----------------------- 5 files changed, 5 insertions(+), 43 deletions(-)
New commits: commit 2351570154e43fe919e5b9dd756bbe13a6b9c60d Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 3 14:03:27 2017 +0100 CVE-2017-11742: Expat 2.2.3 Reviewed-on: https://gerrit.libreoffice.org/40718 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit f680e5a441cecba4d238f031fc417ef3bccfd792) Change-Id: I1a1de789eaa5a78d2dc0e41ef861d10fa97b689b Reviewed-on: https://gerrit.libreoffice.org/40749 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> diff --git a/download.lst b/download.lst index 4c6761285841..2e22bd1101df 100644 --- a/download.lst +++ b/download.lst @@ -33,8 +33,8 @@ export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz export ETONYEK_MD5SUM := 77ff46936dcc83670557274e7dd2aa33 export ETONYEK_VERSION_MICRO := 6 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2 -export EXPAT_MD5SUM := d9c3baeab58774cefc2f04faf29f2cf8 -export EXPAT_TARBALL := expat-2.2.1.tar.bz2 +export EXPAT_MD5SUM := f053af63ef5f39bd9b78d01fbc203334 +export EXPAT_TARBALL := expat-2.2.3.tar.bz2 export FIREBIRD_MD5SUM := 821260b61dafc22899d1464d4e91ee6a export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_TARBALL := 77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk index 4d6957f9ef52..5a7d43d6c9bd 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 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) \ 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() {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits