From 2ffccfd9e7a2b28b91eb74ba3ec14a4103b76def Mon Sep 17 00:00:00 2001
From: Christina Fu <cfu@redhat.com>
Date: Thu, 31 Jul 2025 13:32:52 -0700
Subject: [PATCH] Rebase to JSS 5.7.0-beta2

Resolves: RHEL-99832
---
 .gitignore |  1 +
 jss.spec   | 38 ++++++++++++++++++++++++--------------
 sources    |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index d952efc..495947f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ jss-4.2.6.tar.gz
 /jss-5.6.0-alpha1.tar.gz
 /jss-5.6.0.tar.gz
 /jss-5.8.0-beta2.tar.gz
+/jss-5.7.0-beta2.tar.gz
diff --git a/jss.spec b/jss.spec
index d8ee105..4c8d8cc 100644
--- a/jss.spec
+++ b/jss.spec
@@ -7,13 +7,13 @@ Name:           jss
 
 # Upstream version number:
 %global         major_version 5
-%global         minor_version 8
+%global         minor_version 7
 %global         update_version 0
 
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global         release_number 0.2
+%global         release_number 0.1
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
@@ -21,6 +21,10 @@ Name:           jss
 # - GA/update (supported): <none>
 %global         phase beta2
 
+%if 0%{?rhel} && 0%{?rhel} >= 10
+%global enable_nss_version_pqc_def_flag -DENABLE_NSS_VERSION_PQC_DEF=ON
+%endif
+
 %undefine       timestamp
 %undefine       commit_id
 
@@ -149,14 +153,20 @@ This only works with gcj. Other JREs require that JCE providers be signed.
 Summary:        Java Security Services (JSS) Connector for Tomcat
 
 # Tomcat
-BuildRequires:  mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.33
-BuildRequires:  mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.33
-BuildRequires:  mvn(org.apache.tomcat:tomcat-juli) >= 10.1.33
+BuildRequires:  mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
+BuildRequires:  mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
+BuildRequires:  mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
+%if 0%{?rhel} && 0%{?rhel} >= 10
+BuildRequires:  tomcat9-lib
+%endif
 
 Requires:       %{product_id} = %{version}-%{release}
-Requires:       mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.33
-Requires:       mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.33
-Requires:       mvn(org.apache.tomcat:tomcat-juli) >= 10.1.33
+Requires:       mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
+Requires:       mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
+Requires:       mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
+%if 0%{?rhel} && 0%{?rhel} >= 10
+Requires:       tomcat9 >= 1:9.0.62
+%endif
 
 # Tomcat JSS has been replaced with JSS Connector for Tomcat.
 # This will remove installed Tomcat JSS packages.
@@ -244,11 +254,11 @@ This package provides test suite for JSS.
 
 # specify Maven artifact locations
 %mvn_file org.dogtagpki.jss:jss-tomcat         jss/jss-tomcat
-%mvn_file org.dogtagpki.jss:jss-tomcat-10.1     jss/jss-tomcat-10.1
+%mvn_file org.dogtagpki.jss:jss-tomcat-9.0     jss/jss-tomcat-9.0
 
 # specify Maven artifact packages
 %mvn_package org.dogtagpki.jss:jss-tomcat      jss-tomcat
-%mvn_package org.dogtagpki.jss:jss-tomcat-10.1  jss-tomcat
+%mvn_package org.dogtagpki.jss:jss-tomcat-9.0  jss-tomcat
 
 ################################################################################
 %build
@@ -310,7 +320,7 @@ touch %{_vpath_builddir}/.targets/finished_generate_javadocs
     --lib-dir=%{_libdir} \
     --sysconf-dir=%{_sysconfdir} \
     --share-dir=%{_datadir} \
-    --cmake="%{__cmake} -DENABLE_NSS_VERSION_PQC_DEF=ON" \
+    --cmake="%{__cmake} %{?enable_nss_version_pqc_def_flag}" \
     --java-home=%{java_home} \
     --jni-dir=%{_jnidir} \
     --version=%{version} \
@@ -393,10 +403,10 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 
 ################################################################################
 %changelog
-* Fri Jul 18 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.8.0-0.1.beta2
-- Rebase to JSS 5.8.0-beta2
+* Thu Jul 31 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.7.0-0.1.beta2
+- Rebase to JSS 5.7.0-beta2
 - Jira Ticket RHCS-98721 ACME server: RFC 8555 violation: Support ES256 #4638 [rhel-10]
-- Jira Ticket IDM-2360 build encountered: PQC alg defs to match with NSS V3.112
+- Jira Ticket IDM-2428 build encountered: PQC alg defs to match with NSS V3.112
 
 * Sat Feb 15 2025 Red Hat PKI Team <rhcs-maint@redhat.com>- 5.6.0-1
 - Rebase to JSS 5.6.0
diff --git a/sources b/sources
index d312dad..76c09dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-5.8.0-beta2.tar.gz) = 544ce14a9b729ca0dca1f9cbe818f167d45ecd6ebad0ff83f9e674656e309d1dd47e551abe23215d5cc350c4b66486ec35489cafc91966b64cd03188c4ed767e
+SHA512 (jss-5.7.0-beta2.tar.gz) = ccb09a0a404a77a270fa407eac52fbb3480f8bc337a5697c4afbd6b29940fde2e763d44402ed98b39ced273e766665ebe37bcafaa00b28c0adb210922da65fd0