From cd6451cb52f326135e8ea5e92aa9df246f3b6e7f Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 16 Sep 2020 17:29:55 +0800 Subject: [PATCH 01/15] Update to 9.0.38 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 1cf78f2..564403f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.37-src.tar.gz) = 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98 +SHA512 (apache-tomcat-9.0.38-src.tar.gz) = 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b diff --git a/tomcat.spec b/tomcat.spec index 3722559..1e8d9fa 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 37 +%global micro_version 38 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -622,6 +622,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Wed Sep 16 2020 Hui Wang - 1:9.0.38-1 +- Update to 9.0.38 + * Wed Jul 29 2020 Fedora Release Engineering - 1:9.0.37-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3b4bf51072b5ab48d1bc7a3c49765c133ba95bd5 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 14 Oct 2020 11:06:05 +0800 Subject: [PATCH 02/15] Update to 9.0.39 --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 564403f..0f52225 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.38-src.tar.gz) = 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b +SHA512 (apache-tomcat-9.0.39-src.tar.gz) = d13a74789db0fdd9d814296cb66ae1321407b1452e0aa7b4f554c86b9c4f0abbeb9c9c6ab4723740174fe95ade4673c67fb7cb6f220d0d3c71ac27146faf5374 diff --git a/tomcat.spec b/tomcat.spec index 1e8d9fa..4ca4af4 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 38 +%global micro_version 39 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -240,6 +240,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -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)" \ -Dversion="%{version}" \ @@ -622,6 +623,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Mon Oct 12 2020 Hui Wang - 1:9.0.39-1 +- Update to 9.0.39 + * Wed Sep 16 2020 Hui Wang - 1:9.0.38-1 - Update to 9.0.38 From 4668a5c59f75b81091c344d88ee18bacd8022e58 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 18 Nov 2020 15:10:57 +0800 Subject: [PATCH 03/15] Update to 9.0.40 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 0f52225..7b614e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.39-src.tar.gz) = d13a74789db0fdd9d814296cb66ae1321407b1452e0aa7b4f554c86b9c4f0abbeb9c9c6ab4723740174fe95ade4673c67fb7cb6f220d0d3c71ac27146faf5374 +SHA512 (apache-tomcat-9.0.40-src.tar.gz) = 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb diff --git a/tomcat.spec b/tomcat.spec index 4ca4af4..bfb3aae 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 39 +%global micro_version 40 %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 +* Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 +- Update to 9.0.40 + * Mon Oct 12 2020 Hui Wang - 1:9.0.39-1 - Update to 9.0.39 From 2f7e4a4f98df085a6ebbc1220125072600bff4c5 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 9 Dec 2020 15:02:23 +0800 Subject: [PATCH 04/15] Update to 9.0.41 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7b614e9..14b6e11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.40-src.tar.gz) = 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb +SHA512 (apache-tomcat-9.0.41-src.tar.gz) = 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838 diff --git a/tomcat.spec b/tomcat.spec index bfb3aae..7c6227c 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 40 +%global micro_version 41 %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 +* Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 +- Update to 9.0.41 + * Wed Nov 18 2020 Hui Wang - 1:9.0.40-1 - Update to 9.0.40 From 75bd0b2998c090e4e493f03eb6b1986f101d21b0 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 3 Feb 2021 15:11:03 +0800 Subject: [PATCH 05/15] Update to 9.0.43 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 14b6e11..150d10f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.41-src.tar.gz) = 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838 +SHA512 (apache-tomcat-9.0.43-src.tar.gz) = 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26 diff --git a/tomcat.spec b/tomcat.spec index 7c6227c..2d2144f 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 41 +%global micro_version 43 %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 +* Wed Feb 03 2020 Hui Wang - 1:9.0.43-1 +- Update to 9.0.43 + * Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 - Update to 9.0.41 From 6f6ebee4d74eabfeef10a9a2cf12e2c3bbfb85b7 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 3 Feb 2021 15:27:15 +0800 Subject: [PATCH 06/15] Fix typo in changelog --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 2d2144f..fb2104b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -623,7 +623,7 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog -* Wed Feb 03 2020 Hui Wang - 1:9.0.43-1 +* Wed Feb 03 2021 Hui Wang - 1:9.0.43-1 - Update to 9.0.43 * Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 From 5a7532b159f7bb41fdd9667928838833c9e73f07 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 3 Feb 2021 17:57:24 +0800 Subject: [PATCH 07/15] Add JDTCompiler-ecj-4.17.patch because of ecj lower version --- JDTCompiler-ecj-4.17.patch | 22 ++++++++++++++++++++++ tomcat.spec | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 JDTCompiler-ecj-4.17.patch diff --git a/JDTCompiler-ecj-4.17.patch b/JDTCompiler-ecj-4.17.patch new file mode 100644 index 0000000..14c7e6a --- /dev/null +++ b/JDTCompiler-ecj-4.17.patch @@ -0,0 +1,22 @@ +--- apache-tomcat-9.0.43-src/java/org/apache/jasper/compiler/JDTCompiler.java.orig 2021-02-03 16:33:37.896971294 +0800 ++++ apache-tomcat-9.0.43-src/java/org/apache/jasper/compiler/JDTCompiler.java 2021-02-03 17:42:27.285007084 +0800 +@@ -308,7 +308,7 @@ public class JDTCompiler extends org.apa + } else if(opt.equals("14")) { + settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14); + } else if(opt.equals("15")) { +- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15); ++ settings.put(CompilerOptions.OPTION_Source, "15"); + } else if(opt.equals("16")) { + // Constant not available in latest ECJ version shipped with + // Tomcat. May be supported in a snapshot build. +@@ -367,8 +367,8 @@ public class JDTCompiler extends org.apa + settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14); + settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14); + } else if(opt.equals("15")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15); +- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15); ++ settings.put(CompilerOptions.OPTION_TargetPlatform, "15"); ++ settings.put(CompilerOptions.OPTION_Compliance, "15"); + } else if(opt.equals("16")) { + // Constant not available in latest ECJ version shipped with + // Tomcat. May be supported in a snapshot build. diff --git a/tomcat.spec b/tomcat.spec index fb2104b..578379b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -83,6 +83,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat Patch2: %{name}-build.patch Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch Patch4: rhbz-1857043.patch +Patch5: JDTCompiler-ecj-4.17.patch BuildArch: noarch @@ -212,6 +213,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch2 -p0 %patch3 -p0 %patch4 -p0 +%patch5 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -625,6 +627,7 @@ fi %changelog * Wed Feb 03 2021 Hui Wang - 1:9.0.43-1 - Update to 9.0.43 +- Add the patch for JDTCompiler because the ecj available version is 4.17 on f33 * Wed Dec 09 2020 Hui Wang - 1:9.0.41-1 - Update to 9.0.41 From eddf988ee065564ea5a9b707b9bb73527b10c9ca Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 3 Feb 2021 18:14:15 +0800 Subject: [PATCH 08/15] Update JDTCompiler-ecj-4.17.patch --- JDTCompiler-ecj-4.17.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/JDTCompiler-ecj-4.17.patch b/JDTCompiler-ecj-4.17.patch index 14c7e6a..aa38717 100644 --- a/JDTCompiler-ecj-4.17.patch +++ b/JDTCompiler-ecj-4.17.patch @@ -1,5 +1,6 @@ ---- apache-tomcat-9.0.43-src/java/org/apache/jasper/compiler/JDTCompiler.java.orig 2021-02-03 16:33:37.896971294 +0800 -+++ apache-tomcat-9.0.43-src/java/org/apache/jasper/compiler/JDTCompiler.java 2021-02-03 17:42:27.285007084 +0800 +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-02-03 16:33:37.896971294 +0800 ++++ ./java/org/apache/jasper/compiler/JDTCompiler.java 2021-02-03 17:42:27.285007084 +0800 @@ -308,7 +308,7 @@ public class JDTCompiler extends org.apa } else if(opt.equals("14")) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14); From c3e446aad4d62eab13d9abc40b724b7329dd9b15 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 19 Mar 2021 10:02:28 +0800 Subject: [PATCH 09/15] Update to 9.0.44 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 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 578379b..4babf2f 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 @@ -625,6 +625,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* 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 - Add the patch for JDTCompiler because the ecj available version is 4.17 on f33 From 41caffebeb4596e43ee52f025bd33beb7d46a562 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 22 Apr 2021 18:44:48 +0800 Subject: [PATCH 10/15] 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 4babf2f..a81dfcf 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 @@ -625,6 +625,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 32e5bc5ecb1a039d7f97bb699e96cac54735c762 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 12 Aug 2021 17:22:19 +0800 Subject: [PATCH 11/15] Update to 9.0.50 --- rhbz-1857043.patch | 24 +++++++------- sources | 2 +- ...4.17.patch => tomcat-9.0-JDTCompiler.patch | 32 +++++++++---------- tomcat-9.0-catalina-policy.patch | 20 ++++++++---- tomcat.spec | 7 ++-- 5 files changed, 47 insertions(+), 38 deletions(-) rename JDTCompiler-ecj-4.17.patch => tomcat-9.0-JDTCompiler.patch (63%) 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 3024a0c14a401133be168534df64ee795c11abc1 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 18 Aug 2021 16:33:48 +0800 Subject: [PATCH 12/15] 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 b03e2ef..d54f922 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 ef0a9201098b249cbfac9fb9097fc75a72794f5e Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 16 Sep 2021 18:34:33 +0800 Subject: [PATCH 13/15] 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 d54f922..83eba36 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 09cb96d93b8e47b72c25300a06a49522607be75d Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 12 Oct 2021 15:16:46 +0800 Subject: [PATCH 14/15] Update to 9.0.54 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 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 83eba36..a78bcb3 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,6 +625,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* 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 From 5dcffd6f604b5c3175960adde2c2fb799ee2e48c Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Tue, 23 Nov 2021 15:44:46 +0800 Subject: [PATCH 15/15] 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 a78bcb3..f2fd033 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