From df5b61623e72ebd384ea5e27a62f8452e7a458f9 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Tue, 7 Apr 2026 06:31:49 -0400 Subject: [PATCH] import CS jss-5.9.0-2.el10 --- .gitignore | 2 +- jss.spec | 85 +++++++++++++++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 70 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index b59841b..133701d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -jss-5.8.0-beta2.tar.gz +jss-5.9.0.tar.gz diff --git a/jss.spec b/jss.spec index d8ee105..434fdea 100644 --- a/jss.spec +++ b/jss.spec @@ -7,19 +7,23 @@ Name: jss # Upstream version number: %global major_version 5 -%global minor_version 8 +%global minor_version 9 %global update_version 0 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 0.2 +%global release_number 2 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%global phase beta2 +#global phase beta2 + +%if 0%{?rhel} && 0%{?rhel} >= 9 +%global enable_nss_version_pqc_def_flag -DENABLE_NSS_VERSION_PQC_DEF=ON +%endif %undefine timestamp %undefine commit_id @@ -101,8 +105,8 @@ BuildRequires: zip BuildRequires: unzip BuildRequires: gcc-c++ -BuildRequires: nss-devel >= 3.101 -BuildRequires: nss-tools >= 3.101 +BuildRequires: nss-devel >= 3.112 +BuildRequires: nss-tools >= 3.112 BuildRequires: %{java_devel} BuildRequires: %{maven_local} @@ -121,7 +125,7 @@ This only works with gcj. Other JREs require that JCE providers be signed. Summary: Java Security Services (JSS) -Requires: nss >= 3.101 +Requires: nss >= 3.112 Requires: %{java_headless} Requires: mvn(org.apache.commons:commons-lang3) @@ -149,14 +153,28 @@ 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 +%if 0%{?rhel} && 0%{?rhel} >= 10 +BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.36 +BuildRequires: mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.36 +BuildRequires: mvn(org.apache.tomcat:tomcat-juli) >= 10.1.36 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) >= 10.1.36 +Requires: mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.36 +Requires: mvn(org.apache.tomcat:tomcat-juli) >= 10.1.36 + +%else + +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 + +Requires: %{product_id} = %{version}-%{release} +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 + +%endif # Tomcat JSS has been replaced with JSS Connector for Tomcat. # This will remove installed Tomcat JSS packages. @@ -242,6 +260,9 @@ This package provides test suite for JSS. # flatten-maven-plugin is not available in RPM %pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin + +%if 0%{?rhel} >= 10 +# # 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 @@ -250,6 +271,22 @@ This package provides test suite for JSS. %mvn_package org.dogtagpki.jss:jss-tomcat jss-tomcat %mvn_package org.dogtagpki.jss:jss-tomcat-10.1 jss-tomcat +%pom_disable_module tomcat-9.0 + +%else + +# specify Maven artifact locations +%mvn_file org.dogtagpki.jss:jss-tomcat jss/jss-tomcat +%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-9.0 jss-tomcat + +%pom_disable_module tomcat-10.1 + +%endif + ################################################################################ %build ################################################################################ @@ -310,10 +347,9 @@ 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} \ --without-java \ --without-javadoc \ %{!?with_tests:--without-tests} \ @@ -393,10 +429,25 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib ################################################################################ %changelog -* Fri Jul 18 2025 Red Hat PKI Team - 5.8.0-0.1.beta2 -- Rebase to JSS 5.8.0-beta2 +* Tue Mar 10 2026 Red Hat PKI Team - 5.9.0-2 +- Rebuilt for exception target + +* Fri Mar 06 2026 Red Hat PKI Team - 5.9.0-1 +- Rebase to JSS 5.9.0 +- Resolves: RHEL-150666 + +* Fri Feb 06 2026 Red Hat PKI Team - 5.9.0-1-beta2 +- Rebase to JSS 5.9.0-beta2 +- Resolves RHEL-143049: Add support to ML-DSA + +* Wed Jan 21 2026 Red Hat PKI Team - 5.9.0-1-beta1 +- Rebase to JSS 5.9.0-beta1 +- Resolves RHEL-143049: Add support to ML-DSA + +* Wed Aug 6 2025 Red Hat PKI Team - 5.7.0-2 +- Rebase to JSS 5.7.0 - 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 - 5.6.0-1 - Rebase to JSS 5.6.0 diff --git a/sources b/sources index d312dad..f086bc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-5.8.0-beta2.tar.gz) = 544ce14a9b729ca0dca1f9cbe818f167d45ecd6ebad0ff83f9e674656e309d1dd47e551abe23215d5cc350c4b66486ec35489cafc91966b64cd03188c4ed767e +SHA512 (jss-5.9.0.tar.gz) = 8d302b2056527f0eb01d3971e00c9bee3716d6f63fc1ca622e1b88799dbbbd557d53a2ca93e1cbebf7ca00045e6f4f15dcf61d66e958584f9492286724e65343