- up to 7.0.100; fixes CVE-2019-17563, CVE-2019-12418, CVE-2019-17569, CVE-2020-1935...

[packages/tomcat.git] / tomcat-build.patch

diff --git a/tomcat-build.patch b/tomcat-build.patch
index 403779e35bc81e144308e1d1c9c6ac1c5604ee26..7dee22546ec35375e1d7cda5850f347a3f485b19 100644 (file)
--- a/tomcat-build.patch
+++ b/tomcat-build.patch
@@ -1,33 +1,56 @@
---- apache-tomcat-7.0.70-src/build.xml~        2016-07-19 15:43:44.000000000 +0200
-+++ apache-tomcat-7.0.70-src/build.xml 2016-07-19 15:48:19.615551746 +0200
-@@ -1836,7 +1836,7 @@ Apache Tomcat ${version} native binaries
+--- apache-tomcat-7.0.100-src/build.xml~       2020-02-29 19:29:03.000000000 +0100
++++ apache-tomcat-7.0.100-src/build.xml        2020-02-29 19:30:10.956020378 +0100
+@@ -1981,7 +1981,7 @@ Apache Tomcat ${version} native binaries
+       encoding="UTF-8"
+       docencoding="UTF-8"
+       charset="UTF-8"
+-      additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++      additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+       source="${compile.source}"
+       maxmemory="512m"
+       failonerror="true">
+@@ -2002,7 +2002,7 @@ Apache Tomcat ${version} native binaries
+       encoding="ISO-8859-1"
+       docencoding="ISO-8859-1"
+       charset="ISO-8859-1"
+-      additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++      additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+       source="${compile.source}"
+       maxmemory="512m"
+       failonerror="true"
+@@ -2024,7 +2024,7 @@ Apache Tomcat ${version} native binaries
+       encoding="ISO-8859-1"
+       docencoding="ISO-8859-1"
+       charset="ISO-8859-1"
+-      additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++      additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+       source="${compile.source}"
+       maxmemory="512m"
+       failonerror="true"
+@@ -2046,7 +2046,7 @@ Apache Tomcat ${version} native binaries
        encoding="ISO-8859-1"
        docencoding="ISO-8859-1"
        charset="ISO-8859-1"
--      additionalparam="-breakiterator -notimestamp"
-+      additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+-      additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++      additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+       source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
-       executable="${java.7.home}/bin/javadoc">
---- apache-tomcat-7.0.70-src/build.xml~        2016-07-19 15:48:55.000000000 +0200
-+++ apache-tomcat-7.0.70-src/build.xml 2016-07-19 15:52:07.842156930 +0200
-@@ -1857,7 +1857,7 @@ Apache Tomcat ${version} native binaries
+@@ -2068,7 +2068,7 @@ Apache Tomcat ${version} native binaries
        encoding="ISO-8859-1"
        docencoding="ISO-8859-1"
        charset="ISO-8859-1"
--      additionalparam="-breakiterator -notimestamp"
-+      additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+-      additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++      additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+       source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
-       executable="${java.7.home}/bin/javadoc">
---- apache-tomcat-7.0.70-src/build.xml~        2016-07-19 15:52:27.000000000 +0200
-+++ apache-tomcat-7.0.70-src/build.xml 2016-07-19 15:53:28.337957151 +0200
-@@ -1919,7 +1919,7 @@ Apache Tomcat ${version} native binaries
+@@ -2089,7 +2089,7 @@ Apache Tomcat ${version} native binaries
        encoding="ISO-8859-1"
        docencoding="ISO-8859-1"
        charset="ISO-8859-1"
--      additionalparam="-breakiterator -notimestamp"
-+      additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+-      additionalparam="-breakiterator -notimestamp ${java9.javadoc.options} -J-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -XDignore.symbol.file"
++      additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options} -J-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -XDignore.symbol.file"
+       source="${compile.source}"
        maxmemory="512m"
        failonerror="true"
-       executable="${java.7.home}/bin/javadoc">