From d40b73f5f488b1a12e65336fe18bf717f55703f8 Mon Sep 17 00:00:00 2001 From: Sonia Xu Date: Wed, 2 Mar 2022 23:41:57 +0000 Subject: [PATCH 1/8] Update to 9.0.59 Fixes CVE-2022-23181 --- sources | 2 +- tomcat-9.0-JDTCompiler.patch | 19 ++++++++++--------- tomcat.spec | 8 ++++++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/sources b/sources index 259252b..8ef1969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.56-src.tar.gz) = 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5 +SHA512 (apache-tomcat-9.0.59-src.tar.gz) = cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80 diff --git a/tomcat-9.0-JDTCompiler.patch b/tomcat-9.0-JDTCompiler.patch index 20605ce..edf156a 100644 --- a/tomcat-9.0-JDTCompiler.patch +++ b/tomcat-9.0-JDTCompiler.patch @@ -1,16 +1,17 @@ -diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java.orig ./java/org/apache/jasper/compiler/JDTCompiler.java ---- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2021-07-07 11:31:21.583507995 +0800 -+++ java/org/apache/jasper/compiler/JDTCompiler.java 2021-07-07 11:35:13.009251246 +0800 -@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apa +diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java ./java/org/apache/jasper/compiler/JDTCompiler.java +index 2e361f2..277d8f4 100644 +--- java/org/apache/jasper/compiler/JDTCompiler.java ++++ java/org/apache/jasper/compiler/JDTCompiler.java +@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { } else if(opt.equals("15")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15); } else if(opt.equals("16")) { - settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16); + settings.put(CompilerOptions.OPTION_Source, "16"); } else if(opt.equals("17")) { - // Constant not available in latest ECJ version shipped with - // Tomcat. May be supported in a snapshot build. -@@ -372,8 +372,8 @@ public class JDTCompiler extends org.apa + // Constant not available in latest ECJ version that runs on + // Java 8. +@@ -377,8 +377,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15); settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15); } else if(opt.equals("16")) { @@ -19,5 +20,5 @@ diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java.orig ./java/org/apac + settings.put(CompilerOptions.OPTION_TargetPlatform, "16"); + settings.put(CompilerOptions.OPTION_Compliance, "16"); } else if(opt.equals("17")) { - // Constant not available in latest ECJ version shipped with - // Tomcat. May be supported in a snapshot build. + // Constant not available in latest ECJ version that runs on + // Java 8. diff --git a/tomcat.spec b/tomcat.spec index 31a5258..8f3948c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 56 +%global micro_version 59 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -496,6 +496,10 @@ fi %{appdir}/ROOT %changelog +* Wed Mar 02 2022 Sonia Xu - 1:9.0.59-1 +- Update to 9.0.59 +- Resolves: rhbz#2047419 - CVE-2022-23181 tomcat: local privilege escalation vulnerability + * Sat Feb 05 2022 Jiri Vanek - 1:9.0.56-3 - Rebuilt for java-17-openjdk as system jdk From b00d4b710739b8a0327c905051f7f3c89cec70ca Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 8 Mar 2022 15:22:53 -0500 Subject: [PATCH 2/8] Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection --- java-9-start-up-parameters.conf | 6 ++++++ tomcat.spec | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 java-9-start-up-parameters.conf diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf new file mode 100644 index 0000000..0fd43ba --- /dev/null +++ b/java-9-start-up-parameters.conf @@ -0,0 +1,6 @@ +# Add the JAVA 9 specific start-up parameters required by Tomcat +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" diff --git a/tomcat.spec b/tomcat.spec index 8f3948c..4d48f16 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -73,6 +73,7 @@ Source21: tomcat-functions Source30: tomcat-preamble Source31: tomcat-server Source32: tomcat-named.service +Source33: java-9-start-up-parameters.conf Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch @@ -302,6 +303,8 @@ popd %{__install} -m 0644 %{SOURCE32} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service +%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ + # Substitute libnames in catalina-tasks.xml sed -i \ "s,el-api.jar,%{name}-el-%{elspec}-api.jar,; @@ -441,6 +444,7 @@ fi %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost %attr(0755,root,tomcat) %dir %{confdir}/conf.d %{confdir}/conf.d/README +%{confdir}/conf.d/java-9-start-up-parameters.conf %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties @@ -496,6 +500,9 @@ fi %{appdir}/ROOT %changelog +* Tue Mar 08 2022 Coty Sutherland - 1:9.0.59-2 +- Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection + * Wed Mar 02 2022 Sonia Xu - 1:9.0.59-1 - Update to 9.0.59 - Resolves: rhbz#2047419 - CVE-2022-23181 tomcat: local privilege escalation vulnerability From 7a159d65fa14d5926b8d842b41985625127ad462 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 10 Mar 2022 15:44:16 -0500 Subject: [PATCH 3/8] Related: rhbz#2061424 Adjust fix so that it uses the proper env var --- java-9-start-up-parameters.conf | 11 ++++++----- tomcat.spec | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf index 0fd43ba..341e077 100644 --- a/java-9-start-up-parameters.conf +++ b/java-9-start-up-parameters.conf @@ -1,6 +1,7 @@ # Add the JAVA 9 specific start-up parameters required by Tomcat -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" -JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +export JDK_JAVA_OPTIONS diff --git a/tomcat.spec b/tomcat.spec index 4d48f16..fc199ff 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -500,6 +500,9 @@ fi %{appdir}/ROOT %changelog +* Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 +- Related: rhbz#2061424 Adjust fix so that it uses the proper env var + * Tue Mar 08 2022 Coty Sutherland - 1:9.0.59-2 - Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection From 1d58c14ce118629aa167a0ace3f7295949456425 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 21 Jun 2022 21:17:53 +0800 Subject: [PATCH 4/8] Update for 9.0.64 --- rhbz-1857043.patch | 16 +++---- sources | 2 +- tomcat-9.0-catalina-policy.patch | 2 +- tomcat-9.0-osgi-annotations.patch | 66 ++++++++++++++++++++++++++++ tomcat-9.0-tomcat-users-webapp.patch | 2 +- tomcat-build.patch | 15 ------- tomcat.spec | 10 ++++- 7 files changed, 85 insertions(+), 28 deletions(-) create mode 100644 tomcat-9.0-osgi-annotations.patch diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index 7d68c42..dd74c3b 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,7 +1,7 @@ diff -up ./build.xml.orig ./build.xml --- build.xml.orig 2021-07-07 10:53:55.493742841 +0800 +++ build.xml 2021-07-07 11:09:43.107968515 +0800 -@@ -1030,7 +1030,7 @@ +@@ -1020,7 +1020,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -10,7 +10,7 @@ diff -up ./build.xml.orig ./build.xml + + ++ + + + +@@ -2270,7 +2271,8 @@ Apache Tomcat ${version} native binaries + failonwarning="true"> + + +- ++ ++ + + + +@@ -3671,12 +3673,26 @@ Read the Building page on the Apache Tom + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + ++ ++ ++ ++ ++ + + + diff --git a/tomcat-9.0-tomcat-users-webapp.patch b/tomcat-9.0-tomcat-users-webapp.patch index 860c4cf..85b8b9b 100644 --- a/tomcat-9.0-tomcat-users-webapp.patch +++ b/tomcat-9.0-tomcat-users-webapp.patch @@ -1,6 +1,6 @@ --- 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 @@ +@@ -53,4 +53,14 @@ --> diff --git a/tomcat-build.patch b/tomcat-build.patch index 97440f1..49c63ff 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,18 +1,3 @@ -diff -up ./build.xml.orig ./build.xml ---- ./build.xml.orig 2020-07-13 12:59:09.555368724 -0400 -+++ ./build.xml 2020-07-13 13:06:51.246135917 -0400 -@@ -3307,6 +3307,11 @@ Read the Building page on the Apache Tom - - - -+ -+ -+ -+ -+ - - - diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd --- ./res/bnd/build-defaults.bnd.orig 2020-07-13 13:47:01.229077747 -0400 +++ ./res/bnd/build-defaults.bnd 2020-07-13 13:47:12.923095618 -0400 diff --git a/tomcat.spec b/tomcat.spec index fc199ff..142b2bd 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 59 +%global micro_version 64 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -81,6 +81,7 @@ Patch2: %{name}-build.patch Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch Patch4: rhbz-1857043.patch Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch +Patch6: %{name}-%{major_version}.%{minor_version}-osgi-annotations.patch BuildArch: noarch @@ -191,6 +192,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch3 -p0 %patch4 -p0 %patch5 -p0 +%patch6 -p0 # Remove webservices naming resources as it's generally unused %{__rm} -rf java/org/apache/naming/factory/webservices @@ -500,6 +502,10 @@ fi %{appdir}/ROOT %changelog +* Tue Jun 21 2022 Hui Wang - 1:9.0.64-1 +- Update to 9.0.64 +- Add osgi-annotations dependency back + * Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 - Related: rhbz#2061424 Adjust fix so that it uses the proper env var From f1f37ef5a6b02091d90136425d67670ddb3ce111 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 22 Jul 2022 17:46:33 +0800 Subject: [PATCH 5/8] Update to 9.0.65 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 82edd85..78df857 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.64-src.tar.gz) = 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386 +SHA512 (apache-tomcat-9.0.65-src.tar.gz) = 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc diff --git a/tomcat.spec b/tomcat.spec index 142b2bd..ba108bb 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 64 +%global micro_version 65 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -502,6 +502,9 @@ fi %{appdir}/ROOT %changelog +* Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 +- Update to 9.0.65 + * Tue Jun 21 2022 Hui Wang - 1:9.0.64-1 - Update to 9.0.64 - Add osgi-annotations dependency back From 589d03a82a4f0d12bddf582ac0cac7ec74a4b8a4 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 9 Nov 2022 16:29:16 +0800 Subject: [PATCH 6/8] Update to 9.0.68 --- sources | 2 +- tomcat-9.0-catalina-policy.patch | 9 ++++----- tomcat-9.0-osgi-annotations.patch | 4 ++-- tomcat.spec | 5 ++++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 78df857..5c55728 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.65-src.tar.gz) = 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc +SHA512 (apache-tomcat-9.0.68-src.tar.gz) = 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be diff --git a/tomcat-9.0-catalina-policy.patch b/tomcat-9.0-catalina-policy.patch index 0211e70..dd6a47d 100644 --- a/tomcat-9.0-catalina-policy.patch +++ b/tomcat-9.0-catalina-policy.patch @@ -1,6 +1,6 @@ ---- conf/catalina.policy.orig 2021-07-07 10:25:53.461393329 +0800 -+++ conf/catalina.policy 2021-07-07 10:27:47.688682404 +0800 -@@ -56,6 +56,16 @@ grant codeBase "file:${java.home}/lib/ex +--- conf/catalina.policy.orig 2022-11-04 16:17:41.227506990 +0800 ++++ conf/catalina.policy 2022-11-04 16:21:51.393351415 +0800 +@@ -56,6 +56,15 @@ grant codeBase "file:${java.home}/lib/ex // permission java.security.AllPermission; //}; @@ -13,11 +13,10 @@ +grant codeBase "file:/usr/share/java/ecj/ecj.jar" { + permission java.security.AllPermission; +}; -+ // ========== CATALINA CODE PERMISSIONS ======================================= -@@ -261,4 +271,4 @@ grant codeBase "file:${catalina.home}/we +@@ -261,4 +270,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" { diff --git a/tomcat-9.0-osgi-annotations.patch b/tomcat-9.0-osgi-annotations.patch index c68708a..c70b463 100644 --- a/tomcat-9.0-osgi-annotations.patch +++ b/tomcat-9.0-osgi-annotations.patch @@ -1,6 +1,6 @@ --- build.properties.default.orig 2022-06-21 20:30:04.498997718 +0800 +++ build.properties.default 2022-06-21 20:30:57.579522800 +0800 -@@ -308,6 +308,16 @@ bnd.home=${base.path}/bnd-${bnd.version} +@@ -309,6 +309,16 @@ bnd.home=${base.path}/bnd-${bnd.version} bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar @@ -15,7 +15,7 @@ +osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar + # ----- JSign, version 4.1 or later ----- - jsign.version=4.1 + jsign.version=4.2 --- build.xml.orig 2022-06-21 20:36:12.785560093 +0800 +++ build.xml 2022-06-21 20:40:41.155154959 +0800 diff --git a/tomcat.spec b/tomcat.spec index ba108bb..74a4fa5 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 65 +%global micro_version 68 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -502,6 +502,9 @@ fi %{appdir}/ROOT %changelog +* Thu Nov 03 2033 Hui Wang - 1:9.0.68-1 +- Update to 9.0.68 + * Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 - Update to 9.0.65 From ae19b423c2d2e82ca5a463dd7ec8f3a795d511ff Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 13 Jan 2023 19:54:28 +0800 Subject: [PATCH 7/8] Update to 9.0.70 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5c55728..e456e94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.68-src.tar.gz) = 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be +SHA512 (apache-tomcat-9.0.70-src.tar.gz) = 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e diff --git a/tomcat.spec b/tomcat.spec index 74a4fa5..5f38368 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 68 +%global micro_version 70 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -502,7 +502,10 @@ fi %{appdir}/ROOT %changelog -* Thu Nov 03 2033 Hui Wang - 1:9.0.68-1 +* Fri Jan 13 2023 Hui Wang - 1:9.0.70-1 +- Update to 9.0.70 + +* Thu Nov 03 2022 Hui Wang - 1:9.0.68-1 - Update to 9.0.68 * Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 From b9cc5aadba2dc7c72a333f0a1657f4ec1bbfdd28 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Sun, 29 Jan 2023 21:31:26 +0800 Subject: [PATCH 8/8] Update to 9.0.71 --- sources | 2 +- tomcat-9.0-bnd-annotation.patch | 10 +++++ tomcat-9.0-osgi-annotations.patch | 66 ------------------------------- tomcat.spec | 20 +++++----- 4 files changed, 20 insertions(+), 78 deletions(-) create mode 100644 tomcat-9.0-bnd-annotation.patch delete mode 100644 tomcat-9.0-osgi-annotations.patch diff --git a/sources b/sources index e456e94..fa93e4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.70-src.tar.gz) = 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e +SHA512 (apache-tomcat-9.0.71-src.tar.gz) = 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930 diff --git a/tomcat-9.0-bnd-annotation.patch b/tomcat-9.0-bnd-annotation.patch new file mode 100644 index 0000000..9d57c81 --- /dev/null +++ b/tomcat-9.0-bnd-annotation.patch @@ -0,0 +1,10 @@ +--- build.xml.orig 2023-01-29 17:38:29.477052402 +0800 ++++ build.xml 2023-01-29 17:42:03.369583841 +0800 +@@ -216,6 +216,7 @@ + + + ++ + + + diff --git a/tomcat-9.0-osgi-annotations.patch b/tomcat-9.0-osgi-annotations.patch deleted file mode 100644 index c70b463..0000000 --- a/tomcat-9.0-osgi-annotations.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- build.properties.default.orig 2022-06-21 20:30:04.498997718 +0800 -+++ build.properties.default 2022-06-21 20:30:57.579522800 +0800 -@@ -309,6 +309,16 @@ bnd.home=${base.path}/bnd-${bnd.version} - bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar - bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar - -+# ----- OSGi annotations bundle, version 1.0.0 or later ----- -+# ----- required to avoid Javadoc error when using bnd annotations ----- -+osgi-annotations.version=1.1.1 -+osgi-annotations.checksum.enabled=true -+osgi-annotations.checksum.algorithm=MD5|SHA-1 -+osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d -+osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version} -+osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar -+osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar -+ - # ----- JSign, version 4.1 or later ----- - jsign.version=4.2 - ---- build.xml.orig 2022-06-21 20:36:12.785560093 +0800 -+++ build.xml 2022-06-21 20:40:41.155154959 +0800 -@@ -213,6 +213,7 @@ - - - -+ - - - -@@ -2270,7 +2271,8 @@ Apache Tomcat ${version} native binaries - failonwarning="true"> - - -- -+ -+ - - - -@@ -3671,12 +3673,26 @@ Read the Building page on the Apache Tom - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - - - -+ -+ -+ -+ -+ - - - diff --git a/tomcat.spec b/tomcat.spec index 5f38368..707e59c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 70 +%global micro_version 71 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -81,7 +81,7 @@ Patch2: %{name}-build.patch Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch Patch4: rhbz-1857043.patch Patch5: %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch -Patch6: %{name}-%{major_version}.%{minor_version}-osgi-annotations.patch +Patch6: %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch BuildArch: noarch @@ -92,12 +92,10 @@ BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib -BuildRequires: wsdl4j BuildRequires: systemd Requires: java-headless >= 1:1.8.0 Requires: javapackages-tools -Requires: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 Recommends: tomcat-native >= %{native_version} @@ -223,14 +221,9 @@ touch HACK -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="HACK" \ - -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ + -Dwsdl4j-lib.jar="HACK" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ - -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)" \ - -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ - -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ - -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ + -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ deploy @@ -502,6 +495,11 @@ fi %{appdir}/ROOT %changelog +* Sun Jan 29 2023 Hui Wang - 1:9.0.71-1 +- Update to 9.0.71 +- Remove osgi-annotations patch +- Add bnd-annotation dependency which is in bndlib package + * Fri Jan 13 2023 Hui Wang - 1:9.0.70-1 - Update to 9.0.70