diff --git a/.gitignore b/.gitignore index 6baf089..ad0c755 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pki-11.5.1.tar.gz +SOURCES/pki-11.6.0.tar.gz diff --git a/.pki-core.metadata b/.pki-core.metadata index 93cab33..e6d15c9 100644 --- a/.pki-core.metadata +++ b/.pki-core.metadata @@ -1 +1 @@ -d7c0b18bd25d9ae00121f58544ea5dc840b18a8d SOURCES/pki-11.5.1.tar.gz +062f983445c5eb266ef464ba48c3231faab391a0 SOURCES/pki-11.6.0.tar.gz diff --git a/SPECS/pki-core.spec b/SPECS/pki-core.spec index 89ce2bb..3aed847 100644 --- a/SPECS/pki-core.spec +++ b/SPECS/pki-core.spec @@ -2,19 +2,20 @@ Name: pki-core ################################################################################ +# Note: This is required for IdM. Don't remove or merge upstream. %global product_name IDM PKI %global product_id idm-pki %undefine theme # Upstream version number: %global major_version 11 -%global minor_version 5 -%global update_version 1 +%global minor_version 6 +%global update_version 0 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 1 +%global release_number 3 # Development phase: # - development (unsupported): alpha where n >= 1 @@ -28,7 +29,7 @@ Name: pki-core Summary: %{product_name} Package URL: https://www.dogtagpki.org # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 -License: GPL-2.0-only and LGPL-2.0-only +License: GPL-2.0-only AND LGPL-2.0-only Version: %{major_version}.%{minor_version}.%{update_version} Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} @@ -63,25 +64,24 @@ ExcludeArch: i686 # Java ################################################################################ -%if 0%{?rhel} +# use Java 17 on Fedora 39 or older and RHEL 9 or older +# otherwise, use Java 21 + +# maven-local is a subpackage of javapackages-tools + +%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9 %define java_devel java-17-openjdk-devel %define java_headless java-17-openjdk-headless %define java_home %{_jvmdir}/jre-17-openjdk +%define maven_local maven-local-openjdk17 %else -# Use Java 21 on Fedora 40+, otherwise use Java 17. -%global java_devel java-devel >= 1:17 -%global java_headless java-headless >= 1:17 - -# Don't use find since it might not work well with local builds. -# find {_jvmdir} -maxdepth 1 | grep "jre-[0-9]\+$" -%global java_home %( - source /usr/share/java-utils/java-functions; - _prefer_jre=true; - set_jvm; - echo $JAVA_HOME) +%define java_devel java-21-openjdk-devel +%define java_headless java-21-openjdk-headless +%define java_home %{_jvmdir}/jre-21-openjdk +%define maven_local maven-local %endif @@ -95,18 +95,29 @@ ExcludeArch: i686 # PKI ################################################################################ -# Execute unit tests unless --without test is specified. -%bcond_without test +# Note: This is required for IdM. Don't remove or merge upstream. +# Use external build dependencies for IdM on RHEL 9 +%bcond_without build_deps + +# Use external runtime dependencies for IdM on RHEL 9 +%bcond_without runtime_deps + +# Build with Maven for IdM on RHEL 9 +%bcond_without maven + +# Don't execute unit tests for IdM on RHEL 9 +%bcond_with test # Build the package unless --without is specified. -# For idm-pki do not build the following packages: -# ocsp, tks, tps, javadoc, theme, tests, debug +# For IdM disable the following options: +# esc, est, ocsp, tks, tps, javadoc, theme, tests, debug %bcond_without base %bcond_without server %bcond_without acme %bcond_without ca -%bcond_without est +%bcond_with esc +%bcond_with est %bcond_without kra %bcond_with ocsp %bcond_with tks @@ -137,7 +148,10 @@ ExcludeArch: i686 %define pki_uid 17 %define pki_groupname pkiuser %define pki_gid 17 -%define pki_homedir /usr/share/pki + +# Create a home directory for PKI user at /home/pkiuser +# to store rootless Podman container. +%define pki_homedir /home/%{pki_username} %global saveFileContext() \ if [ -s /etc/selinux/config ]; then \ @@ -175,32 +189,58 @@ BuildRequires: policycoreutils # Java build dependencies BuildRequires: %{java_devel} -BuildRequires: maven-local +BuildRequires: %{maven_local} %if 0%{?fedora} BuildRequires: xmvn-tools %endif BuildRequires: javapackages-tools + +%if %{without runtime_deps} +BuildRequires: xmlstarlet +%endif + BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-net:commons-net) +BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(xml-apis:xml-apis) BuildRequires: mvn(xml-resolver:xml-resolver) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) + + +%if %{with build_deps} +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +BuildRequires: mvn(jakarta.annotation:jakarta.annotation-api) +BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api) + +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) +BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations) +BuildRequires: mvn(com.fasterxml.jackson.jaxrs:jackson-jaxrs-base) +BuildRequires: mvn(com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider) + +BuildRequires: mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec) +BuildRequires: mvn(org.jboss.logging:jboss-logging) + +BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs) BuildRequires: mvn(org.jboss.resteasy:resteasy-client) BuildRequires: mvn(org.jboss.resteasy:resteasy-jackson2-provider) -BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs) BuildRequires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) +%endif + BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62 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.5.0 -BuildRequires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.5.0 -BuildRequires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0 + +BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 +BuildRequires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.6.0 +BuildRequires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.6.0 # Python build dependencies BuildRequires: python3 >= 3.6 @@ -223,8 +263,6 @@ BuildRequires: apr-util-devel BuildRequires: cyrus-sasl-devel BuildRequires: httpd-devel >= 2.4.2 BuildRequires: systemd -BuildRequires: zlib -BuildRequires: zlib-devel # build dependency to build man pages BuildRequires: golang-github-cpuguy83-md2man @@ -272,7 +310,6 @@ Obsoletes: pki-symkey < %{version} Obsoletes: %{product_id}-symkey < %{version} Obsoletes: pki-console < %{version} Obsoletes: pki-console-theme < %{version} -Obsoletes: idm-console-framework < 2.0 %if %{with base} Requires: %{product_id}-base = %{version}-%{release} @@ -287,38 +324,92 @@ Requires: %{product_id}-server = %{version}-%{release} %if %{with acme} Requires: %{product_id}-acme = %{version}-%{release} +%else +Obsoletes: pki-acme < %{version} +Conflicts: pki-acme < %{version} + +Obsoletes: %{product_id}-acme < %{version} +Conflicts: %{product_id}-acme < %{version} %endif %if %{with ca} Requires: %{product_id}-ca = %{version}-%{release} +%else +Obsoletes: pki-ca < %{version} +Conflicts: pki-ca < %{version} + +Obsoletes: %{product_id}-ca < %{version} +Conflicts: %{product_id}-ca < %{version} %endif %if %{with est} Requires: %{product_id}-est = %{version}-%{release} +%else +Obsoletes: pki-est < %{version} +Conflicts: pki-est < %{version} + +Obsoletes: %{product_id}-est < %{version} +Conflicts: %{product_id}-est < %{version} %endif %if %{with kra} Requires: %{product_id}-kra = %{version}-%{release} +%else +Obsoletes: pki-kra < %{version} +Conflicts: pki-kra < %{version} + +Obsoletes: %{product_id}-kra < %{version} +Conflicts: %{product_id}-kra < %{version} %endif %if %{with ocsp} Requires: %{product_id}-ocsp = %{version}-%{release} +%else +Obsoletes: pki-ocsp < %{version} +Conflicts: pki-ocsp < %{version} + +Obsoletes: %{product_id}-ocsp < %{version} +Conflicts: %{product_id}-ocsp < %{version} %endif %if %{with tks} Requires: %{product_id}-tks = %{version}-%{release} +%else +Obsoletes: pki-tks < %{version} +Conflicts: pki-tks < %{version} + +Obsoletes: %{product_id}-tks < %{version} +Conflicts: %{product_id}-tks < %{version} %endif %if %{with tps} Requires: %{product_id}-tps = %{version}-%{release} +%else +Obsoletes: pki-tps < %{version} +Conflicts: pki-tps < %{version} + +Obsoletes: %{product_id}-tps < %{version} +Conflicts: %{product_id}-tps < %{version} %endif %if %{with javadoc} Requires: %{product_id}-javadoc = %{version}-%{release} +%else +Obsoletes: pki-javadoc < %{version} +Conflicts: pki-javadoc < %{version} + +Obsoletes: %{product_id}-javadoc < %{version} +Conflicts: %{product_id}-javadoc < %{version} %endif %if %{with console} Requires: %{product_id}-console = %{version}-%{release} +%else +Obsoletes: pki-console < %{version} +Conflicts: pki-console < %{version} + +Obsoletes: %{product_id}-console < %{version} +Conflicts: %{product_id}-console < %{version} %endif %if %{with theme} @@ -326,17 +417,33 @@ Requires: %{product_id}-theme = %{version}-%{release} %if %{with console} Requires: %{product_id}-console-theme = %{version}-%{release} %endif +%else +Obsoletes: pki-theme < %{version} +Conflicts: pki-theme < %{version} + +Obsoletes: %{product_id}-theme < %{version} +Conflicts: %{product_id}-theme < %{version} + +Obsoletes: pki-console-theme < %{version} +Conflicts: pki-console-theme < %{version} + +Obsoletes: %{product_id}-console-theme < %{version} +Conflicts: %{product_id}-console-theme < %{version} %endif %if %{with tests} Requires: %{product_id}-tests = %{version}-%{release} %endif +%if %{with esc} # Make certain that this 'meta' package requires the latest version(s) # of ALL PKI clients -- except for s390/s390x where 'esc' is not built -# and for idm-pki. %ifnarch s390 s390x -#Requires: esc >= 1.1.1 +Requires: esc >= 1.1.2 +%endif +%else +Obsoletes: esc <= 1.1.2 +Conflicts: esc <= 1.1.2 %endif # description for top-level package (unless there is a separate meta package) @@ -429,16 +536,52 @@ Requires: %{java_headless} Requires: mvn(commons-cli:commons-cli) Requires: mvn(commons-codec:commons-codec) Requires: mvn(commons-io:commons-io) -Requires: mvn(org.apache.commons:commons-lang3) Requires: mvn(commons-logging:commons-logging) Requires: mvn(commons-net:commons-net) +Requires: mvn(org.apache.commons:commons-lang3) +Requires: mvn(org.apache.httpcomponents:httpclient) Requires: mvn(org.slf4j:slf4j-api) Requires: mvn(org.slf4j:slf4j-jdk14) + +%if %{with runtime_deps} +Requires: mvn(jakarta.activation:jakarta.activation-api) +Requires: mvn(jakarta.annotation:jakarta.annotation-api) +Requires: mvn(jakarta.xml.bind:jakarta.xml.bind-api) + +Requires: mvn(com.fasterxml.jackson.core:jackson-annotations) +Requires: mvn(com.fasterxml.jackson.core:jackson-core) +Requires: mvn(com.fasterxml.jackson.core:jackson-databind) +Requires: mvn(com.fasterxml.jackson.jaxrs:jackson-jaxrs-base) +Requires: mvn(com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider) + +Requires: mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec) +Requires: mvn(org.jboss.logging:jboss-logging) + +Requires: mvn(org.jboss.resteasy:resteasy-jaxrs) Requires: mvn(org.jboss.resteasy:resteasy-client) Requires: mvn(org.jboss.resteasy:resteasy-jackson2-provider) -Requires: mvn(org.jboss.resteasy:resteasy-jaxrs) -Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 -Requires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0 +%else +Provides: bundled(jakarta-activation) +Provides: bundled(jakarta-annotations) +Provides: bundled(jaxb-api) + +Provides: bundled(jackson-annotations) +Provides: bundled(jackson-core) +Provides: bundled(jackson-databind) +Provides: bundled(jackson-modules-base) +Provides: bundled(jackson-jaxrs-providers) +Provides: bundled(jackson-jaxrs-json-provider) + +Provides: bundled(jboss-jaxrs-2.0-api) +Provides: bundled(jboss-logging) + +Provides: bundled(resteasy-jaxrs) +Provides: bundled(resteasy-client) +Provides: bundled(resteasy-jackson2-provider) +%endif + +Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 +Requires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.6.0 Requires: %{product_id}-base = %{version}-%{release} %description -n %{product_id}-java @@ -457,6 +600,7 @@ Requires: openldap-clients Requires: nss-tools >= 3.36.1 Requires: %{product_id}-java = %{version}-%{release} Requires: p11-kit-trust +Requires: file # PKICertImport depends on certutil and openssl Requires: nss-tools @@ -503,9 +647,14 @@ Requires: python3-policycoreutils Requires: selinux-policy-targeted >= 3.13.1-159 +%if %{with runtime_deps} Requires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) +%else +Provides: bundled(resteasy-servlet-initializer) +%endif + Requires: tomcat >= 1:9.0.62 -Requires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.5.0 +Requires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.6.0 Requires: systemd Requires(post): systemd-units @@ -783,15 +932,17 @@ This package provides %{product_name} API documentation. Summary: %{product_name} Console Package BuildArch: noarch -BuildRequires: mvn(org.dogtagpki.console-framework:console-framework) >= 2.1.0 - Obsoletes: pki-console < %{version}-%{release} Provides: pki-console = %{version}-%{release} -Requires: mvn(org.dogtagpki.console-framework:console-framework) >= 2.1.0 Requires: %{product_id}-java = %{version}-%{release} Requires: %{product_id}-console-theme = %{version}-%{release} +# IDM Console Framework has been merged into PKI Console. +# This will remove installed IDM Console Framework packages. +Obsoletes: idm-console-framework <= 2.1 +Conflicts: idm-console-framework <= 2.1 + %description -n %{product_id}-console %{product_name} Console is a Java application used to administer %{product_name} Server. @@ -812,7 +963,7 @@ Provides: pki-server-theme = %{version}-%{release} Obsoletes: %{product_id}-server-theme < %{version}-%{release} Provides: %{product_id}-server-theme = %{version}-%{release} -%if 0%{?fedora} > 38 +%if 0%{?fedora} > 38 || 0%{?rhel} > 9 BuildRequires: fontawesome4-fonts-web Requires: fontawesome4-fonts-web %else @@ -879,6 +1030,100 @@ This package provides test suite for %{product_name}. %autosetup -n pki-%{version}%{?phase:-}%{?phase} -p 1 +%if %{without runtime_deps} + +if [ ! -d base/common/lib ] +then + # import common libraries from RPMs + + mkdir -p base/common/lib + pushd base/common/lib + + JAKARTA_ACTIVATION_API_VERSION=$(rpm -q jakarta-activation | sed -n 's/^jakarta-activation-\([^-]*\)-.*$/\1/p') + echo "JAKARTA_ACTIVATION_API_VERSION: $JAKARTA_ACTIVATION_API_VERSION" + + cp /usr/share/java/jakarta-activation/jakarta.activation-api.jar \ + jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar + + JAKARTA_ANNOTATION_API_VERSION=$(rpm -q jakarta-annotations | sed -n 's/^jakarta-annotations-\([^-]*\)-.*$/\1/p') + echo "JAKARTA_ANNOTATION_API_VERSION: $JAKARTA_ANNOTATION_API_VERSION" + + cp /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar \ + jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar + + JAXB_API_VERSION=$(rpm -q jaxb-api | sed -n 's/^jaxb-api-\([^-]*\)-.*$/\1/p') + echo "JAXB_API_VERSION: $JAXB_API_VERSION" + + if [ -f /usr/share/java/jaxb-api.jar ] + then + cp /usr/share/java/jaxb-api.jar \ + jakarta.xml.bind-api-$JAXB_API_VERSION.jar + elif [ -f /usr/share/java/jaxb-api/jakarta.xml.bind-api.jar ] + then + cp /usr/share/java/jaxb-api/jakarta.xml.bind-api.jar \ + jakarta.xml.bind-api-$JAXB_API_VERSION.jar + fi + + JACKSON_VERSION=$(rpm -q jackson-annotations | sed -n 's/^jackson-annotations-\([^-]*\)-.*$/\1/p') + echo "JACKSON_VERSION: $JACKSON_VERSION" + + cp /usr/share/java/jackson-annotations.jar \ + jackson-annotations-$JACKSON_VERSION.jar + cp /usr/share/java/jackson-core.jar \ + jackson-core-$JACKSON_VERSION.jar + cp /usr/share/java/jackson-databind.jar \ + jackson-databind-$JACKSON_VERSION.jar + cp /usr/share/java/jackson-jaxrs-providers/jackson-jaxrs-base.jar \ + jackson-jaxrs-base-$JACKSON_VERSION.jar + cp /usr/share/java/jackson-jaxrs-providers/jackson-jaxrs-json-provider.jar \ + jackson-jaxrs-json-provider-$JACKSON_VERSION.jar + cp /usr/share/java/jackson-modules/jackson-module-jaxb-annotations.jar \ + jackson-module-jaxb-annotations-$JACKSON_VERSION.jar + + JAXRS_VERSION=$(rpm -q jboss-jaxrs-2.0-api | sed -n 's/^jboss-jaxrs-2.0-api-\([^-]*\)-.*$/\1.Final/p') + echo "JAXRS_VERSION: $JAXRS_VERSION" + + cp /usr/share/java/jboss-jaxrs-2.0-api.jar \ + jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar + + JBOSS_LOGGING_VERSION=$(rpm -q jboss-logging | sed -n 's/^jboss-logging-\([^-]*\)-.*$/\1.Final/p') + echo "JBOSS_LOGGING_VERSION: $JBOSS_LOGGING_VERSION" + + cp /usr/share/java/jboss-logging/jboss-logging.jar \ + jboss-logging-$JBOSS_LOGGING_VERSION.jar + + RESTEASY_VERSION=$(rpm -q pki-resteasy-core | sed -n 's/^pki-resteasy-core-\([^-]*\)-.*$/\1.Final/p') + echo "RESTEASY_VERSION: $RESTEASY_VERSION" + + cp /usr/share/java/resteasy/resteasy-jaxrs.jar \ + resteasy-jaxrs-$RESTEASY_VERSION.jar + cp /usr/share/java/resteasy/resteasy-client.jar \ + resteasy-client-$RESTEASY_VERSION.jar + cp /usr/share/java/resteasy/resteasy-jackson2-provider.jar \ + resteasy-jackson2-provider-$RESTEASY_VERSION.jar + + ls -l + popd +fi + +if [ ! -d base/server/lib ] +then + # import server libraries from RPMs + + mkdir -p base/server/lib + pushd base/server/lib + + RESTEASY_VERSION=$(rpm -q pki-resteasy-servlet-initializer | sed -n 's/^pki-resteasy-servlet-initializer-\([^-]*\)-.*$/\1.Final/p') + echo "RESTEASY_VERSION: $RESTEASY_VERSION" + + cp /usr/share/java/resteasy/resteasy-servlet-initializer.jar \ + resteasy-servlet-initializer-$RESTEASY_VERSION.jar + + ls -l + popd +fi +%endif + %if ! %{with base} %pom_disable_module common base %pom_disable_module tools base @@ -923,8 +1168,10 @@ This package provides test suite for %{product_name}. %pom_disable_module console base %endif -# flatten-maven-plugin is not available in RPM +# remove plugins not needed to build RPM %pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin +%pom_remove_plugin org.apache.maven.plugins:maven-deploy-plugin +%pom_remove_plugin com.github.github:site-maven-plugin # specify Maven artifact locations %mvn_file org.dogtagpki.pki:pki-common pki/pki-common @@ -964,6 +1211,16 @@ This package provides test suite for %{product_name}. %mvn_package org.dogtagpki.pki:pki-console pki-console %endif +%if 0%{?fedora} +# Create a sysusers.d config file + +cat > %{product_id}.sysusers.conf </dev/null || groupadd -f -g %{pki_gid} -r %{pki_groupname} + +# create PKI user if it doesn't exist if ! getent passwd %{pki_username} >/dev/null ; then useradd -r -u %{pki_uid} -g %{pki_groupname} -d %{pki_homedir} -s /sbin/nologin -c "Certificate System" %{pki_username} fi + +%endif + +# create PKI home directory if it doesn't exist +if [ ! -d %{pki_homedir} ] ; then + cp -ar /etc/skel %{pki_homedir} + chown -R %{pki_username}:%{pki_groupname} %{pki_homedir} + chmod 700 %{pki_homedir} + usermod -d %{pki_homedir} %{pki_username} +fi + exit 0 # with server @@ -1194,10 +1625,10 @@ fi %if %{with meta} %if "%{name}" != "%{product_id}" ################################################################################ -%files -n %{product_id} -f .mfiles +%files -n %{product_id} %{?with_maven:-f .mfiles} ################################################################################ %else -%files -f .mfiles +%files %{?with_maven:-f .mfiles} %endif %doc %{_datadir}/doc/pki/README @@ -1233,7 +1664,7 @@ fi %{_mandir}/man8/pki-upgrade.8.gz ################################################################################ -%files -n %{product_id}-java -f .mfiles-pki-java +%files -n %{product_id}-java %{?with_maven:-f .mfiles-pki-java} ################################################################################ %license base/common/LICENSE @@ -1241,6 +1672,10 @@ fi %{_datadir}/pki/examples/java/ %{_datadir}/pki/lib/*.jar +%if %{without maven} +%{_datadir}/java/pki/pki-common.jar +%endif + ################################################################################ %files -n python3-%{product_id} ################################################################################ @@ -1253,18 +1688,15 @@ fi %{python3_sitelib}/pki ################################################################################ -%files -n %{product_id}-tools -f .mfiles-pki-tools +%files -n %{product_id}-tools %{?with_maven:-f .mfiles-pki-tools} ################################################################################ %license base/tools/LICENSE %doc base/tools/doc/README -%{_bindir}/p12tool -%{_bindir}/p7tool %{_bindir}/pistool %{_bindir}/pki %{_bindir}/revoker %{_bindir}/setpin -%{_bindir}/sslget %{_bindir}/tkstool %{_bindir}/tpsclient %{_bindir}/AtoB @@ -1322,12 +1754,16 @@ fi %{_mandir}/man1/PKICertImport.1.gz %{_mandir}/man1/tpsclient.1.gz +%if %{without maven} +%{_datadir}/java/pki/pki-tools.jar +%endif + # with base %endif %if %{with server} ################################################################################ -%files -n %{product_id}-server -f .mfiles-pki-server +%files -n %{product_id}-server %{?with_maven:-f .mfiles-pki-server} ################################################################################ %license base/common/THIRD_PARTY_LICENSES @@ -1338,7 +1774,6 @@ fi %{_sbindir}/pkispawn %{_sbindir}/pkidestroy %{_sbindir}/pki-server -%{_sbindir}/pki-server-upgrade %{_sbindir}/pki-healthcheck %{python3_sitelib}/pki/server/ %{python3_sitelib}/pkihealthcheck-*.egg-info/ @@ -1380,77 +1815,110 @@ fi %{_mandir}/man8/pki-healthcheck.8.gz %{_datadir}/pki/setup/ %{_datadir}/pki/server/ +%if 0%{?fedora} +%{_sysusersdir}/%{product_id}.conf +%endif +%if %{without maven} +%{_datadir}/java/pki/pki-server.jar +%{_datadir}/java/pki/pki-server-webapp.jar +%{_datadir}/java/pki/pki-tomcat.jar +%{_datadir}/java/pki/pki-tomcat-9.0.jar +%endif # with server %endif %if %{with acme} ################################################################################ -%files -n %{product_id}-acme -f .mfiles-pki-acme +%files -n %{product_id}-acme %{?with_maven:-f .mfiles-pki-acme} ################################################################################ %{_datadir}/pki/acme/ +%if %{without maven} +%{_datadir}/java/pki/pki-acme.jar +%endif + # with acme %endif %if %{with ca} ################################################################################ -%files -n %{product_id}-ca -f .mfiles-pki-ca +%files -n %{product_id}-ca %{?with_maven:-f .mfiles-pki-ca} ################################################################################ %license base/ca/LICENSE %{_datadir}/pki/ca/ +%if %{without maven} +%{_datadir}/java/pki/pki-ca.jar +%endif + # with ca %endif %if %{with est} ################################################################################ -%files -n %{product_id}-est -f .mfiles-pki-est +%files -n %{product_id}-est %{?with_maven:-f .mfiles-pki-est} ################################################################################ %{_datadir}/pki/est/ +%if %{without maven} +%{_datadir}/java/pki/pki-est.jar +%endif + # with est %endif %if %{with kra} ################################################################################ -%files -n %{product_id}-kra -f .mfiles-pki-kra +%files -n %{product_id}-kra %{?with_maven:-f .mfiles-pki-kra} ################################################################################ %license base/kra/LICENSE %{_datadir}/pki/kra/ +%if %{without maven} +%{_datadir}/java/pki/pki-kra.jar +%endif + # with kra %endif %if %{with ocsp} ################################################################################ -%files -n %{product_id}-ocsp -f .mfiles-pki-ocsp +%files -n %{product_id}-ocsp %{?with_maven:-f .mfiles-pki-ocsp} ################################################################################ %license base/ocsp/LICENSE %{_datadir}/pki/ocsp/ +%if %{without maven} +%{_datadir}/java/pki/pki-ocsp.jar +%endif + # with ocsp %endif %if %{with tks} ################################################################################ -%files -n %{product_id}-tks -f .mfiles-pki-tks +%files -n %{product_id}-tks %{?with_maven:-f .mfiles-pki-tks} ################################################################################ %license base/tks/LICENSE %{_datadir}/pki/tks/ +%if %{without maven} +%{_datadir}/java/pki/pki-tks.jar +%endif + # with tks %endif %if %{with tps} ################################################################################ -%files -n %{product_id}-tps -f .mfiles-pki-tps +%files -n %{product_id}-tps %{?with_maven:-f .mfiles-pki-tps} ################################################################################ %license base/tps/LICENSE @@ -1458,6 +1926,10 @@ fi %{_mandir}/man5/pki-tps-connector.5.gz %{_mandir}/man5/pki-tps-profile.5.gz +%if %{without maven} +%{_datadir}/java/pki/pki-tps.jar +%endif + # with tps %endif @@ -1473,12 +1945,16 @@ fi %if %{with console} ################################################################################ -%files -n %{product_id}-console -f .mfiles-pki-console +%files -n %{product_id}-console %{?with_maven:-f .mfiles-pki-console} ################################################################################ %license base/console/LICENSE %{_bindir}/pkiconsole +%if %{without maven} +%{_datadir}/java/pki/pki-console.jar +%endif + # with console %endif @@ -1532,6 +2008,18 @@ fi ################################################################################ %changelog +* Mon Feb 17 2025 Red Hat PKI Team - 11.6.0-3 +- Drop pki-est subpackage + +* Mon Feb 17 2025 Red Hat PKI Team - 11.6.0-2 +- Use external runtime dependencies + +* Thu Feb 13 2025 Red Hat PKI Team - 11.6.0-1 +- Rebase to PKI 11.6.0 + +* Wed Dec 04 2024 Red Hat PKI Team - 11.6.0-0.2.alpha2 +- Rebase to PKI 11.6.0-alpha2 + * Fri Jun 21 2024 Red Hat PKI Team - 11.5.1-1 - Rebase to PKI 11.5.1