Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2017-05-10 20:53:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Wed May 10 20:53:03 2017 rev:36 rq:493810 version:8.0.43 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2017-01-10 10:45:48.707652604 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2017-05-10 20:53:05.249088457 +0200 @@ -1,0 +2,19 @@ +Tue May 9 13:36:47 UTC 2017 - [email protected] + +- Version update to 8.0.43: * Another bugfix release, for full details see: + http://tomcat.apache.org/tomcat-8.0-doc/changelog.html + * Fixed CVEs: + - CVE-2017-5647 (bnc#1033448) + - CVE-2017-5648 (bnc#1033447) + - CVE-2016-8745 +- Renamed and rebased patches: + * tomcat-7.0-sle.catalina.policy.patch -> tomcat-8.0-sle.catalina.policy.patch +- Enable optional setenv.sh script. See section + "(3.4) Using the "setenv" script (optional, recommended)" in + http://tomcat.apache.org/tomcat-8.0-doc/RUNNING.txt + (bnc#1002662) +- Fix file conflicts when upgrading from SLES 12 to SLES 12 SP1 (bnc#1023412). + Added explicit obsoletes for tomcat-el-2_2-api, tomcat-jsp-2_2-api, + tomcat-servlet-3_0-api + +------------------------------------------------------------------- Old: ---- apache-tomcat-8.0.39-src.tar.gz apache-tomcat-8.0.39-src.tar.gz.asc tomcat-7.0-sle.catalina.policy.patch New: ---- apache-tomcat-8.0.43-src.tar.gz apache-tomcat-8.0.43-src.tar.gz.asc tomcat-8.0-sle.catalina.policy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.5f0g7P/_old 2017-05-10 20:53:07.584758865 +0200 +++ /var/tmp/diff_new_pack.5f0g7P/_new 2017-05-10 20:53:07.592757736 +0200 @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -22,7 +22,7 @@ %define elspec 3.0 %define major_version 8 %define minor_version 0 -%define micro_version 39 +%define micro_version 43 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} @@ -76,7 +76,8 @@ # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 Patch3: tomcat-8.0.33-JDTCompiler-java.patch # PATCH-FIX-SLE: Change security manager default policies bnc#891264 -Patch4: tomcat-7.0-sle.catalina.policy.patch +Patch4: tomcat-8.0-sle.catalina.policy.patch + BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr BuildRequires: apache-commons-collections @@ -159,6 +160,7 @@ Provides: el_3_0_api = %{version}-%{release} Provides: el_api = %{elspec} Obsoletes: el_api < %{elspec} +Obsoletes: tomcat-el-2_2-api %description el-3_0-api Expression Language API version 3.0. @@ -180,6 +182,7 @@ Provides: jsp = %{jspspec} Provides: jsp23 Obsoletes: jsp < %{jspspec} +Obsoletes: tomcat-jsp-2_2-api %description jsp-2_3-api Apache Tomcat JSP API implementation classes version 2.3 @@ -219,6 +222,7 @@ Provides: servlet31 Provides: servlet7 Obsoletes: servlet < %{servletspec} +Obsoletes: tomcat-servlet-3_0-api %description servlet-3_1-api Apache Tomcat Servlet API implementation classes version 3.1 @@ -241,7 +245,7 @@ %patch1 %patch2 -p1 %patch3 -%patch4 -p1 +%patch4 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl ++++++ apache-tomcat-8.0.39-src.tar.gz -> apache-tomcat-8.0.43-src.tar.gz ++++++ ++++ 12826 lines of diff (skipped) ++++++ tomcat-7.0-sle.catalina.policy.patch -> tomcat-8.0-sle.catalina.policy.patch ++++++ --- /work/SRC/openSUSE:Factory/tomcat/tomcat-7.0-sle.catalina.policy.patch 2017-01-10 10:45:48.683655984 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat-8.0-sle.catalina.policy.patch 2017-05-10 20:53:05.141103694 +0200 @@ -1,8 +1,11 @@ -Index: apache-tomcat-8.0.39-src/conf/catalina.policy +Index: conf/catalina.policy +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 =================================================================== ---- apache-tomcat-8.0.39-src.orig/conf/catalina.policy 2016-11-09 09:57:55.000000000 +0100 -+++ apache-tomcat-8.0.39-src/conf/catalina.policy 2016-12-21 22:48:00.587422333 +0100 -@@ -100,6 +100,7 @@ grant codeBase "file:${catalina.home}/bi +--- conf/catalina.policy (revision Local version) ++++ conf/catalina.policy (revision Shelved version) +@@ -100,6 +100,7 @@ // ${file.separator}classes${file.separator}logging.properties", "read"; }; @@ -10,7 +13,7 @@ // These permissions apply to the server startup code grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { permission java.security.AllPermission; -@@ -112,7 +113,6 @@ grant codeBase "file:${catalina.home}/li +@@ -112,7 +113,6 @@ permission java.security.AllPermission; }; @@ -18,7 +21,7 @@ // If using a per instance lib directory, i.e. ${catalina.base}/lib, // then the following permission will need to be uncommented // grant codeBase "file:${catalina.base}/lib/-" { -@@ -167,6 +167,9 @@ grant { +@@ -167,6 +167,9 @@ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat"; // Precompiled JSPs need access to these packages. @@ -28,7 +31,7 @@ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; permission java.lang.RuntimePermission -@@ -216,6 +219,15 @@ grant codeBase "file:${catalina.home}/we +@@ -216,6 +219,15 @@ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util"; }; @@ -44,7 +47,7 @@ // You can assign additional permissions to particular web applications by // adding additional "grant" entries here, based on the code base for that // application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. -@@ -247,7 +259,6 @@ grant codeBase "file:${catalina.home}/we +@@ -247,7 +259,6 @@ // grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { // permission java.net.SocketPermission "*.noaa.gov:80", "connect"; // }; @@ -52,10 +55,3 @@ // To grant permissions for web applications using packed WAR files, use the // Tomcat specific WAR url scheme. // -@@ -257,4 +268,4 @@ grant codeBase "file:${catalina.home}/we - // - // The permissions granted to a specific JAR - // grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" { --// }; -\ No newline at end of file -+// }; ++++++ tomcat-preamble ++++++ --- /var/tmp/diff_new_pack.5f0g7P/_old 2017-05-10 20:53:09.644468215 +0200 +++ /var/tmp/diff_new_pack.5f0g7P/_new 2017-05-10 20:53:09.648467651 +0200 @@ -29,6 +29,15 @@ CATALINA_BASE="${CATALINA_HOME}" fi fi + +# Include the optional setenv.sh script. +# (See section 3.4 of https://tomcat.apache.org/tomcat-8.0-doc/RUNNING.txt) +if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then + . "$CATALINA_BASE/bin/setenv.sh" +elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then + . "$CATALINA_HOME/bin/setenv.sh" +fi + VERBOSE=1 set_javacmd cd ${CATALINA_HOME} ++++++ tomcat.keyring ++++++ ++++ 745 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/tomcat/tomcat.keyring ++++ and /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.keyring
