From 232b53b7815d1e04eeb3030d7591bce8d5a2f0b8 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 20 Apr 2026 09:48:55 -0400 Subject: [PATCH] import CS dogtag-pki-11.9.0-3.el10 --- dogtag-pki.spec | 60 ++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/dogtag-pki.spec b/dogtag-pki.spec index 7330b57..2176acb 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -14,7 +14,7 @@ Name: dogtag-pki # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 2 +%global release_number 3 # Development phase: # - development (unsupported): alpha where n >= 1 @@ -215,11 +215,11 @@ BuildRequires: javapackages-tools %if %{without runtime_deps} BuildRequires: xmlstarlet %endif -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 BuildRequires: tomcat-lib >= 1:10.1.36 BuildRequires: tomcat-jakartaee-migration %else -BuildRequires: tomcat-lib >= 9.0 +BuildRequires: tomcat9-lib >= 9.0.62 %endif BuildRequires: mvn(commons-cli:commons-cli) @@ -256,7 +256,7 @@ BuildRequires: mvn(org.jboss.resteasy:resteasy-jackson2-provider) BuildRequires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) %endif -%if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 10 +%if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 11 BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.36 BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) >= 10.1.36 @@ -266,9 +266,13 @@ BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) >= 10.0.36 %else BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62 +BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) < 10 BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) >= 9.0.62 +BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) < 10 BuildRequires: mvn(org.apache.tomcat:tomcat-jaspic-api) >= 9.0.62 +BuildRequires: mvn(org.apache.tomcat:tomcat-jaspic-api) < 10 BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) >= 9.0.62 +BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) < 10 %endif @@ -492,13 +496,13 @@ to manage enterprise Public Key Infrastructure deployments. %{product_name} consists of the following components: - * Certificate Authority (CA) - * Key Recovery Authority (KRA) - * Online Certificate Status Protocol (OCSP) Manager - * Token Key Service (TKS) - * Token Processing Service (TPS) - * Automatic Certificate Management Environment (ACME) Responder - * Enrollment over Secure Transport (EST) Responder +* Certificate Authority (CA) +* Key Recovery Authority (KRA) +* Online Certificate Status Protocol (OCSP) Manager +* Token Key Service (TKS) +* Token Processing Service (TPS) +* Automatic Certificate Management Environment (ACME) Responder +* Enrollment over Secure Transport (EST) Responder # with meta %endif @@ -688,10 +692,10 @@ Requires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) Provides: bundled(resteasy-servlet-initializer) = 3.0.26 %endif -%if 0%{?rhel} && 0%{?rhel} >= 10 +%if 0%{?rhel} && 0%{?rhel} >= 11 Requires: tomcat >= 1:10.1.36 %else -Requires: tomcat >= 1:9.0.62 +Requires: tomcat9 >= 1:9.0.62 %endif Requires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.9.0 @@ -1105,7 +1109,7 @@ popd %endif -%if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 10 +%if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 11 #migrate the source first because we are starting with tomcat 9 code, so we can build against either tomcat 9 or 10.1, based on the build platform /usr/bin/javax2jakarta -profile=EE -exclude=./base/tomcat-9.0 ./base ./base %endif @@ -1186,7 +1190,7 @@ then #migrate necessary files being copied around to jakarta 9.0 ee, for >= f43 and rhel10 - %if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 10 + %if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 11 echo "Doing the tomcat 10 version..." /usr/bin/javax2jakarta -profile=EE jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar @@ -1235,8 +1239,7 @@ then cp /usr/share/java/resteasy/resteasy-servlet-initializer.jar \ resteasy-servlet-initializer-$RESTEASY_VERSION.jar -yy %if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 10 - %if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 + %if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 11 /usr/bin/javax2jakarta -profile=EE resteasy-servlet-initializer-$RESTEASY_VERSION.jar resteasy-servlet-initializer-$RESTEASY_VERSION.jar %endif @@ -1253,7 +1256,7 @@ fi %if ! %{with server} %pom_disable_module tomcat base -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 %pom_disable_module tomcat-10.1 base %else %pom_disable_module tomcat-9.0 base @@ -1306,7 +1309,7 @@ fi %mvn_file org.dogtagpki.pki:pki-server pki/pki-server %mvn_file org.dogtagpki.pki:pki-server-webapp pki/pki-server-webapp %mvn_file org.dogtagpki.pki:pki-tomcat pki/pki-tomcat -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 %mvn_file org.dogtagpki.pki:pki-tomcat-10.1 pki/pki-tomcat-10.1 %else %mvn_file org.dogtagpki.pki:pki-tomcat-9.0 pki/pki-tomcat-9.0 @@ -1331,7 +1334,7 @@ fi %mvn_package org.dogtagpki.pki:pki-server-webapp pki-server %mvn_package org.dogtagpki.pki:pki-tomcat pki-server -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 %mvn_package org.dogtagpki.pki:pki-tomcat-10.1 pki-server %else %mvn_package org.dogtagpki.pki:pki-tomcat-9.0 pki-server @@ -1362,7 +1365,7 @@ export JAVA_HOME=%{java_home} %if %{with maven} # build Java binaries and run unit tests with Maven -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 %pom_disable_module tomcat-9.0 base %pom_remove_dep :pki-tomcat-9.0 base/server %else @@ -1384,7 +1387,7 @@ ln -sf ../../base/tools/target/pki-tools.jar %if %{with server} ln -sf ../../base/tomcat/target/pki-tomcat.jar -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 ln -sf ../../base/tomcat-10.1/target/pki-tomcat-10.1.jar %else ln -sf ../../base/tomcat-9.0/target/pki-tomcat-9.0.jar @@ -1450,6 +1453,13 @@ pkgs=base\ %{?with_tests:,tests}\ %{?with_debug:,debug} + +## Force use of tomcat 9. + +sed -i 's/^APP_SERVER=.*/APP_SERVER=tomcat-9.0/g' build.sh + + + # build PKI console, Javadoc, and native binaries with CMake ./build.sh \ %{?_verbose:-v} \ @@ -1970,7 +1980,7 @@ fi %{_datadir}/java/pki/pki-server.jar %{_datadir}/java/pki/pki-server-webapp.jar %{_datadir}/java/pki/pki-tomcat.jar -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 %{_datadir}/java/pki/pki-tomcat-10.1.jar %else %{_datadir}/java/pki/pki-tomcat-9.0.jar @@ -2162,6 +2172,10 @@ fi ################################################################################ %changelog +* Fri Mar 13 2026 Red Hat PKI Team - 11.9.0-3 +- Revert to tomcat 9 +- Resolves: RHEL-155406 + * Tue Mar 10 2026 Red Hat PKI Team - 11.9.0-2 - Rebuilt for exception target