Resolves: RHEL-12543

This commit is contained in:
Hui Wang 2023-10-12 22:02:56 +08:00
parent f6c0c8aa4b
commit 54c69ca083
3 changed files with 10 additions and 38 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/apache-tomcat-9.0.62-src.tar.gz /apache-tomcat-9.0.62-src.tar.gz
/tomcat-9.0.62.redhat-00013.tar.gz /tomcat-9.0.62.redhat-00013.tar.gz
/tomcat-9.0.62.redhat-00014-src.zip

View File

@ -1 +1 @@
SHA512 (tomcat-9.0.62.redhat-00013.tar.gz) = f2fd99557bbdfff2811518c7ee25a699df8594371421780de04e378d73730e4f942b725156a4a96056e9782780af578ed6f9360983514598d13d2deaba209264 SHA512 (tomcat-9.0.62.redhat-00014-src.zip) = ec6bb9929541a5d21138d9b142ee46713ce3a50d0f1e304b543c1ccd1484faea2df00cc8ec0ebe47c564c4e778ff5fee8a5e98800365ba8f4f937168ca4c997d

View File

@ -32,7 +32,7 @@
%global major_version 9 %global major_version 9
%global minor_version 0 %global minor_version 0
%global micro_version 62 %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 servletspec 4.0
%global elspec 3.0 %global elspec 3.0
%global tcuid 53 %global tcuid 53
@ -56,12 +56,12 @@
Name: tomcat Name: tomcat
Epoch: 1 Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version} Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 14%{?dist} Release: 16%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
License: ASL 2.0 License: ASL 2.0
URL: http://tomcat.apache.org/ URL: http://tomcat.apache.org/
Source0: %{packdname}.tar.gz Source0: %{packdname}.zip
Source1: %{name}-%{major_version}.%{minor_version}.conf Source1: %{name}-%{major_version}.%{minor_version}.conf
Source3: %{name}-%{major_version}.%{minor_version}.sysconfig Source3: %{name}-%{major_version}.%{minor_version}.sysconfig
Source4: %{name}-%{major_version}.%{minor_version}.wrapper 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 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. 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 %package admin-webapps
Summary: The host-manager and manager web applications for Apache Tomcat Summary: The host-manager and manager web applications for Apache Tomcat
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
@ -213,7 +186,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
The ROOT web application for Apache Tomcat. The ROOT web application for Apache Tomcat.
%prep %prep
%setup -q -n %{packdname} %setup -q -n apache-%{packdname}
# remove pre-built binaries and windows files # remove pre-built binaries and windows files
find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ 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 -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete
@ -583,14 +556,12 @@ fi
%defattr(0644,tomcat,tomcat,0755) %defattr(0644,tomcat,tomcat,0755)
%{appdir}/ROOT %{appdir}/ROOT
%files java-jdk8
%files java-jdk11
%files java-jdk17
%changelog %changelog
* Thu Oct 12 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-16
- Resolves: RHEL-12543 HTTP/2: Multiple HTTP/2 enabled web servers are vulnerable to a DDoS attack (Rapid Reset Attack)
- Remove JDK subpackges which are unused
* Fri Sep 08 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-14 * Fri Sep 08 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-14
- Related: RHEL-2330 Bump release number - Related: RHEL-2330 Bump release number