From eb8ee63e74b04959f5ae09d5e780f269d66634d5 Mon Sep 17 00:00:00 2001
From: Adam Krajcik <akrajcik@redhat.com>
Date: Fri, 28 Nov 2025 14:07:00 +0100
Subject: [PATCH] Fix CVE-2025-55752 and CVE-2025-31651

Resolves: RHEL-124496 - tomcat: Directory traversal via rewrite with possible RCE
Resolves: RHEL-132559 - tomcat: Bypass of rules in Rewrite Valve
---
 .gitignore   |  1 +
 sources      |  2 +-
 tomcat9.spec | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 069eaab..c364ab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /tomcat-9.0.87.redhat-00010-src.zip
 /tomcat-9.0.87.redhat-00011-src.zip
 /tomcat-9.0.87.redhat-00012-src.zip
+/tomcat-9.0.87.redhat-00013-src.zip
diff --git a/sources b/sources
index d2e8073..d789131 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcat-9.0.87.redhat-00012-src.zip) = 09c490294696114a2fd1c0680db96c969a331d070d1855ae4814bea5d57f9e891d6576b4acae56f53864280e53c3e6983c2b1a11861b0b0f52c021048482c696
+SHA512 (tomcat-9.0.87.redhat-00013-src.zip) = 1049d86d4bbdfd251a3f0cc72840cb6535a5637a76becaec8cb9c6532430dabaefd007af285fa1ac8d6a2a70f1d0378f6a1e908f7e7c5aff7c2bbedcd521cc9d
diff --git a/tomcat9.spec b/tomcat9.spec
index d2d26ec..f97822a 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-00012-src
+%global packdname tomcat-%{major_version}.%{minor_version}.%{micro_version}.redhat-00013-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:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       Apache-2.0
@@ -622,6 +622,12 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Fri Jan 23 2026 Pietro Meloni <pmeloni@redhat.com> - 1:9.0.87-9
+- Resolves: RHEL-124496
+  tomcat: Directory traversal via rewrite with possible RCE (CVE-2025-55752)
+- Resolves: RHEL-132559
+  tomcat: Bypass of rules in Rewrite Valve (CVE-2025-31651)
+
 * Mon Aug 18 2025 Adam Krajcik <akrajcik@redhat.com> - 1:9.0.87-8
 - Resolves: RHEL-102186
   tomcat: http/2 "MadeYouReset" DoS attack through HTTP/2 control frames (CVE-2025-48989)