Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2018-10-25 08:09:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Thu Oct 25 08:09:29 2018 rev:45 rq:642920 version:9.0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2018-10-11 11:38:41.907302648 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2018-10-25 08:09:30.876299176 +0200 @@ -1,0 +2,13 @@ +Thu Oct 18 08:12:41 UTC 2018 - [email protected] + +- Update to Tomcat 9.0.12. See changelog at + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.12_(markt) +- Fixed CVEs: + - CVE-2018-11784 (bsc#1110850) +- Rebased patches: + - tomcat-9.0-disable-osgi-build.patch + - tomcat-9.0-javadoc.patch + - tomcat-9.0-sle.catalina.policy.patch + - tomcat-9.0-tomcat-users-webapp.patch + +------------------------------------------------------------------- Old: ---- apache-tomcat-9.0.10-src.tar.gz apache-tomcat-9.0.10-src.tar.gz.asc New: ---- apache-tomcat-9.0.12-src.tar.gz apache-tomcat-9.0.12-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.aVtc8C/_old 2018-10-25 08:09:32.028298420 +0200 +++ /var/tmp/diff_new_pack.aVtc8C/_new 2018-10-25 08:09:32.028298420 +0200 @@ -22,7 +22,7 @@ %define elspec 3.0 %define major_version 9 %define minor_version 0 -%define micro_version 10 +%define micro_version 12 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} @@ -257,8 +257,8 @@ %patch1 %patch2 %patch3 -%patch4 -%patch5 +%patch4 -p1 +%patch5 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl ++++++ apache-tomcat-9.0.10-src.tar.gz -> apache-tomcat-9.0.12-src.tar.gz ++++++ ++++ 29984 lines of diff (skipped) ++++++ tomcat-9.0-disable-osgi-build.patch ++++++ --- /var/tmp/diff_new_pack.aVtc8C/_old 2018-10-25 08:09:33.140297691 +0200 +++ /var/tmp/diff_new_pack.aVtc8C/_new 2018-10-25 08:09:33.140297691 +0200 @@ -1,21 +1,8 @@ -Index: build.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 +Index: apache-tomcat-9.0.12-src/build.xml =================================================================== ---- build.xml (date 1529515764000) -+++ build.xml (date 1534335916000) -@@ -15,7 +15,8 @@ - See the License for the specific language governing permissions and - limitations under the License. - --> --<project name="Tomcat 9.0" default="deploy" basedir="."> -+<project name="Tomcat 9.0" default="deploy" basedir="." -+ xmlns:if="ant:if" xmlns:unless="ant:unless"> - - <!-- ===================== Initialize Property Values ==================== --> - -@@ -728,7 +729,7 @@ +--- apache-tomcat-9.0.12-src.orig/build.xml ++++ apache-tomcat-9.0.12-src/build.xml +@@ -740,7 +740,7 @@ </target> <target name="build-bnd" unless="bnd.uptodate" @@ -24,16 +11,25 @@ <mkdir dir="${tomcat.bnd}" /> <copy todir="${tomcat.bnd}" overwrite="yes" filtering="yes" -@@ -2970,7 +2971,7 @@ +@@ -3178,7 +3178,7 @@ Read the Building page on the Apache Tom <!-- ======================= Macros, Taskdefs etc ======================== --> -- <target name="setup-bnd" > -+ <target name="setup-bnd" if="add.osgi.jar.metadata"> +- <target name="download-bnd" > ++ <target name="download-bnd" if="add.osgi.jar.metadata"> <!-- Download bnd --> <antcall target="downloadfile"> <param name="sourcefile" value="${bnd.loc}"/> -@@ -3025,7 +3026,7 @@ +@@ -3200,7 +3200,7 @@ Read the Building page on the Apache Tom + </antcall> + </target> + +- <target name="setup-bnd" depends="download-bnd"> ++ <target name="setup-bnd" depends="download-bnd" if="add.osgi.jar.metadata"> + <!-- Add bnd tasks to project --> + <path id="bndlib.classpath"> + <fileset file="${bnd.jar}" /> +@@ -3240,7 +3240,7 @@ Read the Building page on the Apache Tom <zipfileset file="@{notice}" fullpath="META-INF/NOTICE" /> <zipfileset file="@{license}" fullpath="META-INF/LICENSE" /> </jar> ++++++ tomcat-9.0-javadoc.patch ++++++ --- /var/tmp/diff_new_pack.aVtc8C/_old 2018-10-25 08:09:33.148297686 +0200 +++ /var/tmp/diff_new_pack.aVtc8C/_new 2018-10-25 08:09:33.148297686 +0200 @@ -1,11 +1,8 @@ -Index: build.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 +Index: apache-tomcat-9.0.12-src/build.xml =================================================================== ---- build.xml (date 1511643656000) -+++ build.xml (revision ) -@@ -1772,10 +1772,11 @@ +--- 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 encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -18,7 +15,7 @@ <classpath> <path refid="compile.classpath"/> <path refid="tomcat.webservices.classpath"/> -@@ -1793,10 +1794,11 @@ +@@ -1882,10 +1883,11 @@ Apache Tomcat ${version} native binaries encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -31,7 +28,7 @@ <classpath> <path refid="compile.classpath"/> <path refid="tomcat.webservices.classpath"/> -@@ -1814,10 +1816,11 @@ +@@ -1903,10 +1905,11 @@ Apache Tomcat ${version} native binaries encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -44,7 +41,7 @@ <classpath> <path refid="compile.classpath"/> <path refid="tomcat.webservices.classpath"/> -@@ -1835,10 +1838,11 @@ +@@ -1924,10 +1927,11 @@ Apache Tomcat ${version} native binaries encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -57,7 +54,7 @@ <classpath> <path refid="compile.classpath"/> <path refid="tomcat.webservices.classpath"/> -@@ -1855,10 +1859,11 @@ +@@ -1944,10 +1948,11 @@ Apache Tomcat ${version} native binaries encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" @@ -71,12 +68,12 @@ <classpath> <path refid="compile.classpath"/> <path refid="tomcat.webservices.classpath"/> -@@ -1868,9 +1873,6 @@ +@@ -1957,9 +1962,6 @@ Apache Tomcat ${version} native binaries <link href="../jspapi"/> <link href="../elapi"/> <link href="../websocketapi"/> - <link href="http://docs.oracle.com/javase/8/docs/api/"/> -- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> +- <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/> - <link href="https://javaee.github.io/javaee-spec/javadocs/"/> <packageset dir="${tomcat.dist}/src/java/"> <include name="org/**"/> ++++++ tomcat-9.0-sle.catalina.policy.patch ++++++ --- /var/tmp/diff_new_pack.aVtc8C/_old 2018-10-25 08:09:33.184297663 +0200 +++ /var/tmp/diff_new_pack.aVtc8C/_new 2018-10-25 08:09:33.184297663 +0200 @@ -1,11 +1,8 @@ Index: conf/catalina.policy -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 =================================================================== ---- conf/catalina.policy (revision Local version) -+++ conf/catalina.policy (revision Shelved version) -@@ -167,6 +167,9 @@ +--- conf/catalina.policy.orig ++++ conf/catalina.policy +@@ -167,6 +167,9 @@ grant { permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat"; // Precompiled JSPs need access to these packages. @@ -15,7 +12,7 @@ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; permission java.lang.RuntimePermission -@@ -230,6 +233,15 @@ +@@ -216,6 +219,15 @@ grant codeBase "file:${catalina.home}/we }; ++++++ tomcat-9.0-tomcat-users-webapp.patch ++++++ --- /var/tmp/diff_new_pack.aVtc8C/_old 2018-10-25 08:09:33.196297655 +0200 +++ /var/tmp/diff_new_pack.aVtc8C/_new 2018-10-25 08:09:33.196297655 +0200 @@ -1,6 +1,8 @@ ---- conf/tomcat-users.xml~ 2008-01-28 17:41:06.000000000 -0500 -+++ conf/tomcat-users.xml 2008-03-07 19:40:07.000000000 -0500 -@@ -23,4 +23,14 @@ +Index: conf/tomcat-users.xml +=================================================================== +--- conf/tomcat-users.xml.orig ++++ conf/tomcat-users.xml +@@ -41,4 +41,14 @@ <user username="both" password="<must-be-changed>" roles="tomcat,role1"/> <user username="role1" password="<must-be-changed>" roles="role1"/> -->
