diff --git a/.gitignore b/.gitignore index b74ebcf..530c2f1 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ jss-4.2.6.tar.gz /jss-5.8.0-beta2.tar.gz /jss-5.7.0-beta2.tar.gz /jss-5.7.0.tar.gz +/jss-5.9.0-beta1.tar.gz diff --git a/jss.spec b/jss.spec index 235ee1e..6e2d4b7 100644 --- a/jss.spec +++ b/jss.spec @@ -7,19 +7,19 @@ Name: jss # Upstream version number: %global major_version 5 -%global minor_version 7 +%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 2 +%global release_number 1 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%undefine phase +%global phase beta1 %if 0%{?rhel} && 0%{?rhel} >= 9 %global enable_nss_version_pqc_def_flag -DENABLE_NSS_VERSION_PQC_DEF=ON @@ -105,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} @@ -125,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) @@ -153,19 +153,27 @@ This only works with gcj. Other JREs require that JCE providers be signed. Summary: Java Security Services (JSS) Connector for Tomcat # Tomcat +%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.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 -%if 0%{?rhel} && 0%{?rhel} >= 10 -BuildRequires: tomcat9-lib -%endif 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 -%if 0%{?rhel} && 0%{?rhel} >= 10 -Requires: tomcat9 >= 1:9.0.62 + %endif # Tomcat JSS has been replaced with JSS Connector for Tomcat. @@ -252,6 +260,21 @@ 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 + +# specify Maven artifact packages +%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 @@ -260,6 +283,10 @@ This package provides test suite for JSS. %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 ################################################################################ @@ -323,7 +350,6 @@ touch %{_vpath_builddir}/.targets/finished_generate_javadocs --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} \ @@ -403,6 +429,10 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib ################################################################################ %changelog +* 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] diff --git a/sources b/sources index 594c48a..02a27e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-5.7.0.tar.gz) = 00062ebda25b50cd09db59f7bb1343bc4a25f5d5ceec46b734032d2da6004d8b1fb05f529dccbfe36d922cf8ad8b8695ba721eac3de214fb6ffcd881be44a2f1 +SHA512 (jss-5.9.0-beta1.tar.gz) = 45b2af3648172020203e6f12373d540f02a3a88db024969b4699d7023f46ff025cd1017a9ceadf177db1f022f025f08321c124f07ddf233f9384bdb32a04c75f