From 54c4bd07ba867d3cdd686e8c6451296afc378959 Mon Sep 17 00:00:00 2001
From: Hui Wang <huwang@redhat.com>
Date: Oct 16 2023 04:15:41 +0000
Subject: Update to 9.0.82

Resolves: rhbz#2243613 [Major Incident] CVE-2023-44487 tomcat
Resolves: rhbz#2244343 Wrong dbcp class in tomcat 9

---

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 4abe9ab..7145845 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
@@ -550,6 +550,11 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Mon Oct 16 2023 Hui Wang <huwang@redhat.com> - 1:9.0.82-1
+- Update to 9.0.82
+- Resolves: rhbz#2243613 [Major Incident] CVE-2023-44487 tomcat
+- Resolves: rhbz#2244343 Wrong dbcp class in tomcat 9
+
 * Wed Sep 13 2023 Hui Wang <huwang@redhat.com> - 1:9.0.80-1
 - Update to 9.0.80
 - Fix java version