Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2021-10-21 23:55:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Thu Oct 21 23:55:15 2021 rev:77 rq:926588 version:9.0.43 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2021-03-24 16:15:57.268128013 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat.new.1890/tomcat.changes 2021-10-21 23:55:17.772018384 +0200 @@ -1,0 +2,26 @@ +Mon Oct 18 21:42:48 UTC 2021 - Marcel Witte <[email protected]> + +- Update to Tomcat 9.0.43. See changelog at + https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.43_(markt) +- Removed Patches because fixed upstream now: + * tomcat-9.0-CVE-2021-25122.patch + * tomcat-9.0-CVE-2021-25329.patch +- Rebased patch: + tomcat-9.0.39-java8compat.patch -> tomcat-9.0.43-java8compat.patch + +------------------------------------------------------------------- +Mon Oct 18 18:26:39 UTC 2021 - Marcel Witte <[email protected]> + +- Update to Tomcat 9.0.41. See changelog at + https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.41_(markt) + +------------------------------------------------------------------- +Mon Oct 18 13:05:17 UTC 2021 - Marcel Witte <[email protected]> + +- Update to Tomcat 9.0.40. See changelog at + https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.40_(markt) +- Removed Patches because fixed upstream now: + * tomcat-9.0-CVE-2020-17527.patch + * tomcat-9.0-CVE-2021-24122.patch + +------------------------------------------------------------------- @@ -16,0 +43,26 @@ + +------------------------------------------------------------------- +Mon Mar 15 21:42:07 UTC 2021 - Marcel Witte <[email protected]> + +- Update to Tomcat 9.0.39. See changelog at + https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.39_(markt) +- Rebased patches: + * tomcat-9.0.38-java8compat.patch -> tomcat-9.0.39-java8compat.patch + +------------------------------------------------------------------- +Mon Mar 15 14:57:39 UTC 2021 - Marcel Witte <[email protected]> + +- Update to Tomcat 9.0.38. See changelog at + https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.38_(markt) +- Rebased patches: + * tomcat-9.0.37-java8compat.patch -> tomcat-9.0.38-java8compat.patch +- Removed tomcat-9.0-CVE-2020-13943.patch because that fix is upstream now + +------------------------------------------------------------------- +Mon Feb 22 08:56:03 UTC 2021 - Marcel Witte <[email protected]> + +- Update to Tomcat 9.0.37. See changelog at + https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.37_(markt) +- Rebased patches: + * tomcat-9.0-osgi-build.patch + * tomcat-9.0.31-java8compat.patch -> tomcat-9.0.37-java8compat.patch Old: ---- apache-tomcat-9.0.36-src.tar.gz apache-tomcat-9.0.36-src.tar.gz.asc tomcat-9.0-CVE-2020-13943.patch tomcat-9.0-CVE-2020-17527.patch tomcat-9.0-CVE-2021-24122.patch tomcat-9.0-CVE-2021-25122.patch tomcat-9.0-CVE-2021-25329.patch tomcat-9.0.31-java8compat.patch New: ---- apache-tomcat-9.0.43-src.tar.gz apache-tomcat-9.0.43-src.tar.gz.asc tomcat-9.0.43-java8compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.aL6psb/_old 2021-10-21 23:55:18.692018857 +0200 +++ /var/tmp/diff_new_pack.aL6psb/_new 2021-10-21 23:55:18.696018859 +0200 @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # 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 9 %define minor_version 0 -%define micro_version 36 +%define micro_version 43 %define packdname apache-tomcat-%{version}-src %define serverxmltool_version 1.0 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ @@ -80,14 +80,9 @@ # PATCH-FIX-OPENSUSE: include all necessary aqute-bnd jars Patch4: tomcat-9.0-osgi-build.patch # PATCH-FIX-OPENSUSE: cast ByteBuffer to Buffer in cases where there is a risk of using Java 9+ apis -Patch5: tomcat-9.0.31-java8compat.patch +Patch5: tomcat-9.0.43-java8compat.patch # PATCH-FIX-OPENSUSE: set ajp connector secreteRequired to false by default to avoid tomcat not starting Patch6: tomcat-9.0.31-secretRequired-default.patch -Patch7: tomcat-9.0-CVE-2020-13943.patch -Patch8: tomcat-9.0-CVE-2020-17527.patch -Patch9: tomcat-9.0-CVE-2021-24122.patch -Patch10: tomcat-9.0-CVE-2021-25122.patch -Patch11: tomcat-9.0-CVE-2021-25329.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr @@ -95,8 +90,8 @@ BuildRequires: apache-commons-daemon BuildRequires: apache-commons-dbcp >= 2.0 BuildRequires: apache-commons-pool2 -BuildRequires: aqute-bnd -BuildRequires: aqute-bndlib +BuildRequires: aqute-bnd >= 5.1.1 +BuildRequires: aqute-bndlib >= 5.1.1 BuildRequires: ecj >= 4.4.0 BuildRequires: fdupes BuildRequires: findutils @@ -262,11 +257,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl @@ -306,6 +296,9 @@ -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ + -Dosgiannotation.jar="$(build-classpath osgi-annotation/osgi.annotation)" \ + -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ + -Dosgicmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ -Dcommons-pool.home="$(build-classpath commons-pool2)" \ -Dcommons-dbcp.home="$(build-classpath commons-dbcp2)" \ ++++++ apache-tomcat-9.0.36-src.tar.gz -> apache-tomcat-9.0.43-src.tar.gz ++++++ ++++ 64262 lines of diff (skipped) ++++++ tomcat-9.0-osgi-build.patch ++++++ --- /var/tmp/diff_new_pack.aL6psb/_old 2021-10-21 23:55:19.744019397 +0200 +++ /var/tmp/diff_new_pack.aL6psb/_new 2021-10-21 23:55:19.748019400 +0200 @@ -1,14 +1,17 @@ -Index: apache-tomcat-9.0.35-src/build.xml +Index: apache-tomcat-9.0.37-src/build.xml =================================================================== ---- apache-tomcat-9.0.35-src.orig/build.xml -+++ apache-tomcat-9.0.35-src/build.xml -@@ -3327,6 +3327,9 @@ Read the Building page on the Apache Tom - <path id="bndlib.classpath"> +--- apache-tomcat-9.0.37-src.orig/build.xml ++++ apache-tomcat-9.0.37-src/build.xml +@@ -3307,6 +3307,12 @@ Read the Building page on the Apache Tom + <!-- Add bnd tasks to project --> + <path id="bnd.classpath"> <fileset file="${bnd.jar}" /> - <fileset file="${bndlib.jar}" /> ++ <fileset file="${bndlib.jar}" /> + <fileset file="${bndlibg.jar}" /> + <fileset file="${bndannotation.jar}" /> ++ <fileset file="${osgiannotation.jar}" /> ++ <fileset file="${osgicmpn.jar}" /> + <fileset file="${slf4j-api.jar}" /> </path> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bndlib.classpath" /> + <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" /> ++++++ tomcat-9.0.31-java8compat.patch -> tomcat-9.0.43-java8compat.patch ++++++ ++++ 1984 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/tomcat/tomcat-9.0.31-java8compat.patch ++++ and /work/SRC/openSUSE:Factory/.tomcat.new.1890/tomcat-9.0.43-java8compat.patch
