You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by Matthias Seidel <ma...@hamburg.de> on 2018/08/28 10:46:23 UTC
Re: svn commit: r1839349 - in /openoffice/branches/AOO416: ./ main/
main/libxml2/ main/libxslt/
Hi Jim,
Another one:
---
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|<<<<<<< .working
|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
--------------------------
File to patch: patching file openssl-0.9.8zh/crypto/x509v3/v3_pci.c
---
Regards,
Matthias
Am 27.08.2018 um 19:26 schrieb jim@apache.org:
> Author: jim
> Date: Mon Aug 27 17:26:33 2018
> New Revision: 1839349
>
> URL: http://svn.apache.org/viewvc?rev=1839349&view=rev
> Log:
> Merge r1748497, r1758150, r1839130 from trunk:
>
> #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
>
>
> Upgrade bundled libxml2 from version 2.9.3 to version 2.9.4 to fix:
> CVE-2016-1762
> CVE-2016-1833
> CVE-2016-1834
> CVE-2016-1835
> CVE-2016-1836
> CVE-2016-1837
> CVE-2016-1838
> CVE-2016-1839
> CVE-2016-1840
> CVE-2016-3627
> CVE-2016-3705
> CVE-2016-4449
> CVE-2016-4483
> It is not known whether any of these affect OpenOffice.
>
> Import a post-2.9.4 patch from the upstream git repo to fix a build
> problem on systems with pre-C99 compilers.
>
>
>
> Upgrade bundled libxml2 to version 2.9.8 and libxslt to version
> 1.1.32. Some of the patches for the previous version of libxml2
> have been picked up upstream and are no longer needed. One new
> patch is needed for clean builds on Windows, so cherrypick it from
> upstream.
>
>
> Submitted by: truckman
> Reviewed by: jim
>
> Added:
> openoffice/branches/AOO416/main/libxml2/libxml2-nan-inf-fix.patch
> - copied unchanged from r1839130, openoffice/trunk/main/libxml2/libxml2-nan-inf-fix.patch
> openoffice/branches/AOO416/main/libxslt/libxslt-CVE-2015-7995.patch
> - copied unchanged from r1748497, openoffice/trunk/main/libxslt/libxslt-CVE-2015-7995.patch
> Removed:
> openoffice/branches/AOO416/main/libxml2/libxml2-fixes.patch
> openoffice/branches/AOO416/main/libxml2/libxml2-long-path.patch
> openoffice/branches/AOO416/main/libxml2/libxml2-runtest.patch
> openoffice/branches/AOO416/main/libxml2/libxml2-testapi.patch
> openoffice/branches/AOO416/main/libxslt/libxslt-bsd.patch
> Modified:
> openoffice/branches/AOO416/ (props changed)
> openoffice/branches/AOO416/main/ (props changed)
> openoffice/branches/AOO416/main/external_deps.lst
> openoffice/branches/AOO416/main/libxml2/libxml2-configure.patch
> openoffice/branches/AOO416/main/libxml2/makefile.mk
> openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch
> openoffice/branches/AOO416/main/libxslt/libxslt-win_manifest.patch
> openoffice/branches/AOO416/main/libxslt/libxsltversion.mk
> openoffice/branches/AOO416/main/libxslt/makefile.mk
>
> Propchange: openoffice/branches/AOO416/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Aug 27 17:26:33 2018
> @@ -2,5 +2,5 @@
> /openoffice/branches/ia2:1417739-1541842
> /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
> /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
> -/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,175
> 5873,1760461,1761439,1763017,1763019,1765170,1766467,1766530,1766915,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805208,1806314,1811013,1811435,1811737,1813450,1814994,1815700
> +/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,174
> 8497,1755873,1758150,1760461,1761439,1763017,1763019,1765170,1766467,1766530,1766915,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805208,1806314,1811013,1811435,1811737,1813450,1814994,1815700,1839130
> /openoffice/trunk/main:1705369
>
> Propchange: openoffice/branches/AOO416/main/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Aug 27 17:26:33 2018
> @@ -2,4 +2,4 @@
> /openoffice/branches/ia2/main:1417739-1541842
> /openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
> /openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
> -/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169780
> 7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1755873,1760461,1761439,1763017,1763019,1765170,1766467,1766915,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805208,1806314,1811737,1813450,1815700
> +/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169780
> 7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1748497,1755873,1758150,1760461,1761439,1763017,1763019,1765170,1766467,1766915,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805208,1806314,1811737,1813450,1815700,1839130
>
> Modified: openoffice/branches/AOO416/main/external_deps.lst
> URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/external_deps.lst?rev=1839349&r1=1839348&r2=1839349&view=diff
> ==============================================================================
> --- openoffice/branches/AOO416/main/external_deps.lst (original)
> +++ openoffice/branches/AOO416/main/external_deps.lst Mon Aug 27 17:26:33 2018
> @@ -173,14 +173,14 @@ if ( true )
> URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
>
> if (SYSTEM_LIBXML != YES)
> - MD5 = 8127a65e8c3b08856093099b52599c86
> - name = libxml2-2.7.8.tar.gz
> + MD5 = b786e353e2aa1b872d70d5d1ca0c740d
> + name = libxml2-2.9.8.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 = 1fc72f98e98bf4443f1651165f3aa146
> + name = libxslt-1.1.32.tar.gz
> URL1 = http://xmlsoft.org/sources/$(name)
> URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
>
>
> Modified: openoffice/branches/AOO416/main/libxml2/libxml2-configure.patch
> URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxml2/libxml2-configure.patch?rev=1839349&r1=1839348&r2=1839349&view=diff
> ==============================================================================
> --- openoffice/branches/AOO416/main/libxml2/libxml2-configure.patch (original)
> +++ openoffice/branches/AOO416/main/libxml2/libxml2-configure.patch Mon Aug 27 17:26:33 2018
> @@ -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.8/include/libxml/xmlversion.h misc/build/libxml2-2.9.8/include/libxml/xmlversion.h
> +--- misc/libxml2-2.9.8/include/libxml/xmlversion.h 2018-03-05 07:54:29.000000000 -0800
> ++++ misc/build/libxml2-2.9.8/include/libxml/xmlversion.h 2018-08-22 22:53:15.488158000 -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.8/xml2-config.in misc/build/libxml2-2.9.8/xml2-config.in
> +--- misc/libxml2-2.9.8/xml2-config.in 2016-06-07 03:04:14.000000000 -0700
> ++++ misc/build/libxml2-2.9.8/xml2-config.in 2018-08-22 22:53:15.489086000 -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
>
> Modified: openoffice/branches/AOO416/main/libxml2/makefile.mk
> URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxml2/makefile.mk?rev=1839349&r1=1839348&r2=1839349&view=diff
> ==============================================================================
> --- openoffice/branches/AOO416/main/libxml2/makefile.mk (original)
> +++ openoffice/branches/AOO416/main/libxml2/makefile.mk Mon Aug 27 17:26:33 2018
> @@ -38,21 +38,18 @@ all:
>
> # --- Files --------------------------------------------------------
>
> -LIBXML2VERSION=2.7.8
> +LIBXML2VERSION=2.9.8
>
> TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
> -TARFILE_MD5=8127a65e8c3b08856093099b52599c86
> +TARFILE_MD5=b786e353e2aa1b872d70d5d1ca0c740d
> +
> +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
> +PATCH_FILES+= libxml2-nan-inf-fix.patch
> .ENDIF
>
> # This is only for UNX environment now
>
> Modified: openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch
> URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch?rev=1839349&r1=1839348&r2=1839349&view=diff
> ==============================================================================
> --- openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch (original)
> +++ openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch Mon Aug 27 17:26:33 2018
> @@ -1,32 +1,41 @@
> ---- 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 @@
> +<<<<<<< .working
> +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 @@
> ;;
> +diff -ur misc/libxslt-1.1.32/configure misc/build/libxslt-1.1.32/configure
> +--- misc/libxslt-1.1.32/configure 2017-11-02 13:34:22.000000000 -0700
> ++++ misc/build/libxslt-1.1.32/configure 2018-08-22 23:00:50.689433000 -0700
> +@@ -6698,7 +6698,7 @@
>
> 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.32/xslt-config.in misc/build/libxslt-1.1.32/xslt-config.in
> +--- misc/libxslt-1.1.32/xslt-config.in 2015-05-10 07:11:30.000000000 -0700
> ++++ misc/build/libxslt-1.1.32/xslt-config.in 2018-08-22 23:00:50.689988000 -0700
> +@@ -1,10 +1,15 @@
> #! /bin/sh
>
> -prefix=@prefix@
> @@ -36,7 +45,6 @@
> +#exec_prefix_set=no
> +#includedir=@includedir@
> +#libdir=@libdir@
> -+
> +prefix=${SOLARVERSION}/${INPATH}
> +exec_prefix=${SOLARVERSION}/${INPATH}
> exec_prefix_set=no
> @@ -47,19 +55,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 +77,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
> + ;;
>
> Modified: openoffice/branches/AOO416/main/libxslt/libxslt-win_manifest.patch
> URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxslt/libxslt-win_manifest.patch?rev=1839349&r1=1839348&r2=1839349&view=diff
> ==============================================================================
> --- openoffice/branches/AOO416/main/libxslt/libxslt-win_manifest.patch (original)
> +++ openoffice/branches/AOO416/main/libxslt/libxslt-win_manifest.patch Mon Aug 27 17:26:33 2018
> @@ -1,6 +1,7 @@
> ---- 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
> -@@ -52,7 +52,7 @@
> +diff -ur misc/libxslt-1.1.32/win32/configure.js misc/build/libxslt-1.1.32/win32/configure.js
> +--- misc/libxslt-1.1.32/win32/configure.js 2017-10-26 00:55:47.000000000 -0700
> ++++ misc/build/libxslt-1.1.32/win32/configure.js 2018-08-22 23:07:38.152976000 -0700
> +@@ -51,7 +51,7 @@
> var dirSep = "\\";
> var compiler = "msvc";
> var cruntime = "/MD";
>
> Modified: openoffice/branches/AOO416/main/libxslt/libxsltversion.mk
> URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxslt/libxsltversion.mk?rev=1839349&r1=1839348&r2=1839349&view=diff
> ==============================================================================
> --- openoffice/branches/AOO416/main/libxslt/libxsltversion.mk (original)
> +++ openoffice/branches/AOO416/main/libxslt/libxsltversion.mk Mon Aug 27 17:26:33 2018
> @@ -25,5 +25,5 @@ LIBXSLT_MAJOR=1
> # minor
> LIBXSLT_MINOR=1
> # micro
> -LIBXSLT_MICRO=26
> +LIBXSLT_MICRO=32
>
>
> Modified: openoffice/branches/AOO416/main/libxslt/makefile.mk
> URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxslt/makefile.mk?rev=1839349&r1=1839348&r2=1839349&view=diff
> ==============================================================================
> --- openoffice/branches/AOO416/main/libxslt/makefile.mk (original)
> +++ openoffice/branches/AOO416/main/libxslt/makefile.mk Mon Aug 27 17:26:33 2018
> @@ -45,14 +45,13 @@ all:
> LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
>
> TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
> -TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
> +TARFILE_MD5=1fc72f98e98bf4443f1651165f3aa146
>
> # 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)
>
>
>