download.lst | 2 external/libxml2/ExternalPackage_xml2.mk | 2 external/libxml2/UnpackedTarball_xml2.mk | 1 external/libxml2/libxml2-freebsd.patch.1 | 15 ----- external/libxml2/libxml2-icu.patch.0 | 2 external/libxml2/libxml2-vc10.patch | 2 external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 | 29 ++++++++++ external/libxslt/UnpackedTarball_xslt.mk | 1 oox/source/export/drawingml.cxx | 5 + 9 files changed, 39 insertions(+), 20 deletions(-)
New commits: commit 96023e988620ee083994131caa053bbbb01ee2fe Author: Mark Hung <[email protected]> Date: Mon Jul 27 23:53:18 2015 +0800 Fix tdf#77881,tdf#80520,tdf#89525 bulllets lost issue. Replace bullet char before write out font description since it may be altered if bullet font has been changed (i.e. StarSymbol to WingDings ). Change-Id: I0461cc0a5e4628b36177602bba7ed7f74a0751eb Reviewed-on: https://gerrit.libreoffice.org/17376 Tested-by: Jenkins <[email protected]> Reviewed-by: Norbert Thiebaud <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/18318 Reviewed-by: Mark Hung <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/19937 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Christian Lohmaier <[email protected]> (cherry picked from commit 84892a9dc80917c1ca45c6eed356bfb38e8b81fb) diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index efe6323..6b593a8 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1721,10 +1721,14 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa mpFS->singleElementNS( XML_a, XML_buSzPct, XML_val, IS( std::max( (sal_Int32)25000, std::min( (sal_Int32)400000, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND ); if( bHasFontDesc ) + { + if ( SVX_NUM_CHAR_SPECIAL == nNumberingType ) + aBulletChar = SubstituteBullet( aBulletChar, aFontDesc ); mpFS->singleElementNS( XML_a, XML_buFont, XML_typeface, aFontDesc.Name.toUtf8().getStr(), XML_charset, (aFontDesc.CharSet == awt::CharSet::SYMBOL) ? "2" : NULL, FSEND ); + } OUString pAutoNumType = GetAutoNumType( nNumberingType, bSDot, bPBehind, bPBoth ); @@ -1736,7 +1740,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa } else { - aBulletChar = SubstituteBullet( aBulletChar, aFontDesc ); mpFS->singleElementNS(XML_a, XML_buChar, XML_char, USS( OUString( aBulletChar ) ), FSEND); } } commit 5cf00b458326204819332be4424acca16514a8c6 Author: Michael Stahl <[email protected]> Date: Fri Nov 20 13:53:43 2015 +0100 libxslt: add patch for CVE-2015-7995 (cherry picked from commit 45d1abeff9d4041b3e174f0eddd10bfd6ab8a360) Change-Id: I733cd21f6d8c7ea1e01f594d1483ad9c2043c188 Reviewed-on: https://gerrit.libreoffice.org/20097 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Christian Lohmaier <[email protected]> (cherry picked from commit 17c513b7fca9304b635a57d11de77d7eccf7188a) diff --git a/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 b/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 new file mode 100644 index 0000000..4f87e79 --- /dev/null +++ b/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 @@ -0,0 +1,29 @@ +From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <[email protected]> +Date: Thu, 29 Oct 2015 19:33:23 +0800 +Subject: [PATCH] Fix for type confusion in preprocessing attributes + +CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10 +We need to check that the parent node is an element before dereferencing +its namespace +--- + libxslt/preproc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libxslt/preproc.c b/libxslt/preproc.c +index 0eb80a0..7f69325 100644 +--- a/libxslt/preproc.c ++++ b/libxslt/preproc.c +@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) { + } else if (IS_XSLT_NAME(inst, "attribute")) { + xmlNodePtr parent = inst->parent; + +- if ((parent == NULL) || (parent->ns == NULL) || ++ if ((parent == NULL) || ++ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) || + ((parent->ns != inst->ns) && + (!xmlStrEqual(parent->ns->href, inst->ns->href))) || + (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) { +-- +2.4.3 + diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk index 5ed0860..73ef460 100644 --- a/external/libxslt/UnpackedTarball_xslt.mk +++ b/external/libxslt/UnpackedTarball_xslt.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xslt,\ external/libxslt/libxslt-1.1.26-memdump.patch \ $(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \ external/libxslt/libxslt-config-guess.patch.0 \ + external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 \ )) # vim: set noet sw=4 ts=4: commit 4bf27ce7bc9116302ddbaf49d6771335b4e9abd0 Author: Michael Stahl <[email protected]> Date: Fri Nov 20 13:50:51 2015 +0100 libxml2: upgrade to version 2.9.3 - drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same) - drop libxml2-vc15.patch (fixed upstream) Reviewed-on: https://gerrit.libreoffice.org/20084 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 391bcf348d585b5e246ec808833af522edd371f2) Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116 Reviewed-on: https://gerrit.libreoffice.org/20096 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Christian Lohmaier <[email protected]> (cherry picked from commit d960a8b17b74417aa61ce226fced5b0fa185acf5) diff --git a/download.lst b/download.lst index 34cfddc..4a683f5 100644 --- a/download.lst +++ b/download.lst @@ -95,7 +95,7 @@ export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz +export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index a0bf5eb..3694937 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -21,7 +21,7 @@ else # COM=MSC $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.1)) +$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.3)) endif endif # DISABLE_DYNLOADING diff --git a/external/libxml2/UnpackedTarball_xml2.mk b/external/libxml2/UnpackedTarball_xml2.mk index 9c53b1f..5cff2ae 100644 --- a/external/libxml2/UnpackedTarball_xml2.mk +++ b/external/libxml2/UnpackedTarball_xml2.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL),,libxml2)) $(eval $(call gb_UnpackedTarball_add_patches,xml2,\ external/libxml2/libxml2-config.patch.1 \ - external/libxml2/libxml2-freebsd.patch.1 \ external/libxml2/libxml2-global-symbols.patch \ external/libxml2/libxml2-vc10.patch \ $(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \ diff --git a/external/libxml2/libxml2-freebsd.patch.1 b/external/libxml2/libxml2-freebsd.patch.1 deleted file mode 100644 index a874315..0000000 --- a/external/libxml2/libxml2-freebsd.patch.1 +++ /dev/null @@ -1,15 +0,0 @@ -Usual patch to produce Linux-like .so files on FreeBSD - ---- a/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 -+++ b/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 -@@ -6271,8 +6271,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current" -+ major=.`expr $current - $age` -+ versuffix=".$major.$age.$revision"; - ;; - - irix | nonstopux) diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 index 4db9f9b..da05e40 100644 --- a/external/libxml2/libxml2-icu.patch.0 +++ b/external/libxml2/libxml2-icu.patch.0 @@ -3,7 +3,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc +++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 @@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" CC = cl.exe - CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "NOLIBTOOL" /W1 $(CRUNTIME) + CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME) CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common !if "$(WITH_THREADS)" != "no" diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch index f88054e..f3f2b51 100644 --- a/external/libxml2/libxml2-vc10.patch +++ b/external/libxml2/libxml2-vc10.patch @@ -1,3 +1,5 @@ +Add SOLARINC, and disable SSE2 default for MSVC2012 + --- build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200 +++ build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200 @@ -59,6 +59,7 @@ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
