diff --git a/.gitignore b/.gitignore index ad0c755..9ab1ed6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pki-11.6.0.tar.gz +SOURCES/pki-11.7.0.tar.gz diff --git a/.pki-core.metadata b/.pki-core.metadata index e6d15c9..eda3849 100644 --- a/.pki-core.metadata +++ b/.pki-core.metadata @@ -1 +1 @@ -062f983445c5eb266ef464ba48c3231faab391a0 SOURCES/pki-11.6.0.tar.gz +af3d1f0b0fd03a72d49cca7e96b1ff444e7a036f SOURCES/pki-11.7.0.tar.gz diff --git a/SPECS/pki-core.spec b/SPECS/pki-core.spec index 3aed847..fb93ba4 100644 --- a/SPECS/pki-core.spec +++ b/SPECS/pki-core.spec @@ -9,19 +9,19 @@ Name: pki-core # Upstream version number: %global major_version 11 -%global minor_version 6 +%global minor_version 7 %global update_version 0 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 3 +%global release_number 1 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -#global phase +%undefine phase %undefine timestamp %undefine commit_id @@ -71,6 +71,7 @@ ExcludeArch: i686 %if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9 +%define java_runtime java-17-openjdk %define java_devel java-17-openjdk-devel %define java_headless java-17-openjdk-headless %define java_home %{_jvmdir}/jre-17-openjdk @@ -78,6 +79,7 @@ ExcludeArch: i686 %else +%define java_runtime java-21-openjdk %define java_devel java-21-openjdk-devel %define java_headless java-21-openjdk-headless %define java_home %{_jvmdir}/jre-21-openjdk @@ -176,12 +178,12 @@ fi; ################################################################################ BuildRequires: make -BuildRequires: cmake >= 3.0.2 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: zip BuildRequires: nspr-devel -BuildRequires: nss-devel >= 3.36.1 +BuildRequires: nss-devel >= 3.101 BuildRequires: openldap-devel BuildRequires: pkgconfig @@ -238,8 +240,12 @@ BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) >= 9.0.62 BuildRequires: mvn(org.apache.tomcat:tomcat-jaspic-api) >= 9.0.62 BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) >= 9.0.62 -BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 -BuildRequires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.6.0 +%if 0%{?rhel} && 0%{?rhel} >= 10 +BuildRequires: tomcat9-lib +%endif + +BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.7 +BuildRequires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.7 BuildRequires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.6.0 # Python build dependencies @@ -480,7 +486,7 @@ BuildArch: noarch Obsoletes: pki-base < %{version}-%{release} Provides: pki-base = %{version}-%{release} -Requires: nss >= 3.36.1 +Requires: nss >= 3.101 Requires: python3-pki = %{version}-%{release} Requires(post): python3-pki = %{version}-%{release} @@ -580,7 +586,7 @@ Provides: bundled(resteasy-client) Provides: bundled(resteasy-jackson2-provider) %endif -Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 +Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.7 Requires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.6.0 Requires: %{product_id}-base = %{version}-%{release} @@ -597,7 +603,7 @@ Obsoletes: pki-tools < %{version}-%{release} Provides: pki-tools = %{version}-%{release} Requires: openldap-clients -Requires: nss-tools >= 3.36.1 +Requires: nss-tools >= 3.101 Requires: %{product_id}-java = %{version}-%{release} Requires: p11-kit-trust Requires: file @@ -653,8 +659,12 @@ Requires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) Provides: bundled(resteasy-servlet-initializer) %endif +%if 0%{?rhel} && 0%{?rhel} >= 10 +Requires: tomcat9 >= 1:9.0.62 +%else Requires: tomcat >= 1:9.0.62 -Requires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.6.0 +%endif +Requires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.7 Requires: systemd Requires(post): systemd-units @@ -675,12 +685,12 @@ Conflicts: ipa-server < 4.7.1 Conflicts: freeipa-server < 4.7.1 %endif -Provides: bundled(js-backbone) = 1.4.0 +Provides: bundled(js-backbone) = 1.6.0 Provides: bundled(js-bootstrap) = 3.4.1 -Provides: bundled(js-jquery) = 3.5.1 +Provides: bundled(js-jquery) = 3.7.1 Provides: bundled(js-jquery-i18n-properties) = 1.2.7 Provides: bundled(js-patternfly) = 3.59.2 -Provides: bundled(js-underscore) = 1.9.2 +Provides: bundled(js-underscore) = 1.13.7 %description -n %{product_id}-server This package provides libraries and utilities needed by %{product_name} services. @@ -880,7 +890,7 @@ Requires(postun): systemd-units # additional runtime requirements needed to run native 'tpsclient' # REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app -Requires: nss-tools >= 3.36.1 +Requires: nss-tools >= 3.101 Requires: openldap-clients %description -n %{product_id}-tps @@ -935,6 +945,7 @@ BuildArch: noarch Obsoletes: pki-console < %{version}-%{release} Provides: pki-console = %{version}-%{release} +Requires: %{java_runtime} Requires: %{product_id}-java = %{version}-%{release} Requires: %{product_id}-console-theme = %{version}-%{release} @@ -1343,6 +1354,22 @@ pkgs=base\ %if %{with maven} # install Java binaries %mvn_install + +# Normally JAR files are installed in /usr/share/java/pki. +# Since pki-tools.jar uses JNI Maven might install it in +# /usr/lib/java/pki or /usr/share/java/pki depending on the +# build environment. +find %{buildroot} -name "*.jar" + +# Create link to ensure pki-tools.jar is available at both locations. +if [ -e %{buildroot}%{_jnidir}/pki/pki-tools.jar ]; then + ln -sf ../../../..%{_jnidir}/pki/pki-tools.jar %{buildroot}%{_javadir}/pki +else + mkdir -p %{buildroot}%{_jnidir}/pki + ln -sf ../../../..%{_javadir}/pki/pki-tools.jar %{buildroot}%{_jnidir}/pki +fi + +# with maven %endif # install PKI console, Javadoc, and native binaries @@ -1723,6 +1750,7 @@ fi %{_bindir}/TokenInfo %{_datadir}/pki/tools/ %{_datadir}/pki/lib/p11-kit-trust.so +%{_libdir}/libpki-tps.so %{_mandir}/man1/AtoB.1.gz %{_mandir}/man1/AuditVerify.1.gz %{_mandir}/man1/BtoA.1.gz @@ -1753,10 +1781,8 @@ fi %{_mandir}/man1/PKCS10Client.1.gz %{_mandir}/man1/PKICertImport.1.gz %{_mandir}/man1/tpsclient.1.gz - -%if %{without maven} -%{_datadir}/java/pki/pki-tools.jar -%endif +%{_javadir}/pki/pki-tools.jar +%{_jnidir}/pki/pki-tools.jar # with base %endif @@ -2008,6 +2034,12 @@ fi ################################################################################ %changelog +* Tue Aug 05 2025 Red Hat PKI Team - 11.7.0-1 +- Rebase to PKI 11.7.0 + +* Tue Jul 01 2025 Red Hat PKI Team - 11.7.0-0.1.beta1 +- Rebase to PKI 11.7.0-beta1 + * Mon Feb 17 2025 Red Hat PKI Team - 11.6.0-3 - Drop pki-est subpackage