From d089145224d5e6f6e6ed07d4d21f9dd2c500b9e0 Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Mon, 14 Feb 2022 17:48:55 +0000 Subject: [PATCH] Rebase to PKI 11.1.0 --- .gitignore | 1 + dogtag-pki.spec | 65 +++++++++---------------------------------------- sources | 2 +- 3 files changed, 13 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 213d923..74a08b9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /pki-11.0.0-beta1.tar.gz /pki-11.0.0.tar.gz /pki-11.1.0-alpha2.tar.gz +/pki-11.1.0.tar.gz diff --git a/dogtag-pki.spec b/dogtag-pki.spec index 324ffca..3b66bf5 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -14,8 +14,8 @@ License: GPLv2 and LGPLv2 # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 11.1.0 -Release: 0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha2 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +#global _phase -alpha2 # To create a tarball from a version tag: # $ git archive \ @@ -64,13 +64,6 @@ ExcludeArch: i686 %define java_headless java-17-openjdk-headless %define java_home %{_jvmdir}/jre-17-openjdk -################################################################################ -# RESTEasy -################################################################################ - -%define jaxrs_api_jar /usr/share/java/jboss-jaxrs-2.0-api.jar -%define resteasy_lib /usr/share/java/resteasy - ################################################################################ # PKI ################################################################################ @@ -196,8 +189,8 @@ BuildRequires: python3-six BuildRequires: junit BuildRequires: jpackage-utils >= 0:1.7.5-10 BuildRequires: jss >= 5.1.0 -BuildRequires: tomcatjss >= 8.0.0 -BuildRequires: ldapjdk >= 5.0.0 +BuildRequires: tomcatjss >= 8.1.0 +BuildRequires: ldapjdk >= 5.1.0 BuildRequires: systemd-units @@ -263,6 +256,8 @@ to manage enterprise Public Key Infrastructure deployments. Summary: %{product_name} Package %endif +Obsoletes: pki-symkey < %{version} +Obsoletes: %{product_id}-pki-symkey < %{version} Obsoletes: pki-console < %{version} Obsoletes: pki-console-theme < %{version} Obsoletes: idm-console-framework < 2.0 @@ -311,29 +306,6 @@ to manage enterprise Public Key Infrastructure deployments. %endif %if %{with base} -################################################################################ -%package -n %{product_id}-symkey -################################################################################ - -Summary: %{product_name} Symmetric Key Package - -Obsoletes: pki-symkey < %{version}-%{release} -Provides: pki-symkey = %{version}-%{release} - -Requires: %{java_headless} -Requires: jpackage-utils >= 0:1.7.5-10 -Requires: jss >= 5.1.0 -Requires: nss >= 3.38.0 - -# Ensure we end up with a useful installation -Conflicts: pki-symkey < %{version} -Conflicts: pki-javadoc < %{version} -Conflicts: pki-server-theme < %{version} -Conflicts: %{product_id}-theme < %{version} - -%description -n %{product_id}-symkey -This package provides library for symmetric key operations. - ################################################################################ %package -n %{product_id}-base ################################################################################ @@ -350,7 +322,6 @@ Requires: python3-pki = %{version}-%{release} Requires(post): python3-pki = %{version}-%{release} # Ensure we end up with a useful installation -Conflicts: pki-symkey < %{version} Conflicts: pki-javadoc < %{version} Conflicts: pki-server-theme < %{version} Conflicts: %{product_id}-theme < %{version} @@ -410,7 +381,7 @@ Requires: slf4j Requires: slf4j-jdk14 Requires: jpackage-utils >= 0:1.7.5-10 Requires: jss >= 5.1.0 -Requires: ldapjdk >= 5.0.0 +Requires: ldapjdk >= 5.1.0 Requires: %{product_id}-base = %{version}-%{release} %if 0%{?rhel} && 0%{?rhel} <= 8 @@ -466,7 +437,6 @@ Requires: policycoreutils Requires: procps-ng Requires: openldap-clients Requires: openssl -Requires: %{product_id}-symkey = %{version}-%{release} Requires: %{product_id}-tools = %{version}-%{release} Requires: keyutils @@ -489,7 +459,7 @@ Requires: systemd Requires(post): systemd-units Requires(postun): systemd-units Requires(pre): shadow-utils -Requires: tomcatjss >= 8.0.0 +Requires: tomcatjss >= 8.1.0 # pki-healthcheck depends on the following library %if 0%{?rhel} @@ -728,7 +698,6 @@ Provides: pki-javadoc = %{version}-%{release} # Ensure we end up with a useful installation Conflicts: pki-base < %{version} -Conflicts: pki-symkey < %{version} Conflicts: pki-server-theme < %{version} Conflicts: %{product_id}-theme < %{version} @@ -777,7 +746,6 @@ Provides: %{product_id}-server-theme = %{version}-%{release} # Ensure we end up with a useful installation Conflicts: pki-base < %{version} -Conflicts: pki-symkey < %{version} Conflicts: pki-javadoc < %{version} %description -n %{product_id}-theme @@ -796,7 +764,6 @@ Provides: pki-console-theme = %{version}-%{release} # Ensure we end up with a useful installation Conflicts: pki-base < %{version} -Conflicts: pki-symkey < %{version} Conflicts: pki-server-theme < %{version} Conflicts: pki-javadoc < %{version} Conflicts: %{product_id}-theme < %{version} @@ -862,12 +829,9 @@ cd build -DP11_KIT_TRUST=/etc/alternatives/libnssckbi.so.%{_arch} \ -DJAVA_VERSION=${java_version} \ -DJAVA_HOME=%{java_home} \ - -DPKI_JAVA_PATH=%{java_home}/bin/java \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \ -DAPP_SERVER=$app_server \ - -DJAXRS_API_JAR=%{jaxrs_api_jar} \ - -DRESTEASY_LIB=%{resteasy_lib} \ -DNSS_DEFAULT_DB_TYPE=%{nss_default_db_type} \ -DBUILD_PKI_CORE:BOOL=ON \ -DPYTHON_EXECUTABLE=%{python_executable} \ @@ -947,7 +911,6 @@ ln -sf /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar %{buildroo %if %{with server} # Customize server common library links in /usr/share/pki/server/common/lib -ln -sf %{jaxrs_api_jar} %{buildroot}%{_datadir}/pki/server/common/lib/jboss-jaxrs-2.0-api.jar ln -sf /usr/share/java/jboss-logging/jboss-logging.jar %{buildroot}%{_datadir}/pki/server/common/lib/jboss-logging.jar %if 0%{?fedora} && 0%{?fedora} <= 34 ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar %{buildroot}%{_datadir}/pki/server/common/lib/jboss-annotations-api_1.2_spec.jar @@ -1028,14 +991,6 @@ fi %endif %if %{with base} -################################################################################ -%files -n %{product_id}-symkey -################################################################################ - -%license base/symkey/LICENSE -%{_jnidir}/symkey.jar -%{_libdir}/symkey/ - ################################################################################ %files -n %{product_id}-base ################################################################################ @@ -1296,7 +1251,6 @@ fi %{_bindir}/tpsclient %{_libdir}/tps/libtps.so -%{_libdir}/tps/libtokendb.so # with tps %endif @@ -1368,6 +1322,9 @@ fi ################################################################################ %changelog +* Mon Feb 14 2022 Dogtag PKI Team - 11.1.0-1 +- Rebase to PKI 11.1.0 + * Sat Feb 05 2022 Jiri Vanek - 11.1.0-0.3.alpha2 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index 6cef4bf..a7b132f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pki-11.1.0-alpha2.tar.gz) = 96ed9f3043412bd861c93c906068c8533ebcc0c56ebf69ff67f8960ead55e3ba13e29125fb4be5eb5008ee57851e11ac8d78246820323a5077a384caa183f442 +SHA512 (pki-11.1.0.tar.gz) = 2edc28cbf5fe8a80d36bac400dccc9fd1d2fbb167ac7788075858e7af2e50c2a09388fdcd163f49dbb2e5414df8e692031be33a38ec163f31103c181a9b41b0f