From fd1042182a5ee251bdc14bfecd004e580ff63047 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 18 Mar 2021 20:51:41 +0800 Subject: [PATCH 01/10] Update to 9.0.44 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 150d10f..de38a39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.43-src.tar.gz) = 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26 +SHA512 (apache-tomcat-9.0.44-src.tar.gz) = 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f diff --git a/tomcat.spec b/tomcat.spec index f2f91ee..72e6a37 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 43 +%global micro_version 44 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -623,7 +623,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog -* Wed Jan 03 2021 Hui Wang - 1:9.0.43-1 +* Thu Mar 18 2021 Hui Wang - 1:9.0.44-1 +- Update to 9.0.44 + +* Wed Feb 03 2021 Hui Wang - 1:9.0.43-1 - Update to 9.0.43 * Wed Jan 27 2021 Fedora Release Engineering - 1:9.0.41-2 From a669467673b797450484781ee4f91a05581a482e Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 22 Apr 2021 18:35:23 +0800 Subject: [PATCH 02/10] Update to 9.0.45 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index de38a39..fd2a7c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.44-src.tar.gz) = 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f +SHA512 (apache-tomcat-9.0.45-src.tar.gz) = e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e diff --git a/tomcat.spec b/tomcat.spec index 72e6a37..079203c 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 44 +%global micro_version 45 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -623,6 +623,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 +- Update to 9.0.45 + * Thu Mar 18 2021 Hui Wang - 1:9.0.44-1 - Update to 9.0.44 From ba3b2a20b09a39c909b2b211a18ba695f60147f8 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 12 Aug 2021 16:22:27 +0800 Subject: [PATCH 03/10] Update to 9.0.50 --- rhbz-1857043.patch | 24 ++++++++++++------------ sources | 2 +- tomcat-9.0-JDTCompiler.patch | 23 +++++++++++++++++++++++ tomcat-9.0-catalina-policy.patch | 20 +++++++++++++------- tomcat.spec | 7 ++++++- 5 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 tomcat-9.0-JDTCompiler.patch diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index 3730769..7d68c42 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,16 +1,16 @@ diff -up ./build.xml.orig ./build.xml ---- ./build.xml.orig 2020-07-24 10:24:08.313796968 -0400 -+++ ./build.xml 2020-07-24 10:24:38.027427445 -0400 -@@ -757,7 +757,7 @@ +--- 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 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" - addOSGi="true" /> + addOSGi="false" /> - + + addOSGi="false" /> - + 1:9.0.50-1 +- Update to 9.0.50 + * Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 - Update to 9.0.45 From e3bbee05fd9f6297ec0093c7a5457e8692dc5b90 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 18 Aug 2021 16:20:43 +0800 Subject: [PATCH 04/10] Update to 9.0.52 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6e8caa6..c659d36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.50-src.tar.gz) = 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2 +SHA512 (apache-tomcat-9.0.52-src.tar.gz) = 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d diff --git a/tomcat.spec b/tomcat.spec index 310e910..5fb124c 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 50 +%global micro_version 52 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -625,6 +625,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Aug 18 2021 Hui Wang 1:9.0.52-1 +- Update to 9.0.52 + * Thu Aug 12 2021 Hui Wang 1:9.0.50-1 - Update to 9.0.50 From 444adc7c9f32560558b9e97061b9fd9815e1ee6b Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 16 Sep 2021 18:23:50 +0800 Subject: [PATCH 05/10] Update to 9.0.53 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c659d36..aaa42c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.52-src.tar.gz) = 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d +SHA512 (apache-tomcat-9.0.53-src.tar.gz) = f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27 diff --git a/tomcat.spec b/tomcat.spec index 5fb124c..75c0807 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 52 +%global micro_version 53 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -625,6 +625,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Sep 16 2021 Hui Wang 1:9.0.53-1 +- Update to 9.0.53 + * Wed Aug 18 2021 Hui Wang 1:9.0.52-1 - Update to 9.0.52 From b7f9746a83afcc7cef84280f8c0c3aff7fef5915 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 12 Oct 2021 15:08:41 +0800 Subject: [PATCH 06/10] Update to 9.0.54 --- sources | 2 +- tomcat.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index aaa42c4..99f5bbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.53-src.tar.gz) = f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27 +SHA512 (apache-tomcat-9.0.54-src.tar.gz) = e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b diff --git a/tomcat.spec b/tomcat.spec index 75c0807..e889256 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 53 +%global micro_version 54 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -625,13 +625,16 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog -* Thu Sep 16 2021 Hui Wang 1:9.0.53-1 +* Tue Oct 12 2021 Hui Wang - 1:9.0.54-1 +- Update to 9.0.54 + +* Thu Sep 16 2021 Hui Wang - 1:9.0.53-1 - Update to 9.0.53 -* Wed Aug 18 2021 Hui Wang 1:9.0.52-1 +* Wed Aug 18 2021 Hui Wang - 1:9.0.52-1 - Update to 9.0.52 -* Thu Aug 12 2021 Hui Wang 1:9.0.50-1 +* Thu Aug 12 2021 Hui Wang - 1:9.0.50-1 - Update to 9.0.50 * Thu Apr 22 2021 Hui Wang - 1:9.0.45-1 From 2dd5abeecc7d47a3f1af216559c6b15304adf14f Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 23 Nov 2021 15:35:49 +0800 Subject: [PATCH 07/10] Update to 9.0.55 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 99f5bbd..f5c9c8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.54-src.tar.gz) = e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b +SHA512 (apache-tomcat-9.0.55-src.tar.gz) = abfb1824387045fc6b5a5077179149e6c348c0deae933e8766c60cbf92466f5e8883ebe4cc260c23ece6d3975ab2e25f7cdde58f9dd83dfdd22cab33c967b28c diff --git a/tomcat.spec b/tomcat.spec index e889256..9cbaf00 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 54 +%global micro_version 55 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -625,6 +625,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Tue Nov 23 2021 Hui Wang - 1:9.0.55-1 +- Update to 9.0.55 + * Tue Oct 12 2021 Hui Wang - 1:9.0.54-1 - Update to 9.0.54 From 4290378ccb6e52195d2fe1395235d6a1b3033d53 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 10 Dec 2021 10:18:47 +0800 Subject: [PATCH 08/10] Update to 9.0.56 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f5c9c8e..259252b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.55-src.tar.gz) = abfb1824387045fc6b5a5077179149e6c348c0deae933e8766c60cbf92466f5e8883ebe4cc260c23ece6d3975ab2e25f7cdde58f9dd83dfdd22cab33c967b28c +SHA512 (apache-tomcat-9.0.56-src.tar.gz) = 43332241fda149f9da107496cc6b812e38544c9043c567e3fe11ee01b5abfbd02b6a377c3f6090902048bd9dc67746cdc65d59f03bd0de68c05e0955bfe018c5 diff --git a/tomcat.spec b/tomcat.spec index 9cbaf00..d076fdf 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 55 +%global micro_version 56 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -625,6 +625,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Fri Dec 10 2021 Hui Wang - 1:9.0.56-1 +- Update to 9.0.56 + * Tue Nov 23 2021 Hui Wang - 1:9.0.55-1 - Update to 9.0.55 From 55dfbce29f22575c360584fabee5862b23849c53 Mon Sep 17 00:00:00 2001 From: Sonia Xu Date: Wed, 2 Mar 2022 23:41:57 +0000 Subject: [PATCH 09/10] Update to 9.0.59 Fixes CVE-2022-23181 --- sources | 2 +- tomcat-9.0-JDTCompiler.patch | 19 ++++++++++--------- tomcat.spec | 6 +++++- 3 files changed, 16 insertions(+), 11 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 d076fdf..1751e86 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 @@ -625,6 +625,10 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %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 + * Fri Dec 10 2021 Hui Wang - 1:9.0.56-1 - Update to 9.0.56 From 43fdc13e012caef7dda46f0113457c539333c2d0 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Tue, 8 Mar 2022 15:22:53 -0500 Subject: [PATCH 10/10] Resolves: rhbz#2061424 Add Java 9 start-up parameters to allow reflection --- java-9-start-up-parameters.conf | 7 +++++++ tomcat.spec | 9 ++++++++- 2 files changed, 15 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..341e077 --- /dev/null +++ b/java-9-start-up-parameters.conf @@ -0,0 +1,7 @@ +# Add the JAVA 9 specific start-up parameters required by Tomcat +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 1751e86..2100f7b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -77,6 +77,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 @@ -325,6 +326,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,; @@ -547,6 +550,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 @@ -625,6 +629,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Thu Mar 10 2022 Coty Sutherland - 1:9.0.59-3 +- 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