Exclude i686 architecture from build

This commit is contained in:
Eduard Abdullin 2026-04-24 03:51:19 +00:00 committed by root
commit b701cc9382
4 changed files with 3974 additions and 31 deletions

15
.gitignore vendored
View File

@ -1,10 +1,9 @@
results_tomcat9
*.rpm
/tomcat-9.0.87.redhat-00005-src.zip
/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
/tomcat-9.0.87.redhat-00012-src.zip
/tomcat-9.0.87.redhat-00013-src.zip
/apache-tomcat-9.0.110-src.tar.gz
/tomcat-9.0.87.redhat-*-src.zip
/apache-tomcat-9*-src.tar.gz
apache-tomcat-*-src
/tomcat9.iml
/.idea/.gitignore
/.idea/modules.xml
/.idea/vcs.xml

3958
rhel-150720.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -31,24 +31,4 @@ diff -up ./test/org/apache/catalina/realm/TestRealmBase.java ./test/org/apache/c
SecurityConstraint[] constraintsDelete =
mapRealm.findSecurityConstraints(request, context);
diff -up ./webapps/docs/changelog.xml.orig ./webapps/docs/changelog.xml
--- ./webapps/docs/changelog.xml.orig 2026-04-14 15:48:53.192243701 -0400
+++ ./webapps/docs/changelog.xml 2026-04-14 15:49:48.893470762 -0400
@@ -104,6 +104,17 @@
They eventually become mixed with the numbered issues (i.e., numbered
issues do not "pop up" wrt. others).
-->
+<section name="Tomcat 9.0.110-redhat (csutherl)" rtext="">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>69848</bug>: Fix copy/paste error that meant DELETE
+ requests received via the AJP connector were processed as OPTIONS
+ requests. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 9.0.110 (remm)" rtext="">
<subsection name="Catalina">
<changelog>

View File

@ -53,7 +53,7 @@
Name: tomcat9
Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 3%{?dist}.alma.1
Release: 4%{?dist}.alma.1
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
License: Apache-2.0
@ -80,6 +80,7 @@ Patch6: tomcat-%{major_version}.%{minor_version}-bnd-annotation.patch
Patch7: build-with-java-25.patch
Patch8: rhel-158962.patch
Patch9: rhel-168243.patch
Patch10: rhel-150720.patch
BuildArch: noarch
@ -216,6 +217,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch -P7 -p0
%patch -P8 -p1
%patch -P9 -p1
%patch -P10 -p1
# Remove webservices naming resources as it's generally unused
%{__rm} -rf java/org/apache/naming/factory/webservices
@ -638,9 +640,13 @@ fi
%{appdir}/ROOT
%changelog
* Fri Apr 17 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:9.0.110-3.alma.1
* Fri Apr 24 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:9.0.110-4.alma.1
- Exclude i686 architecture from build
* Thu Apr 16 2026 Pietro Meloni <pmeloni@redhat.com> - 1:9.0.110-4
- Resolves: RHEL-150720
Tomcat: Certificate revocation bypass due to improper OCSP response validation (CVE-2026-24734)
* Tue Apr 14 2026 Coty Sutherland <csutherl@redhat.com> - 1:9.0.110-3
- Resolves: RHEL-168243 Fix copy/paste error in AJP connector that caused DELETE requests to be processed as OPTIONS requests (BZ#69848)