From 6f317b69a7192bee2e3240b3b0c573ee90331544 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 13 Sep 2023 15:55:58 +0800 Subject: [PATCH 01/13] Update to 9.0.80 --- sources | 2 +- tomcat.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index fcff246..2068d0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.78-src.tar.gz) = 220bf46004c4cbad536a7040c979651ee49a13994cf83045369c1bfdc0a96c0172ddc8fd24ab76c9526591c50033d915dbd258939b24d22d660050dcb5abcad4 +SHA512 (apache-tomcat-9.0.80-src.tar.gz) = a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114 diff --git a/tomcat.spec b/tomcat.spec index 101c183..66deed5 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 78 +%global micro_version 80 %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: 4%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Wed Sep 13 2023 Hui Wang - 1:9.0.80-1 +- Update to 9.0.80 +- Fix java version + * Fri Aug 04 2023 Hui Wang - 1:9.0.78-4 - Fix files permission From aea269b20bc20af6c988c20416bdb3147a3db863 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 13 Sep 2023 16:38:14 +0800 Subject: [PATCH 02/13] Fix java version --- tomcat.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 66deed5..19c1fea 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 @@ -94,7 +94,7 @@ BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -Requires: java-headless >= 1:1.8.0 +Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -550,9 +550,11 @@ fi %{appdir}/ROOT %changelog +* Wed Sep 13 2023 Hui Wang - 1:9.0.80-2 +- Fix java version + * Wed Sep 13 2023 Hui Wang - 1:9.0.80-1 - Update to 9.0.80 -- Fix java version * Fri Aug 04 2023 Hui Wang - 1:9.0.78-4 - Fix files permission From 2d3cf70031a9dd58cc7e5cd3b48e50d0fbe441d4 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Mon, 16 Oct 2023 11:57:21 +0800 Subject: [PATCH 03/13] Update to 9.0.82 Resolves: rhbz#2244337 Wrong dbcp class in tomcat 9 --- sources | 2 +- tomcat-build.patch | 13 ++++++++++--- tomcat.spec | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 2068d0a..05325b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.80-src.tar.gz) = a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114 +SHA512 (apache-tomcat-9.0.82-src.tar.gz) = 0291196832150147230a263bcfd64f7ac9ce9f6c26924f72b831d28479e7886f00b9ab3adff175785e8c5b47d8b16f7a7897acafa3474428f48cec02fd852b3e diff --git a/tomcat-build.patch b/tomcat-build.patch index 49c63ff..cdf73ef 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,12 +1,19 @@ 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 +--- res/bnd/build-defaults.bnd.orig 2023-10-16 11:23:04.752754202 +0800 ++++ res/bnd/build-defaults.bnd 2023-10-16 11:23:29.931876910 +0800 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -Bundle-Version: ${version_cleanup;${version}} +Bundle-Version: ${version} + Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt Specification-Title: Apache Tomcat - Specification-Version: ${version.major.minor} +@@ -36,4 +36,4 @@ X-Compile-Target-JDK: ${compile.release} + + -removeheaders: DSTAMP,TODAY,TSTAMP + +-module.name: org.apache.${replace;${Bundle-Name};-;.} +\ No newline at end of file ++module.name: org.apache.${replace;${Bundle-Name};-;.} diff --git a/tomcat.spec b/tomcat.spec index 19c1fea..e3b7870 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 80 +%global micro_version 82 %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: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Mon Oct 16 2023 Hui Wang - 1:9.0.82-1 +- Update to 9.0.82 +- Resolves: rhbz#2244337 Wrong dbcp class in tomcat 9 + * Wed Sep 13 2023 Hui Wang - 1:9.0.80-2 - Fix java version From 79c34c7f77de3bdee88862fdbe4b59e422a04c5f Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Mon, 16 Oct 2023 19:12:53 +0800 Subject: [PATCH 04/13] Update tomcat-9.0.conf file --- tomcat-9.0.conf | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcat-9.0.conf b/tomcat-9.0.conf index e5fa60a..6e9eed1 100644 --- a/tomcat-9.0.conf +++ b/tomcat-9.0.conf @@ -35,7 +35,7 @@ CATALINA_TMPDIR="/var/cache/tomcat/temp" #JAVA_OPTS="-Djava.library.path=/usr/lib" # Set default javax.sql.DataSource factory to apache commons one. See rhbz#1214381 -JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory" +JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory" # You can change your tomcat locale here #LANG="en_US" diff --git a/tomcat.spec b/tomcat.spec index e3b7870..121654a 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 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Mon Oct 16 2023 Hui Wang - 1:9.0.82-2 +- Update tomcat-9.0.conf file + * Mon Oct 16 2023 Hui Wang - 1:9.0.82-1 - Update to 9.0.82 - Resolves: rhbz#2244337 Wrong dbcp class in tomcat 9 From fab3ff14db2eefc9e7c81f78f8af4e14b2269f29 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 1 Dec 2023 20:31:20 +0800 Subject: [PATCH 05/13] Update to 9.0.83 --- sources | 2 +- tomcat.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 05325b8..4196751 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.82-src.tar.gz) = 0291196832150147230a263bcfd64f7ac9ce9f6c26924f72b831d28479e7886f00b9ab3adff175785e8c5b47d8b16f7a7897acafa3474428f48cec02fd852b3e +SHA512 (apache-tomcat-9.0.83-src.tar.gz) = 28e112a9d01918434ad03c414058275bbc4e34be408c2cfe2d819c3a08cadc3c31920e279c5312529aa2f5abf1e002537012c5f06d43ba8894448afd5585c231 diff --git a/tomcat.spec b/tomcat.spec index 121654a..fe2e3d8 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 82 +%global micro_version 83 %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: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Fri Dec 01 2023 Hui Wang - 1:9.0.82-1 +- Update to 9.0.83 + * Mon Oct 16 2023 Hui Wang - 1:9.0.82-2 - Update tomcat-9.0.conf file From 903a56b942339b246f7229bf121414bda80ae3f9 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Mon, 27 May 2024 13:36:42 +0300 Subject: [PATCH 06/13] Update to 9.0.89 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4196751..a23d2c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.83-src.tar.gz) = 28e112a9d01918434ad03c414058275bbc4e34be408c2cfe2d819c3a08cadc3c31920e279c5312529aa2f5abf1e002537012c5f06d43ba8894448afd5585c231 +SHA512 (apache-tomcat-9.0.89-src.tar.gz) = c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1 diff --git a/tomcat.spec b/tomcat.spec index fe2e3d8..51671d3 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 83 +%global micro_version 89 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Mon May 27 2024 Dimitris Soumis - 1:9.0.89-1 +- Update to 9.0.89 + * Fri Dec 01 2023 Hui Wang - 1:9.0.82-1 - Update to 9.0.83 From b8ba46705d7ffe033308de0daf1f393bb745cd14 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 20 Jun 2024 13:29:56 +0300 Subject: [PATCH 07/13] Update to 9.0.90 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a23d2c8..6bccc7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.89-src.tar.gz) = c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1 +SHA512 (apache-tomcat-9.0.90-src.tar.gz) = ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb diff --git a/tomcat.spec b/tomcat.spec index 51671d3..24b99b3 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 89 +%global micro_version 90 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Wed Jun 26 2024 Dimitris Soumis - 1:9.0.90-1 +- Update to 9.0.90 + * Mon May 27 2024 Dimitris Soumis - 1:9.0.89-1 - Update to 9.0.89 From 12515d79b5c99429c7df753ec2c3b4c52cdc59c6 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 11 Jul 2024 13:17:16 +0300 Subject: [PATCH 08/13] Update to 9.0.91 --- sources | 2 +- tomcat.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 6bccc7c..02d68a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.90-src.tar.gz) = ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb +SHA512 (apache-tomcat-9.0.91-src.tar.gz) = 43e09871b76f63416d8ac9d4594752dba5f8335e34bceb0ef0b210f47314e922e95e0e6a2939ac4807d60d2fb5b81f03079590644fc2a9fa5d51cccfd3813ab4 diff --git a/tomcat.spec b/tomcat.spec index 24b99b3..ff80139 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 90 +%global micro_version 91 %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: 1%{?dist} +Release: %autorelease Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -94,7 +94,7 @@ BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8) +Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java >= 1:1.8) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 +- Update to 9.0.91 + * Wed Jun 26 2024 Dimitris Soumis - 1:9.0.90-1 - Update to 9.0.90 From 6b13299c948c9cb1a5087c7fb892326e64674d1e Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 6 Aug 2024 03:31:28 +0000 Subject: [PATCH 09/13] Update to 9.0.93 upstream release - Resolves: rhbz#2303026 Upstream tag: 9.0.93 Upstream commit: a33d708d Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 02d68a0..087b80d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.91-src.tar.gz) = 43e09871b76f63416d8ac9d4594752dba5f8335e34bceb0ef0b210f47314e922e95e0e6a2939ac4807d60d2fb5b81f03079590644fc2a9fa5d51cccfd3813ab4 +SHA512 (apache-tomcat-9.0.93-src.tar.gz) = 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac diff --git a/tomcat.spec b/tomcat.spec index ff80139..5eee61b 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 91 +%global micro_version 93 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Tue Aug 06 2024 Packit - 1:9.0.93-1 +- Update to version 9.0.93 +- Resolves: rhbz#2303026 + * Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 - Update to 9.0.91 From 8ac493e69b1aa203c1bddf2573acd32a681aa19f Mon Sep 17 00:00:00 2001 From: Dimitris Soumis Date: Tue, 6 Aug 2024 13:45:18 +0300 Subject: [PATCH 10/13] Fix rhbz-1857043.patch --- rhbz-1857043.patch | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index dd74c3b..d6185aa 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,7 +1,6 @@ -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 -@@ -1020,7 +1020,7 @@ +--- build.xml.orig 2024-08-03 00:24:59.000000000 +0300 ++++ build.xml 2024-08-06 13:42:04.710875124 +0300 +@@ -1110,7 +1110,7 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -10,7 +9,7 @@ diff -up ./build.xml.orig ./build.xml ++ addOSGi="false" /> + + + + addOSGi="false" /> @@ -130,7 +137,7 @@ diff -up ./build.xml.orig ./build.xml Date: Tue, 10 Sep 2024 21:13:39 +0000 Subject: [PATCH 11/13] Update to 9.0.94 upstream release - Resolves: rhbz#2311320 Upstream tag: 9.0.94 Upstream commit: ce248107 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 087b80d..9db4cad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.93-src.tar.gz) = 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac +SHA512 (apache-tomcat-9.0.94-src.tar.gz) = d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6 diff --git a/tomcat.spec b/tomcat.spec index 5eee61b..0c8eb70 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 93 +%global micro_version 94 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Tue Sep 10 2024 Packit - 1:9.0.94-1 +- Update to version 9.0.94 +- Resolves: rhbz#2311320 + * Tue Aug 06 2024 Packit - 1:9.0.93-1 - Update to version 9.0.93 - Resolves: rhbz#2303026 From 66e1b5e0c0d2da57f52e8bf3a580469fea7c3946 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 17 Sep 2024 14:35:47 +0000 Subject: [PATCH 12/13] Update to 9.0.95 upstream release - Resolves: rhbz#2312858 Upstream tag: 9.0.95 Upstream commit: 9f8c522e Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9db4cad..2347049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.94-src.tar.gz) = d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6 +SHA512 (apache-tomcat-9.0.95-src.tar.gz) = 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db diff --git a/tomcat.spec b/tomcat.spec index 0c8eb70..139c34a 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 94 +%global micro_version 95 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Tue Sep 17 2024 Packit - 1:9.0.95-1 +- Update to version 9.0.95 +- Resolves: rhbz#2312858 + * Tue Sep 10 2024 Packit - 1:9.0.94-1 - Update to version 9.0.94 - Resolves: rhbz#2311320 From 95d146e2359cbcf04592bef4571b67af8d0490ab Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 8 Oct 2024 15:01:23 +0000 Subject: [PATCH 13/13] Update to 9.0.96 upstream release - Resolves: rhbz#2317237 Upstream tag: 9.0.96 Upstream commit: 7ecea316 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2347049..3fe0723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.95-src.tar.gz) = 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db +SHA512 (apache-tomcat-9.0.96-src.tar.gz) = cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884 diff --git a/tomcat.spec b/tomcat.spec index 139c34a..904bfbd 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 95 +%global micro_version 96 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Tue Oct 08 2024 Packit - 1:9.0.96-1 +- Update to version 9.0.96 +- Resolves: rhbz#2317237 + * Tue Sep 17 2024 Packit - 1:9.0.95-1 - Update to version 9.0.95 - Resolves: rhbz#2312858