From 9a93ee99f7d65b4cea791ab4dea937104b55a1b7 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Fri, 13 Oct 2023 11:26:46 +0800 Subject: [PATCH] Resolves: RHEL-12551 --- .gitignore | 1 + sources | 2 +- tomcat.spec | 47 +++++++++-------------------------------------- 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 8c93cd5..97ac5a6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ tomcat*.src.rpm apache-tomcat-*-src/ /tomcat-9.0.62.redhat-00012.tar.gz /tomcat-9.0.62.redhat-00013.tar.gz +/tomcat-9.0.62.redhat-00014-src.zip diff --git a/sources b/sources index 6e3c3b4..1f171a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tomcat-9.0.62.redhat-00013.tar.gz) = f2fd99557bbdfff2811518c7ee25a699df8594371421780de04e378d73730e4f942b725156a4a96056e9782780af578ed6f9360983514598d13d2deaba209264 +SHA512 (tomcat-9.0.62.redhat-00014-src.zip) = ec6bb9929541a5d21138d9b142ee46713ce3a50d0f1e304b543c1ccd1484faea2df00cc8ec0ebe47c564c4e778ff5fee8a5e98800365ba8f4f937168ca4c997d diff --git a/tomcat.spec b/tomcat.spec index 3288367..3971e62 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -32,7 +32,7 @@ %global major_version 9 %global minor_version 0 %global micro_version 62 -%global packdname %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00013 +%global packdname %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00014-src %global servletspec 4.0 %global elspec 3.0 %global tcuid 53 @@ -56,12 +56,12 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 16%{?dist} +Release: 37%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 URL: http://tomcat.apache.org/ -Source0: %{packdname}.tar.gz +Source0: %{packdname}.zip Source1: %{name}-%{major_version}.%{minor_version}.conf Source3: %{name}-%{major_version}.%{minor_version}.sysconfig Source4: %{name}-%{major_version}.%{minor_version}.wrapper @@ -121,33 +121,6 @@ Tomcat is developed in an open and participatory environment and released under the Apache Software License version 2.0. Tomcat is intended to be a collaboration of the best-of-breed developers from around the world. -%package java-jdk8 -Group: Development/Java -Summary: Tomcat on JDK 8 -Requires: java-1.8.0 >= 1:1.8 -Provides: tomcat-java = %{epoch}:%{version}-%{release} - -%description java-jdk8 -Tomcat on JDK 8 - -%package java-jdk11 -Group: Development/Java -Summary: Tomcat on JDK 11 -Requires: (java-11 or java-11-headless) -Provides: tomcat-java = %{epoch}:%{version}-%{release} - -%description java-jdk11 -Tomcat on JDK 11 - -%package java-jdk17 -Group: Development/Java -Summary: Tomcat on JDK 17 -Requires: (java-17 or java-17-headless) -Provides: tomcat-java = %{epoch}:%{version}-%{release} - -%description java-jdk17 -Tomcat on JDK 17 - %package admin-webapps Summary: The host-manager and manager web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} @@ -214,7 +187,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} The ROOT web application for Apache Tomcat. %prep -%setup -q -n %{packdname} +%setup -q -n apache-%{packdname} # remove pre-built binaries and windows files find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete @@ -584,14 +557,12 @@ fi %defattr(0644,tomcat,tomcat,0755) %{appdir}/ROOT -%files java-jdk8 - -%files java-jdk11 - -%files java-jdk17 - %changelog +* Fri Oct 13 2023 Hui Wang - 1:9.0.62-37 +- Resolves: RHEL-12551 +- Remove JDK subpackges which are unused + * Fri Aug 25 2023 Coty Sutherland - 1:9.0.62-16 - Related: #2184133 Declare file conflicts @@ -611,7 +582,7 @@ fi - Resolves: #2210632 CVE-2023-28709 - Resolves: #2184133 Add Obsoletes to tomcat package - Update patch command -- Update source to use jws tomcat +- Update source to include the CVE fixes * Thu Feb 23 2023 Hui Wang - 1:9.0.62-11 - Bump release so that the NVR on RHEL-9 is higher than RHEL-8