From 82ca256fd8eb186c7d76daedd15568d9c15be3fe Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Fri, 24 May 2024 03:31:41 +0300
Subject: [PATCH] import tomcat-9.0.87-1.el9_4.1

---
 .gitignore                      |  2 +-
 .tomcat.metadata                |  2 +-
 SOURCES/fix-malformed-dtd.patch |  8 --------
 SOURCES/tomcat-build.patch      | 11 +++++------
 SPECS/tomcat.spec               | 32 +++++++++++++++++++++++---------
 5 files changed, 30 insertions(+), 25 deletions(-)
 delete mode 100644 SOURCES/fix-malformed-dtd.patch

diff --git a/.gitignore b/.gitignore
index 36661cc..816e937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcat-9.0.62.redhat-00018-src.zip
+SOURCES/tomcat-9.0.87.redhat-00003-src.zip
diff --git a/.tomcat.metadata b/.tomcat.metadata
index d04ed8b..1e59de5 100644
--- a/.tomcat.metadata
+++ b/.tomcat.metadata
@@ -1 +1 @@
-5becf21ed1eb5c031c31d5f295ce499234e98f82 SOURCES/tomcat-9.0.62.redhat-00018-src.zip
+4e1552026d103c3310c1bd678ac8fe7bab597e4b SOURCES/tomcat-9.0.87.redhat-00003-src.zip
diff --git a/SOURCES/fix-malformed-dtd.patch b/SOURCES/fix-malformed-dtd.patch
deleted file mode 100644
index f5f7546..0000000
--- a/SOURCES/fix-malformed-dtd.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -up ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd.orig ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
---- ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd.orig	2023-02-07 14:11:25.294179017 -0500
-+++ ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd	2023-02-07 14:11:28.629196705 -0500
-@@ -1,4 +1,3 @@
--<?xml version="1.0" encoding="UTF-8"?>
- <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
diff --git a/SOURCES/tomcat-build.patch b/SOURCES/tomcat-build.patch
index 49c63ff..608a785 100644
--- a/SOURCES/tomcat-build.patch
+++ b/SOURCES/tomcat-build.patch
@@ -1,12 +1,11 @@
-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	2024-05-01 11:07:38.804582327 +0300
++++ ./res/bnd/build-defaults.bnd	2024-05-01 11:17:08.857295279 +0300
 @@ -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}
diff --git a/SPECS/tomcat.spec b/SPECS/tomcat.spec
index 409e187..e23d5d1 100644
--- a/SPECS/tomcat.spec
+++ b/SPECS/tomcat.spec
@@ -31,8 +31,8 @@
 %global jspspec 2.3
 %global major_version 9
 %global minor_version 0
-%global micro_version 62
-%global packdname %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00018-src
+%global micro_version 87
+%global packdname %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00003-src
 %global servletspec 4.0
 %global elspec 3.0
 %global tcuid 53
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       37%{?dist}.2
+Release:       1%{?dist}.1
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -82,7 +82,6 @@ Patch3:        %{name}-%{major_version}.%{minor_version}-catalina-policy.patch
 Patch4:        rhbz-1857043.patch
 Patch6:        %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch
 Patch7:        JmxRemoteLifecycleListener.patch
-Patch8:        fix-malformed-dtd.patch
 
 BuildArch:     noarch
 
@@ -199,7 +198,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch -P4 -p0
 %patch -P6 -p0
 %patch -P7 -p1
-%patch -P8 -p1
 
 # Remove webservices naming resources as it's generally unused
 %{__rm} -rf java/org/apache/naming/factory/webservices
@@ -559,17 +557,33 @@ fi
 
 
 %changelog
-* Thu Jan 18 2024 Hui Wang <huwang@redhat.com> - 1:9.0.62-37.2
-- Resolves: RHEL-20723
-
-* Wed Dec 06 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-37.1
+* Fri May 03 2024 Sokratis Zappis <szappis@redhat.com> - 1:9.0.87-1.el9_4.1
+- Resolves: RHEL-34815 - Rebase tomcat to version 9.0.87
+- Resolves: RHEL-31048
+  tomcat: Apache Tomcat: WebSocket DoS with incomplete closing handshake (CVE-2024-23672)
+- Resolves: RHEL-31032
+  tomcat: : Apache Tomcat: HTTP/2 header handling DoS (CVE-2024-24549)
+- Resolves: RHEL-35328 - Amend tomcat's changelog
+  (CVE-2023-46589, CVE-2023-45648, CVE-2023-42795, CVE-2023-42794, CVE-2023-44487, CVE-2023-41080)
+
+* Thu Jan 18 2024 Hui Wang <huwang@redhat.com> - 1:9.0.62-39
+- Resolves: RHEL-17605
+
+* Thu Nov 23 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-38
 - Resolves: RHEL-13908
+  tomcat: incorrectly parsed http trailer headers can cause request smuggling (CVE-2023-45648)
 - Resolves: RHEL-13905
+  tomcat: improper cleaning of recycled objects could lead to information leak (CVE-2023-42795)
 - Resolves: RHEL-12952
+  tomcat: FileUpload: DoS due to accumulation of temporary files on Windows (CVE-2023-42794)
+- Resolves: RHEL-12552
+  tomcat: HTTP/2: Multiple HTTP/2 enabled web servers are vulnerable to a DDoS attack (Rapid Reset Attack) (CVE-2023-44487)
 - Resolves: RHEL-2388
+  tomcat: Open Redirect vulnerability in FORM authentication (CVE-2023-41080)
 
 * Fri Oct 13 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-37
 - Resolves: RHEL-12551
+  tomcat: HTTP/2: Multiple HTTP/2 enabled web servers are vulnerable to a DDoS attack (Rapid Reset Attack) (CVE-2023-44487)
 - Remove JDK subpackges which are unused
 
 * Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-16