From 851a85562892aea03f62ec06643a4f202124524c Mon Sep 17 00:00:00 2001
From: Adam Krajcik <akrajcik@redhat.com>
Date: Wed, 13 Aug 2025 11:24:31 +0200
Subject: [PATCH] Fix multiple CVES

Resolves: RHEL-108485 - CVE-2025-48976
Resolves: RHEL-108493 - CVE-2025-48988
Resolves: RHEL-108501 - CVE-2025-49125
Resolves: RHEL-108509 - CVE-2025-52434
Resolves: RHEL-108522 - CVE-2025-52520
Resolves: RHEL-108517 - CVE-2025-53506
---
 .gitignore   |  1 +
 sources      |  2 +-
 tomcat9.spec | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04a722c..3bb528b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /tomcat-9.0.87.redhat-00006-src.zip
 /tomcat-9.0.87.redhat-00008-src.zip
 /tomcat-9.0.87.redhat-00010-src.zip
+/tomcat-9.0.87.redhat-00011-src.zip
diff --git a/sources b/sources
index 7a0d3a5..4e080da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcat-9.0.87.redhat-00010-src.zip) = fd65e91c2fd11d48396692e0e88fbba8c2025ec35cbefb29b9b192c516af958ad357a1232e21abd262187d14add45b1441c34d3fa76ac40ba0866febbbfb341d
+SHA512 (tomcat-9.0.87.redhat-00011-src.zip) = a5cd593edb6925ab9bc123faa2476815e61f31a3d22962149c041861bacfeba15fff77d3c56565e8283177fcdc84cf2d1b70b6a60732e9bab154f36cf438912a
diff --git a/tomcat9.spec b/tomcat9.spec
index 3ebaa0d..419c1e0 100644
--- a/tomcat9.spec
+++ b/tomcat9.spec
@@ -32,7 +32,7 @@
 %global major_version 9
 %global minor_version 0
 %global micro_version 87
-%global packdname tomcat-%{major_version}.%{minor_version}.%{micro_version}.redhat-00010-src
+%global packdname tomcat-%{major_version}.%{minor_version}.%{micro_version}.redhat-00011-src
 %global servletspec 4.0
 %global elspec 3.0
 %global tcuid 53
@@ -53,7 +53,7 @@
 Name:          tomcat9
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       Apache-2.0
@@ -622,6 +622,20 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Wed Aug 13 2025 Adam Krajcik <akrajcik@redhat.com> - 1:9.0.87-7
+- Resolves: RHEL-108485
+  tomcat: Apache Commons FileUpload DOS via part headers (CVE-2025-48976)
+- Resolves: RHEL-108493
+  tomcat: Dos in multipart upload (CVE-2025-48988)
+- Resolves: RHEL-108501
+  tomcat: Security constraint bypass for pre/post-resources (CVE-2025-49125)
+- Resolves: RHEL-108509
+  tomcat: Denial of service (CVE-2025-52434)
+- Resolves: RHEL-108522
+  tomcat: Denial of service (CVE-2025-52520)
+- Resolves: RHEL-108517
+  tomcat: Denial of service (CVE-2025-53506)
+
 * Mon May 26 2025 Adam Krajcik <akrajcik@redhat.com> - 1:9.0.87-5.el10_0.1
 - Resolves: RHEL-91750
   tomcat: DoS via malformed HTTP/2 PRIORITY_UPDATE frame (CVE-2025-31650)