[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst libxml2/libxml2-configure.patch libxml2/libxml2-fixes.patch libxml2/libxml2-long-path.patch libxml2/libxml2-runtest.patch libxml2/libxml2-testapi.patch libxml2/makefile.mk libxslt/libxslt-bsd.patch libxslt/libxslt-configure.patch libxslt/libxslt-CVE-2015-7995.patch libxslt/libxsltversion.mk libxslt/libxslt-win_manifest.patch libxslt/makefile.mk
Don Lewis
truckman at apache.org
Wed Jun 15 06:08:21 UTC 2016
external_deps.lst | 8 +--
libxml2/libxml2-configure.patch | 71 ++++++++++------------------------
libxml2/libxml2-fixes.patch | 41 -------------------
libxml2/libxml2-long-path.patch | 45 +++------------------
libxml2/libxml2-runtest.patch | 11 -----
libxml2/libxml2-testapi.patch | 20 ---------
libxml2/makefile.mk | 13 ++----
libxslt/libxslt-CVE-2015-7995.patch | 24 +++++++++++
libxslt/libxslt-bsd.patch | 26 ------------
libxslt/libxslt-configure.patch | 74 +++++++++++++++++++++---------------
libxslt/libxslt-win_manifest.patch | 5 +-
libxslt/libxsltversion.mk | 2
libxslt/makefile.mk | 9 +---
13 files changed, 114 insertions(+), 235 deletions(-)
New commits:
commit c1173fdcf0046593b6b2783eb423601eb6f47b20
Author: Don Lewis <truckman at apache.org>
Date: Wed Jun 15 05:36:41 2016 +0000
#i126893#: Upgrade bundled libxml2 version to 2.9.3 and libxslt to 1.1.28
These security vulnerabilities have been fixed since the release of
libxml2-2.7.8 which is bundled with OpenOffice:
CVE-2011-3202
CVE-2011-3919
CVE-2013-0338
CVE-2013-0339
CVE-2013-2877
CVE-2014-0191
CVE-2014-3660
CVE-2015-1819
CVE-2015-5312
CVE-2015-7497
CVE-2015-7498
CVE-2015-7499
CVE-2015-7500
CVE-2015-7941
CVE-2015-7942
CVE-2015-8035
CVE-2015-8241
CVE-2015-8242
This vulnerability has been fixed since the release of libxslt-1.1.26:
CVE-2015-7995
Upgrade libxml2 to version 2.9.3 which has no publicly disclosed
vulnerabilities at this time.
Rebase libxml2-configure.patch to the new version of libxml2. The
freebsd-elf change to ltmain.sh is no longer necessary and is eliminated
from the patch. The fixes in libxml2-fixes.patch were either fixed
upstream or don't seem to apply anymore, so this patch file was deleted.
The fixes in libxml2-testapi.patch and libxml2-runtest.patch are in now
in the upstream source, so these patch files have been deleted.
The libxml2-mingw.patch and Solaris-specific libxml2-global-symbols.patch
were not updated and are disconnected from the build. Several of the
fixes in libxml2-long-path.patch are now fixed upstream.
Upgrade libxslt to version 1.1.28 and add libxslt-CVE-2015-7995.patch,
which is imported from the FreeBSD port and which appears to have been
cherry picked from upstream.
Rebase libxslt-configure.patch to the new version of libxslt, with
the libtool-related changes coming from the libxslt port to FreeBSD.
The fixes in libxslt-bsd.patch are now present in the upstream
source, so this patch was deleted.
Tested by: kschenk
diff --git a/external_deps.lst b/external_deps.lst
index 61bd7a5..722850d 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -175,14 +175,14 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXML != YES)
- MD5 = 8127a65e8c3b08856093099b52599c86
- name = libxml2-2.7.8.tar.gz
+ MD5 = daece17e045f1c107610e137ab50c179
+ name = libxml2-2.9.3.tar.gz
URL1 = http://xmlsoft.org/sources/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXSLT != YES)
- MD5 = e61d0364a30146aaa3001296f853b2b9
- name = libxslt-1.1.26.tar.gz
+ MD5 = 9667bf6f9310b957254fdcf6596600b7
+ name = libxslt-1.1.28.tar.gz
URL1 = http://xmlsoft.org/sources/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index b396b55..8d5437f 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -1,19 +1,7 @@
---- misc/libxml2-2.7.8/ltmain.sh 2009-10-06 17:39:54.000000000 +0100
-+++ misc/build/libxml2-2.7.8/ltmain.sh 2009-12-17 11:43:56.000000000 +0000
-@@ -6599,8 +6599,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current"
-+ major=.`expr $current - $age`
-+ versuffix=".$major.$age.$revision";
- ;;
-
- irix | nonstopux)
---- misc/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000
-+++ misc/build/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000
-@@ -264,7 +264,7 @@
+diff -ur misc/libxml2-2.9.3/include/libxml/xmlversion.h misc/build/libxml2-2.9.3/include/libxml/xmlversion.h
+--- misc/libxml2-2.9.3/include/libxml/xmlversion.h 2015-11-20 01:49:39.000000000 -0800
++++ misc/build/libxml2-2.9.3/include/libxml/xmlversion.h 2016-03-26 09:46:21.124032000 -0700
+@@ -273,7 +273,7 @@
*
* Whether iconv support is available
*/
@@ -22,7 +10,7 @@
#define LIBXML_ICONV_ENABLED
#endif
-@@ -291,7 +291,7 @@
+@@ -300,7 +300,7 @@
*
* Whether Debugging module is configured in
*/
@@ -31,26 +19,9 @@
#define LIBXML_DEBUG_ENABLED
#endif
-@@ -300,7 +300,7 @@
- *
- * Whether the memory debugging is configured in
- */
--#if 1
-+#if 0
- #define DEBUG_MEMORY_LOCATION
- #endif
-
-@@ -309,7 +309,7 @@
- *
- * Whether the runtime debugging is configured in
- */
--#if 1
-+#if 0
- #define LIBXML_DEBUG_RUNTIME
- #endif
-
---- misc/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:20.000000000 +0000
-+++ misc/build/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:36.000000000 +0000
+diff -ur misc/libxml2-2.9.3/xml2-config.in misc/build/libxml2-2.9.3/xml2-config.in
+--- misc/libxml2-2.9.3/xml2-config.in 2015-05-06 05:04:36.000000000 -0700
++++ misc/build/libxml2-2.9.3/xml2-config.in 2016-03-26 10:00:17.756184000 -0700
@@ -1,9 +1,14 @@
#! /bin/sh
@@ -75,12 +46,12 @@
--cflags)
- echo @XML_INCLUDEDIR@ @XML_CFLAGS@
-+ echo -I${includedir}
++ echo -I${includedir}
+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@
;;
--libtool-libs)
-@@ -82,19 +88,24 @@
+@@ -82,19 +88,26 @@
;;
--libs)
@@ -88,31 +59,33 @@
- then
- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
- then
-- echo @XML_LIBS@
+- echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
- else
-- echo @XML_LIBDIR@ @XML_LIBS@
+- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
- fi
- else
-- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
+- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
- fi
-+ echo -L${libdir} ${LIBXML2LIB} -lm
++ echo -L${libdir} ${LIBXML2LIB} -lm
+# if [ "`uname`" = "Linux" ]
+# then
+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
+# then
-+# echo @XML_LIBS@
++# echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+# else
-+# echo @XML_LIBDIR@ @XML_LIBS@
++# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+# fi
+# else
-+# echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
++# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
+# fi
++
;;
+ print) # ugly configure hack
-+ exit 0
-+ ;;
-+
++ exit 0
++ ;;
++
++
*)
usage
exit 1
diff --git a/libxml2/libxml2-fixes.patch b/libxml2/libxml2-fixes.patch
deleted file mode 100644
index 1a2b2487..0000000
--- a/libxml2/libxml2-fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru misc/libxml2-2.7.8/parser.c misc/build/libxml2-2.7.8/parser.c
---- misc/libxml2-2.7.8/parser.c 2010-11-04 10:55:45.000000000 -0500
-+++ misc/build/libxml2-2.7.8/parser.c 2012-12-20 14:53:03.000000000 -0500
-@@ -2709,7 +2709,7 @@
-
- buffer[nbchars++] = '&';
- if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
-- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-+ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
- }
- for (;i > 0;i--)
- buffer[nbchars++] = *cur++;
-diff -ru misc/libxml2-2.7.8/xpointer.c misc/build/libxml2-2.7.8/xpointer.c
---- misc/libxml2-2.7.8/xpointer.c 2010-10-12 01:25:33.000000000 -0500
-+++ misc/build/libxml2-2.7.8/xpointer.c 2012-12-20 14:53:03.000000000 -0500
-@@ -1007,21 +1007,14 @@
- NEXT;
- break;
- }
-- *cur++ = CUR;
- } else if (CUR == '(') {
- level++;
-- *cur++ = CUR;
- } else if (CUR == '^') {
-- NEXT;
-- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) {
-- *cur++ = CUR;
-- } else {
-- *cur++ = '^';
-- *cur++ = CUR;
-- }
-- } else {
-- *cur++ = CUR;
-+ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) {
-+ NEXT;
-+ }
- }
-+ *cur++ = CUR;
- NEXT;
- }
- *cur = 0;
diff --git a/libxml2/libxml2-long-path.patch b/libxml2/libxml2-long-path.patch
index 88afed8..cfa79c8 100644
--- a/libxml2/libxml2-long-path.patch
+++ b/libxml2/libxml2-long-path.patch
@@ -1,11 +1,10 @@
---- misc/libxml2-2.7.8/uri.c 2009-10-02 17:28:55.000000000 +0200
-+++ misc/build/libxml2-2.7.8/uri.c 2011-02-24 13:47:19.349299000 +0100
-@@ -2479,7 +2479,16 @@
- if (path == NULL)
- return(NULL);
+--- misc/libxml2-2.9.3/uri.c 2015-11-02 23:28:09.000000000 -0800
++++ misc/build/libxml2-2.9.3/uri.c 2016-03-26 10:19:45.838472000 -0700
+@@ -2412,6 +2412,15 @@
+ return xmlStrdup((const xmlChar *) path);
+ #endif
-- /* sanitize filename starting with // so it can be used as URI */
-+#if defined(_WIN32)
++#if defined(_WIN32)
+ //We must not change the backslashes to slashes if the the path starts with
+ // \\?\
+ //Those paths can be up to 32k characters long.
@@ -14,36 +13,6 @@
+ return xmlStrdup((const xmlChar *) path);
+#endif
+
-+ /* sanitize filename starting with // so it can be used as URI */
+ /* sanitize filename starting with // so it can be used as URI */
if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/'))
path++;
-
---- misc/libxml2-2.7.8/xmlIO.c 2009-09-24 17:32:00.000000000 +0200
-+++ misc/build/libxml2-2.7.8/xmlIO.c 2011-02-24 13:47:26.163762000 +0100
-@@ -772,6 +772,11 @@
-
- #ifdef HAVE_STAT
- #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
-+ //On Windows stat and wstat do not work with long pathname,
-+ //which start with '\\?\'
-+ if ((xmlStrlen(path) > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') )
-+ return 1;
-+
- if (xmlWrapStat(path, &stat_buffer) == -1)
- return 0;
- #else
---- misc/libxml2-2.7.8/win32/Makefile.msvc 2010-11-04 09:58:43.000000000 -0500
-+++ misc/build/libxml2-2.7.8/win32/Makefile.msvc 2012-12-21 01:07:45.000000000 -0500
-@@ -71,9 +71,9 @@
- !if "$(WITH_ICONV)" == "1"
- LIBS = $(LIBS) iconv.lib
- !endif
--+!if "$(WITH_ICU)" == "1"
--+LIBS = $(LIBS) icu.lib
--+!endif
-+!if "$(WITH_ICU)" == "1"
-+LIBS = $(LIBS) icu.lib
-+!endif
- !if "$(WITH_ZLIB)" == "1"
- LIBS = $(LIBS) zdll.lib
- !endif
diff --git a/libxml2/libxml2-runtest.patch b/libxml2/libxml2-runtest.patch
deleted file mode 100644
index 8a78e93..0000000
--- a/libxml2/libxml2-runtest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libxml2-2.7.8/runtest.c 2009-09-24 23:32:00.000000000 +0800
-+++ misc/build/libxml2-2.7.8/runtest.c 2012-05-29 14:17:16.852600200 +0800
-@@ -2728,7 +2728,7 @@
- "file:///path/to/a%20b.html",
- "/path/to/a b.html",
- "/path/to/a%20b.html",
-- "urip://example.com/résumé.html",
-+ "urip://example.com/r\xE9sum\xE9.html", /* i93433: replaced 'e' encoded in ISO-8859-1 as in 'resume' with \xe9 */
- "urip://example.com/test?a=1&b=2%263&c=4#foo",
- NULL
- };
diff --git a/libxml2/libxml2-testapi.patch b/libxml2/libxml2-testapi.patch
deleted file mode 100644
index 447eba4..0000000
--- a/libxml2/libxml2-testapi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libxml2-2.7.8/testapi.c 2009-09-24 23:32:00.000000000 +0800
-+++ misc/build/libxml2-2.7.8/testapi.c 2012-05-29 14:17:00.868020600 +0800
-@@ -291,7 +291,7 @@
- static xmlChar gen_xmlChar(int no, int nr ATTRIBUTE_UNUSED) {
- if (no == 0) return('a');
- if (no == 1) return(' ');
-- if (no == 2) return((xmlChar) 'ø');
-+ if (no == 2) return((xmlChar) '\xF8'); /* i93433: replaced 'ø' encoded in ISO-8859-1 with '\xf8' */
- return(0);
- }
-
-@@ -399,7 +399,7 @@
- static xmlChar *gen_const_xmlChar_ptr(int no, int nr ATTRIBUTE_UNUSED) {
- if (no == 0) return((xmlChar *) "foo");
- if (no == 1) return((xmlChar *) "<foo/>");
-- if (no == 2) return((xmlChar *) "nøne");
-+ if (no == 2) return((xmlChar *) "n\xF8ne"); /* i93433: replaced 'ø' encoded in ISO-8859-1 with '\xf8' */
- if (no == 3) return((xmlChar *) " 2ab ");
- return(NULL);
- }
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 79f66eb..3ba8c87 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -38,18 +38,15 @@ all:
# --- Files --------------------------------------------------------
-LIBXML2VERSION=2.7.8
+LIBXML2VERSION=2.9.3
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
-TARFILE_MD5=8127a65e8c3b08856093099b52599c86
+TARFILE_MD5=daece17e045f1c107610e137ab50c179
+
+PATCH_FILES=libxml2-configure.patch
# libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols
-PATCH_FILES=libxml2-configure.patch \
- libxml2-mingw.patch \
- libxml2-fixes.patch \
- libxml2-global-symbols.patch \
- libxml2-testapi.patch \
- libxml2-runtest.patch
+# libxml2-global-symbols.patch
.IF "$(OS)" == "WNT"
PATCH_FILES+= libxml2-long-path.patch
diff --git a/libxslt/libxslt-CVE-2015-7995.patch b/libxslt/libxslt-CVE-2015-7995.patch
new file mode 100644
index 0000000..59a6fbf
--- /dev/null
+++ b/libxslt/libxslt-CVE-2015-7995.patch
@@ -0,0 +1,24 @@
+From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard at redhat.com>
+Date: Thu, 29 Oct 2015 19:33:23 +0800
+Subject: 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(-)
+
+--- misc/libxslt-1.1.28/libxslt/preproc.c 2012-09-11 22:59:42.000000000 -0700
++++ misc/build/libxslt-1.1.28/libxslt/preproc.c 2016-03-26 11:04:43.636524000 -0700
+@@ -2245,7 +2245,8 @@
+ } 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"))) {
diff --git a/libxslt/libxslt-bsd.patch b/libxslt/libxslt-bsd.patch
deleted file mode 100644
index cbb9efe..0000000
--- a/libxslt/libxslt-bsd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- misc/libxslt-1.1.26/libexslt/date.c.orig 2007-09-07 10:59:04.000000000 -0500
-+++ misc/build/libxslt-1.1.26/libexslt/date.c 2007-09-07 10:59:21.000000000 -0500
-@@ -28,7 +28,7 @@
- #include "config.h"
- #endif
-
--#if HAVE_LOCALTIME_R /* _POSIX_SOURCE required by gnu libc */
-+#if defined(HAVE_LOCALTIME_R) && defined(__GLIBC__) /* _POSIX_SOURCE required by gnu libc */
- #ifndef _AIX51 /* but on AIX we're not using gnu libc */
- #define _POSIX_SOURCE
- #endif
---- misc/libxslt-1.1.26/libxslt/extra.c.orig 2009-05-12 01:29:34.000000000 -0500
-+++ misc/build/libxslt-1.1.26/libxslt/extra.c 2011-11-14 20:46:39.000000000 -0500
-@@ -243,8 +243,11 @@
- * Calling localtime() has the side-effect of setting timezone.
- * After we know the timezone, we can adjust for it
- */
-+#if !defined(__FreeBSD__)
- lmt = gmt - timezone;
--
-+#else /* FreeBSD DOESN'T HAVE such side-ffect */
-+ lmt = gmt - local_tm->tm_gmtoff;
-+#endif
- /*
- * FIXME: it's been too long since I did manual memory management.
- * (I swore never to do it again.) Does this introduce a memory leak?
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index f556b11..4b82fa3 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,32 +1,37 @@
---- misc/libxslt-1.1.26/ltmain.sh Wed Aug 29 14:28:46 2007
-+++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008
-@@ -6195,9 +6195,9 @@
+diff -ur misc/libxslt-1.1.28/ltmain.sh misc/build/libxslt-1.1.28/ltmain.sh
+--- misc/libxslt-1.1.28/ltmain.sh 2012-11-20 23:21:48.000000000 -0800
++++ misc/build/libxslt-1.1.28/ltmain.sh 2016-03-27 11:14:40.564087000 -0700
+@@ -7331,13 +7331,13 @@
+ #
+ case $version_type in
+ # correct linux to gnu/linux during the next big refactor
+- darwin|linux|osf|windows|none)
++ darwin|freebsd-elf|linux|osf|windows|none)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
+ age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|sunos)
-- current="$number_major"
-- revision="$number_minor"
-- age="0"
-+ current=`expr $number_major + $number_minor`
-+ age="$number_minor"
-+ revision="$number_revision"
- ;;
- irix|nonstopux)
- func_arith $number_major + $number_minor
-@@ -6271,8 +6271,8 @@
+- freebsd-aout|freebsd-elf|qnx|sunos)
++ freebsd-aout|qnx|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -7414,8 +7414,8 @@
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
-+ major=.`expr $current - $age`
-+ versuffix="$major"
++ major=.$(($current - $age))
++ versuffix="$major.$age.$revision"
;;
irix | nonstopux)
---- misc/libxslt-1.1.26/xslt-config.in Wed Jan 17 14:18:26 2007
-+++ misc/build/libxslt-1.1.26/xslt-config.in Wed Jun 25 13:06:05 2008
-@@ -1,10 +1,16 @@
+diff -ur misc/libxslt-1.1.28/xslt-config.in misc/build/libxslt-1.1.28/xslt-config.in
+--- misc/libxslt-1.1.28/xslt-config.in 2012-09-04 07:26:23.000000000 -0700
++++ misc/build/libxslt-1.1.28/xslt-config.in 2016-03-26 10:54:11.377552000 -0700
+@@ -1,10 +1,15 @@
#! /bin/sh
-prefix=@prefix@
@@ -36,7 +41,6 @@
+#exec_prefix_set=no
+#includedir=@includedir@
+#libdir=@libdir@
-+
+prefix=${SOLARVERSION}/${INPATH}
+exec_prefix=${SOLARVERSION}/${INPATH}
exec_prefix_set=no
@@ -47,19 +51,20 @@
usage()
{
-@@ -89,7 +95,8 @@
+@@ -89,7 +94,8 @@
shift
done
--the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
-+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
+-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
++#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
+the_libs="-L${libdir} ${XSLTLIB} -lm"
if test "$includedir" != "/usr/include"; then
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
else
---- misc/libxslt-1.1.26/configure 2008-05-14 00:40:54.000000000 +0900
-+++ misc/build/libxslt-1.1.26/configure 2008-07-17 22:12:38.097000000 +0900
-@@ -7437,7 +7437,7 @@
+diff -ur misc/libxslt-1.1.28/configure misc/build/libxslt-1.1.28/configure
+--- misc/libxslt-1.1.28/configure 2012-11-20 23:11:21.000000000 -0800
++++ misc/build/libxslt-1.1.28/configure 2016-03-27 12:43:44.464670000 -0700
+@@ -6462,7 +6462,7 @@
cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh
@@ -68,12 +73,21 @@
lt_cv_file_magic_cmd='func_win32_libid'
;;
-@@ -7446,7 +7446,7 @@
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
+@@ -6472,7 +6472,7 @@
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+@@ -11635,7 +11635,7 @@
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major'
+ need_version=no
+ need_lib_prefix=no
+ ;;
diff --git a/libxslt/libxslt-win_manifest.patch b/libxslt/libxslt-win_manifest.patch
index 43c14eb..5df814c 100644
--- a/libxslt/libxslt-win_manifest.patch
+++ b/libxslt/libxslt-win_manifest.patch
@@ -1,5 +1,6 @@
---- misc/libxslt-1.1.26/win32/configure.js 2007-08-03 15:41:02.000000000 +0200
-+++ misc/build/libxslt-1.1.26/win32/configure.js 2009-05-07 13:09:42.294993200 +0200
+diff -ur misc/libxslt-1.1.28/win32/configure.js misc/build/libxslt-1.1.28/win32/configure.js
+--- misc/libxslt-1.1.28/win32/configure.js 2012-09-04 07:26:23.000000000 -0700
++++ misc/build/libxslt-1.1.28/win32/configure.js 2016-03-26 12:15:07.661269000 -0700
@@ -52,7 +52,7 @@
var dirSep = "\\";
var compiler = "msvc";
diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk
index db3faba..3feab6f 100644
--- a/libxslt/libxsltversion.mk
+++ b/libxslt/libxsltversion.mk
@@ -25,5 +25,5 @@ LIBXSLT_MAJOR=1
# minor
LIBXSLT_MINOR=1
# micro
-LIBXSLT_MICRO=26
+LIBXSLT_MICRO=28
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 334f3d0..b0c21b6 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -45,14 +45,13 @@ all:
LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
+TARFILE_MD5=9667bf6f9310b957254fdcf6596600b7
# libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be defined
PATCH_FILES=libxslt-configure.patch \
- libxslt-bsd.patch \
libxslt-win_manifest.patch \
- libxslt-mingw.patch \
- libxslt-internal-symbols.patch
+ libxslt-CVE-2015-7995.patch
+
# This is only for UNX environment now
@@ -110,7 +109,7 @@ CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none
.ENDIF # "$(COMNAME)"=="sunpro5"
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes
+CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes ac_cv_func_clock_gettime=false
BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
More information about the Libreoffice-commits
mailing list