Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2019-05-03 22:29:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Fri May 3 22:29:18 2019 rev:52 rq:696888 version:9.0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2019-04-18 13:54:29.167917562 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new.5148/tomcat.changes 2019-05-03 22:29:20.496326256 +0200 @@ -1,0 +2,15 @@ +Mon Apr 22 17:01:17 UTC 2019 - [email protected] + +- Update to Tomcat 9.0.19. See changelog at + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.19_(markt) + Notable packaging changes: + - File /usr/share/java/tomcat/catalina-jmx-remote.jar was removed. + The classes contained in this jar were merged into + /usr/share/java/tomcat/catalina.jar. +- Fixed CVEs: + - CVE-2019-0199 (bsc#1131055) +- Rebased patch: + - tomcat-9.0-JDTCompiler-java.patch + - tomcat-9.0-javadoc.patch + +------------------------------------------------------------------- Old: ---- apache-tomcat-9.0.14-src.tar.gz apache-tomcat-9.0.14-src.tar.gz.asc New: ---- apache-tomcat-9.0.19-src.tar.gz apache-tomcat-9.0.19-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.AZ5sjG/_old 2019-05-03 22:29:21.324325982 +0200 +++ /var/tmp/diff_new_pack.AZ5sjG/_new 2019-05-03 22:29:21.328325982 +0200 @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -22,7 +22,7 @@ %define elspec 3.0 %define major_version 9 %define minor_version 0 -%define micro_version 14 +%define micro_version 19 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} @@ -260,7 +260,7 @@ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete %patch0 %patch1 -%patch2 +%patch2 -p1 %patch3 %patch4 -p1 %patch5 -p1 @@ -303,7 +303,7 @@ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ - deploy dist-prepare dist-source javadoc package embed-jars extras-jmx-remote + deploy dist-prepare dist-source javadoc package embed-jars # remove some jars that we'll replace with symlinks later rm output/build/bin/commons-daemon.jar \ @@ -376,11 +376,6 @@ cp -a *.jar %{buildroot}%{libdir} popd -# tomcat extras -pushd output/extras - cp -a *.jar %{buildroot}%{libdir} -popd - # javadoc cp -a output/dist/webapps/docs/api/* %{buildroot}%{_javadocdir}/%{name} ++++++ apache-tomcat-9.0.14-src.tar.gz -> apache-tomcat-9.0.19-src.tar.gz ++++++ ++++ 47866 lines of diff (skipped) ++++++ tomcat-9.0-JDTCompiler-java.patch ++++++ --- /var/tmp/diff_new_pack.AZ5sjG/_old 2019-05-03 22:29:22.348325646 +0200 +++ /var/tmp/diff_new_pack.AZ5sjG/_new 2019-05-03 22:29:22.348325646 +0200 @@ -1,11 +1,8 @@ -Index: java/org/apache/jasper/compiler/JDTCompiler.java -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 +Index: apache-tomcat-9.0.19-src/java/org/apache/jasper/compiler/JDTCompiler.java =================================================================== ---- java/org/apache/jasper/compiler/JDTCompiler.java (revision 6bbf738a0e56d1793022b15e9aca9b690699216b) -+++ java/org/apache/jasper/compiler/JDTCompiler.java (date 1534261527000) -@@ -312,15 +312,16 @@ +--- apache-tomcat-9.0.19-src.orig/java/org/apache/jasper/compiler/JDTCompiler.java ++++ apache-tomcat-9.0.19-src/java/org/apache/jasper/compiler/JDTCompiler.java +@@ -312,18 +312,18 @@ public class JDTCompiler extends org.apa CompilerOptions.VERSION_1_7); } else if(opt.equals("1.8")) { settings.put(CompilerOptions.OPTION_Source, @@ -16,18 +13,24 @@ } else if(opt.equals("9") || opt.equals("1.9")) { settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_9); -+ "9"); ++ "9"); // CompilerOptions.VERSION_9 } else if(opt.equals("10")) { settings.put(CompilerOptions.OPTION_Source, - CompilerOptions.VERSION_10); -+ "10"); -+ - } else { - log.warn("Unknown source VM " + opt + " ignored."); ++ "10"); // CompilerOptions.VERSION_10 + } else if(opt.equals("11")) { settings.put(CompilerOptions.OPTION_Source, -@@ -366,19 +367,19 @@ +- CompilerOptions.VERSION_11); ++ "11"); // CompilerOptions.VERSION_11 + } else if(opt.equals("12")) { + // Constant not available in latest ECJ version shipped with + // Tomcat. May be supported in a snapshot build. +@@ -377,26 +377,26 @@ public class JDTCompiler extends org.apa + CompilerOptions.VERSION_1_7); + } else if(opt.equals("1.8")) { settings.put(CompilerOptions.OPTION_TargetPlatform, - CompilerOptions.VERSION_1_8); +- CompilerOptions.VERSION_1_8); ++ "1.8"); // CompilerOptions.VERSION_1_8 settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_1_8); + "1.8"); // CompilerOptions.VERSION_1_8 @@ -36,17 +39,24 @@ } else if(opt.equals("9") || opt.equals("1.9")) { settings.put(CompilerOptions.OPTION_TargetPlatform, - CompilerOptions.VERSION_9); -+ "9"); // CompilerOptions.VERSION_1_9 ++ "9"); // CompilerOptions.VERSION_9 settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_9); -+ "9"); // CompilerOptions.VERSION_1_9 ++ "9"); // CompilerOptions.VERSION_9 } else if(opt.equals("10")) { settings.put(CompilerOptions.OPTION_TargetPlatform, - CompilerOptions.VERSION_10); -+ "10"); ++ "10"); // CompilerOptions.VERSION_10 settings.put(CompilerOptions.OPTION_Compliance, - CompilerOptions.VERSION_10); -+ "10"); - } else { - log.warn("Unknown target VM " + opt + " ignored."); ++ "10"); // CompilerOptions.VERSION_10 + } else if(opt.equals("11")) { settings.put(CompilerOptions.OPTION_TargetPlatform, +- CompilerOptions.VERSION_11); ++ "11"); // CompilerOptions.VERSION_11 + settings.put(CompilerOptions.OPTION_Compliance, +- CompilerOptions.VERSION_11); ++ "11"); // CompilerOptions.VERSION_11 + } else if(opt.equals("12")) { + // Constant not available in latest ECJ version shipped with + // Tomcat. May be supported in a snapshot build. ++++++ tomcat-9.0-javadoc.patch ++++++ --- /var/tmp/diff_new_pack.AZ5sjG/_old 2019-05-03 22:29:22.368325639 +0200 +++ /var/tmp/diff_new_pack.AZ5sjG/_new 2019-05-03 22:29:22.368325639 +0200 @@ -1,8 +1,8 @@ -Index: apache-tomcat-9.0.12-src/build.xml +Index: apache-tomcat-9.0.17-src/build.xml =================================================================== ---- apache-tomcat-9.0.12-src.orig/build.xml -+++ apache-tomcat-9.0.12-src/build.xml -@@ -1861,10 +1861,11 @@ Apache Tomcat ${version} native binaries +--- apache-tomcat-9.0.17-src.orig/build.xml ++++ apache-tomcat-9.0.17-src/build.xml +@@ -1811,10 +1811,11 @@ Apache Tomcat ${version} native binaries encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -14,12 +14,13 @@ + failonwarning="false"> <classpath> <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1882,10 +1883,11 @@ Apache Tomcat ${version} native binaries + <path location="${ant.core.lib}"/> +@@ -1830,11 +1831,12 @@ Apache Tomcat ${version} native binaries + bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved." encoding="UTF-8" docencoding="UTF-8" - charset="UTF-8" + source="${compile.source}" + charset="UTF-8" additionalparam="-breakiterator -notimestamp" maxmemory="512m" failonerror="true" @@ -27,8 +28,8 @@ + failonwarning="false"> <classpath> <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1903,10 +1905,11 @@ Apache Tomcat ${version} native binaries + <path location="${ant.core.lib}"/> +@@ -1851,10 +1853,11 @@ Apache Tomcat ${version} native binaries encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -40,8 +41,8 @@ + failonwarning="false"> <classpath> <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1924,10 +1927,11 @@ Apache Tomcat ${version} native binaries + <path location="${ant.core.lib}"/> +@@ -1871,10 +1874,11 @@ Apache Tomcat ${version} native binaries encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -53,8 +54,8 @@ + failonwarning="false"> <classpath> <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1944,10 +1948,11 @@ Apache Tomcat ${version} native binaries + <path location="${ant.core.lib}"/> +@@ -1890,10 +1894,11 @@ Apache Tomcat ${version} native binaries encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -67,8 +68,8 @@ + failonwarning="false"> <classpath> <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1957,9 +1962,6 @@ Apache Tomcat ${version} native binaries + <path location="${ant.core.lib}"/> +@@ -1902,9 +1907,6 @@ Apache Tomcat ${version} native binaries <link href="../jspapi"/> <link href="../elapi"/> <link href="../websocketapi"/>
