.gitignore

@@ -1 +1 @@
-SOURCES/jss-5.4.1.tar.gz
+SOURCES/jss-5.6.0-alpha1.tar.gz

.jss.metadata

@@ -1 +1 @@
-e5418bf90626b135ab43e0caefa04c4b1c6763fa SOURCES/jss-5.4.1.tar.gz
+ef06ea101952ff2b0dd8034bae02bda121dac355 SOURCES/jss-5.6.0-alpha1.tar.gz

SPECS/jss.spec

@@ -2,30 +2,31 @@
 Name:           jss
 ################################################################################
 
-%global         product_id idm-jss
+%global         vendor_id idm 
+%global         product_id %{vendor_id}-jss
 
 # Upstream version number:
 %global         major_version 5
-%global         minor_version 4
+%global         minor_version 6
-%global         update_version 1
+%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 2
+%global         release_number 0.1
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-#global         phase
+%global         phase alpha1
 
 %undefine       timestamp
 %undefine       commit_id
 
 Summary:        Java Security Services (JSS)
 URL:            https://github.com/dogtagpki/jss
-License:        MPLv1.1 or GPLv2+ or LGPLv2+
+License:        (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND Apache-2.0
 Version:        %{major_version}.%{minor_version}.%{update_version}
 Release:        %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
@@ -45,7 +46,7 @@ Source:         https://github.com/dogtagpki/jss/archive/v%{version}%{?phase:-}%
 #     > jss-VERSION-RELEASE.patch
 # Patch: jss-VERSION-RELEASE.patch
 
-%if 0%{?fedora} && 0%{?fedora} > 35
+%if 0%{?java_arches:1}
 ExclusiveArch: %{java_arches}
 %else
 ExcludeArch: i686
@@ -55,9 +56,9 @@ ExcludeArch: i686
 # Java
 ################################################################################
 
-%define java_devel java-17-openjdk-devel
+%define java_devel java-21-openjdk-devel
-%define java_headless java-17-openjdk-headless
+%define java_headless java-21-openjdk-headless
-%define java_home %{_jvmdir}/jre-17-openjdk
+%define java_home %{_jvmdir}/jre-21-openjdk
 
 ################################################################################
 # Build Options
@@ -71,7 +72,7 @@ ExcludeArch: i686
 # By default the build will not execute unit tests unless --with tests
 # option is specified.
 
-%bcond_with tests
+%bcond_without tests
 
 ################################################################################
 # Build Dependencies
@@ -118,7 +119,6 @@ Provides:       %{product_id} = %{major_version}.%{minor_version}
 
 Conflicts:      ldapjdk < 4.20
 Conflicts:      idm-console-framework < 1.2
-Conflicts:      tomcatjss < 7.6.0
 Conflicts:      pki-base < 10.10.0
 
 %description -n %{product_id}
@@ -126,6 +126,58 @@ Java Security Services (JSS) is a java native interface which provides a bridge
 for java-based applications to use native Network Security Services (NSS).
 This only works with gcj. Other JREs require that JCE providers be signed.
 
+################################################################################
+%package -n %{product_id}-tomcat
+################################################################################
+
+Summary:        Java Security Services (JSS) Connector for Tomcat
+
+# Tomcat
+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
+
+# Tomcat JSS has been replaced with JSS Connector for Tomcat.
+# This will remove installed Tomcat JSS packages.
+Obsoletes:      tomcatjss <= 8.5
+Conflicts:      tomcatjss <= 8.5
+Obsoletes:      idm-tomcatjss <= 8.5
+Conflicts:      idm-tomcatjss <= 8.5
+
+%if 0%{?rhel} <= 8
+# PKI Servlet Engine has been replaced with Tomcat.
+# This will remove installed PKI Servlet Engine packages.
+Obsoletes:      pki-servlet-engine <= 9.0
+Conflicts:      pki-servlet-engine <= 9.0
+%endif
+
+%description -n %{product_id}-tomcat
+JSS Connector for Tomcat is a Java Secure Socket Extension (JSSE)
+module for Apache Tomcat that uses Java Security Services (JSS),
+a Java interface to Network Security Services (NSS).
+
+################################################################################
+%package -n %{product_id}-tools
+################################################################################
+
+Summary:        Java Security Services (JSS) Tools
+
+Provides:       jss-tools = %{version}-%{release}
+Provides:       jss-tools = %{major_version}.%{minor_version}
+Provides:       %{product_id}-tools = %{major_version}.%{minor_version}
+
+# Some PKI tools have been moved into jss-tools.
+Conflicts:      pki-tools < 11.6
+Conflicts:      %{vendor_id}-pki-tools < 11.6
+
+%description -n %{product_id}-tools
+This package contains JSS tools.
+
 %if %{with javadoc}
 ################################################################################
 %package -n %{product_id}-javadoc
@@ -142,12 +194,46 @@ Provides:       %{product_id}-javadoc = %{major_version}.%{minor_version}
 This package contains the API documentation for JSS.
 %endif
 
+%if %{with tests}
+################################################################################
+%package -n %{product_id}-tests
+################################################################################
+
+Summary:        Java Security Services (JSS) Tests
+
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
+BuildRequires:  mvn(org.opentest4j:opentest4j)
+
+%description -n %{product_id}-tests
+This package provides test suite for JSS.
+
+# with tests
+%endif
+
 ################################################################################
 %prep
 ################################################################################
 
 %autosetup -n jss-%{version}%{?phase:-}%{?phase} -p 1
 
+# disable native modules since they will be built by CMake
+%pom_disable_module native
+%pom_disable_module symkey
+
+# do not ship examples
+%pom_disable_module examples
+
+# flatten-maven-plugin is not available in RPM
+%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
+
+# 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
+
 ################################################################################
 %build
 ################################################################################
@@ -168,6 +254,38 @@ export CFLAGS
 # Check if we're in FIPS mode
 modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENABLED=1
 
+# build Java code, run Java tests, and build Javadoc with Maven
+%mvn_build %{!?with_tests:-f} %{!?with_javadoc:-j}
+
+# create links to Maven-built classes for CMake
+mkdir -p %{_vpath_builddir}/classes/jss
+ln -sf ../../../base/target/classes/org %{_vpath_builddir}/classes/jss
+%if %{with tests}
+mkdir -p %{_vpath_builddir}/classes/tests
+ln -sf ../../../base/target/test-classes/org %{_vpath_builddir}/classes/tests
+%endif
+
+# create links to Maven-built JAR files for CMake
+ln -sf ../base/target/jss.jar %{_vpath_builddir}
+%if %{with tests}
+ln -sf ../base/target/jss-tests.jar %{_vpath_builddir}
+%endif
+
+# create links to Maven-built headers for CMake
+mkdir -p %{_vpath_builddir}/include/jss
+ln -sf ../../../base/target/include/_jni %{_vpath_builddir}/include/jss/_jni
+
+# mark Maven-built targets so that CMake will not rebuild them
+mkdir -p %{_vpath_builddir}/.targets
+touch %{_vpath_builddir}/.targets/finished_generate_java
+%if %{with tests}
+touch %{_vpath_builddir}/.targets/finished_tests_generate_java
+%endif
+%if %{with javadoc}
+touch %{_vpath_builddir}/.targets/finished_generate_javadocs
+%endif
+
+# build native code and run native tests with CMake
 ./build.sh \
     %{?_verbose:-v} \
     --work-dir=%{_vpath_builddir} \
@@ -180,95 +298,102 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
     --java-home=%{java_home} \
     --jni-dir=%{_jnidir} \
     --version=%{version} \
-    %{!?with_javadoc:--without-javadoc} \
+    --without-java \
-    %{?with_tests:--with-tests} \
+    --without-javadoc \
+    %{!?with_tests:--without-tests} \
     dist
 
 ################################################################################
 %install
 ################################################################################
 
+# install Java binaries and Javadoc
+%mvn_install
+
+# install jss.jar
+mkdir -p %{buildroot}%{_javadir}/jss
+cp base/target/jss.jar %{buildroot}%{_javadir}/jss/jss.jar
+
+# create links for backward compatibility
+mkdir -p %{buildroot}%{_jnidir}
+ln -sf ../../..%{_javadir}/jss/jss.jar %{buildroot}%{_jnidir}/jss.jar
+
+mkdir -p %{buildroot}%{_libdir}/jss
+ln -sf ../../..%{_javadir}/jss/jss.jar %{buildroot}%{_libdir}/jss/jss.jar
+
+# install native binaries
 ./build.sh \
     %{?_verbose:-v} \
     --work-dir=%{_vpath_builddir} \
     --install-dir=%{buildroot} \
+    --without-java \
     install
 
+# install tests binaries
+%if %{with tests}
+mkdir -p %{buildroot}%{_datadir}/jss/tests/lib
+cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
+%endif
+
 ################################################################################
-%files -n %{product_id}
+%files -n %{product_id} -f .mfiles
 ################################################################################
 
-%defattr(-,root,root,-)
 %doc jss.html
 %license MPL-1.1.txt gpl.txt lgpl.txt symkey/LICENSE
-%{_libdir}/*
+%{_javadir}/jss/jss.jar
-%{_jnidir}/*
+%{_jnidir}/jss.jar
+%{_libdir}/jss/jss.jar
+%{_libdir}/jss/libjss.so
+%{_libdir}/jss/libjss-symkey.so
 
-%if %{with javadoc}
 ################################################################################
-%files -n %{product_id}-javadoc
+%files -n %{product_id}-tomcat -f .mfiles-jss-tomcat
 ################################################################################
 
-%defattr(-,root,root,-)
-%{_javadocdir}/jss/
-%endif
-
 ################################################################################
-%changelog
+%files -n %{product_id}-tools
-* Wed May 31 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.4.1-1
+################################################################################
-- Rebase to JSS 5.4.1
-
-* Thu Feb 09 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-1
-- Rebase to JSS 5.3.0
-
-* Thu Jan 05 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-0.3.beta2
-- Rebase to JSS 5.3.0-beta2
-- Bug 2017098 - pki pkcs12-cert-add command failing with 'Unable to validate PKCS #12 file: Digests do not match' exception
-
-* Wed Nov 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-0.2.beta1
-- Rebase to JSS 5.3.0-beta1
-
-* Fri Sep 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.1-1
-- Rebase to JSS 5.2.1
-- Bug 2100807 - pki-tomcat/kra unable to decrypt when using RSA-OAEP padding in RHEL9 with FIPS enabled
-
-* Wed Jun 29 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-1
-- Rebase to JSS 5.2.0
 
-* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.3.beta2
+%{_bindir}/p12tool
-- Rebase to JSS 5.2.0-beta2
+%{_bindir}/p7tool
-- Rename packages to idm-jss
+%{_bindir}/sslget
 
-* Wed Apr 13 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.2.beta1
+%if %{with javadoc}
-- Rebase to JSS 5.2.0-beta1
+################################################################################
+%files -n %{product_id}-javadoc -f .mfiles-javadoc
+################################################################################
+%endif
 
-* Tue Feb 15 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.3-1
+%if %{with tests}
-- Rebase to JSS 5.0.3
+################################################################################
-- Bug 2046023 - CVE-2021-4213 jss: memory leak in TLS connection leads to OOM [rhel-9.0]
+%files -n %{product_id}-tests
+################################################################################
 
-* Wed Feb 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.2-1
+%{_datadir}/jss/tests/
-- Rebase to JSS 5.0.2
-- Bug 2029838 - SHA1withRSA being listed in signing certificates while approving certificate via Agent page in browser
 
-* Fri Nov 19 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.1-1
+# with tests
-- Rebase to JSS 5.0.1
+%endif
 
-* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-1
+################################################################################
-- Rebase to JSS 5.0.0
+%changelog
+* Thu Dec 05 2024 Troy Dawson <tdawson@redhat.com> - 5.6.0-alpha1
+- Rebase to JSS 5.6.0-alpha1
 
-* Thu Sep 16 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.5.beta1
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.5.0-3.1
-- Rebase to JSS 5.0.0-beta1
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Thu Sep 09 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.4.alpha1
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 5.5.0-3
-- Drop BuildRequires and Requires on glassfish-jaxb-api
+- Rebuilt for MSVSphere 10
-  Resolves #2002576
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.0.0-0.3.alpha1
+* Wed Aug 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 5.5.0-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt with java-21-openjdk as default JDK:
-  Related: rhbz#1991688
+  https://issues.redhat.com/browse/RHEL-34597
+- Resolves: RHEL-54331
 
-* Mon Aug  2 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.2
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.5.0-2.1
-- Drop javadoc package
+- Bump release for June 2024 mass rebuild
 
-* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.1
+* Fri May 10 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 5.5.0-2
-- Rebase to JSS 5.0.0-alpha1
+- Rebase to JSS 5.5.0