diff --git a/.gitignore b/.gitignore index 2788d0e..871155e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pki-10.7.3.tar.gz +SOURCES/pki-10.8.3.tar.gz diff --git a/.pki-core.metadata b/.pki-core.metadata index 905e4e3..f535287 100644 --- a/.pki-core.metadata +++ b/.pki-core.metadata @@ -1 +1 @@ -871e3785e7cf1866fa43aabc07a9aa46bb72bb3c SOURCES/pki-10.7.3.tar.gz +2c1da3b7d4e5d43a5be3f5f7efd527768e93b94a SOURCES/pki-10.8.3.tar.gz diff --git a/SOURCES/0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch b/SOURCES/0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch deleted file mode 100644 index ef430f0..0000000 --- a/SOURCES/0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d57b32e2b4e0f7aa43f8f38e7ce539da6e0e93d7 Mon Sep 17 00:00:00 2001 -From: Dinesh Prasanth M K -Date: Wed, 14 Aug 2019 17:36:38 -0400 -Subject: [PATCH] Fix URL redirection for KRA and OCSP web UI (#241) - -Fixes changes introduced via commit: 2210c2a - -Signed-off-by: Dinesh Prasanth M K ---- - base/kra/shared/webapps/kra/services.template | 2 +- - base/ocsp/shared/webapps/ocsp/services.template | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/kra/shared/webapps/kra/services.template b/base/kra/shared/webapps/kra/services.template -index 941fb5277..930b41345 100644 ---- a/base/kra/shared/webapps/kra/services.template -+++ b/base/kra/shared/webapps/kra/services.template -@@ -106,7 +106,7 @@ Certificate System DRM Services Page - - - --
  • SSL End Users Services -+
  • Agent Services - - - -diff --git a/base/ocsp/shared/webapps/ocsp/services.template b/base/ocsp/shared/webapps/ocsp/services.template -index c1c2839bb..5cc662845 100644 ---- a/base/ocsp/shared/webapps/ocsp/services.template -+++ b/base/ocsp/shared/webapps/ocsp/services.template -@@ -106,7 +106,7 @@ Certificate System OCSP Services Page - - - --
  • SSL End Users Services -+
  • Agent Services - - - --- -2.21.0 - diff --git a/SOURCES/0001-Removed-dependency-on-pytest-runner.patch b/SOURCES/0001-Removed-dependency-on-pytest-runner.patch new file mode 100644 index 0000000..5d5c1b1 --- /dev/null +++ b/SOURCES/0001-Removed-dependency-on-pytest-runner.patch @@ -0,0 +1,23 @@ +From ab8b87af09b26c3c7ec257e0fb8e5ae931153120 Mon Sep 17 00:00:00 2001 +From: "Endi S. Dewata" +Date: Sat, 8 Feb 2020 21:56:41 -0600 +Subject: [PATCH] Removed dependency on pytest-runner + +--- + base/server/healthcheck/setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/base/server/healthcheck/setup.py b/base/server/healthcheck/setup.py +index 22db8bd0f..c629e34c0 100644 +--- a/base/server/healthcheck/setup.py ++++ b/base/server/healthcheck/setup.py +@@ -32,6 +32,5 @@ setup( + 'Programming Language :: Python :: 3.6', + ], + python_requires='!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*', +- setup_requires=['pytest-runner'], + tests_require=['pytest'], + ) +-- +2.21.0 + diff --git a/SPECS/pki-core.spec b/SPECS/pki-core.spec index 51889b1..5299d5f 100644 --- a/SPECS/pki-core.spec +++ b/SPECS/pki-core.spec @@ -5,14 +5,14 @@ Name: pki-core %global vendor_id redhat %global brand Red Hat -Summary: PKI Core Package +Summary: %{brand} PKI Core Package URL: http://www.dogtagpki.org/ # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPLv2 and LGPLv2 -Version: 10.7.3 +Version: 10.8.3 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} -# global _phase -a1 +# global _phase -a1 # To create a tarball from a version tag: # $ git archive \ @@ -28,48 +28,22 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver # \ # > pki-VERSION-RELEASE.patch # Patch: pki-VERSION-RELEASE.patch - -Patch1: 0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch +Patch1: 0001-Removed-dependency-on-pytest-runner.patch ################################################################################ # NSS ################################################################################ -%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27 -%global nss_default_db_type dbm -%else %global nss_default_db_type sql -%endif ################################################################################ # Python ################################################################################ -# Python 2 packages -%if 0%{!?with_python2:1} -%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 28 -%global with_python2 1 -%else -# no python2 -%endif -%endif - -# Python 3 packages -%if 0%{!?with_python3:1} -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no python3 +%if 0%{?rhel} +%global python_executable /usr/libexec/platform-python %else -%global with_python3 1 -%endif -%endif - -# Use Python 3 for all commands? -%if 0%{!?with_python3_default:1} -%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27 -%global with_python3_default 0 -%else -%global with_python3_default 1 -%endif +%global python_executable /usr/bin/python3 %endif ################################################################################ @@ -82,13 +56,8 @@ Patch1: 0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch # RESTEasy ################################################################################ -%if 0%{?rhel} && 0%{?rhel} <= 7 -%define jaxrs_api_jar /usr/share/java/resteasy-base/jaxrs-api.jar -%define resteasy_lib /usr/share/java/resteasy-base -%else %define jaxrs_api_jar /usr/share/java/jboss-jaxrs-2.0-api.jar %define resteasy_lib /usr/share/java/resteasy -%endif ################################################################################ # PKI @@ -116,7 +85,7 @@ Patch1: 0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch %define package_option() %bcond_with %1 %else %define package_option() %bcond_without %1 -%endif # with pkgs +%endif # Define --with or --without options depending on # package selection method. @@ -141,14 +110,17 @@ Patch1: 0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch %if ! %{with debug} %define debug_package %{nil} -%endif # with debug +%endif # ignore unpackaged files from native 'tpsclient' # REMINDER: Remove this '%%define' once 'tpsclient' is rewritten as a Java app %define _unpackaged_files_terminate_build 0 -# pkiuser and group. The uid and gid are preallocated -# see /usr/share/doc/setup/uidgid +# The PKI UID and GID are preallocated, see: +# https://bugzilla.redhat.com/show_bug.cgi?id=476316 +# https://bugzilla.redhat.com/show_bug.cgi?id=476782 +# https://pagure.io/setup/blob/master/f/uidgid +# /usr/share/doc/setup/uidgid %define pki_username pkiuser %define pki_uid 17 %define pki_groupname pkiuser @@ -194,11 +166,7 @@ BuildRequires: apache-commons-lang BuildRequires: jakarta-commons-httpclient BuildRequires: glassfish-jaxb-api BuildRequires: slf4j -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no slf4j-jdk14 -%else BuildRequires: slf4j-jdk14 -%endif BuildRequires: nspr-devel BuildRequires: nss-devel >= 3.36.1 @@ -206,37 +174,15 @@ BuildRequires: openldap-devel BuildRequires: pkgconfig BuildRequires: policycoreutils -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python-lxml -BuildRequires: python-sphinx -%else -%if 0%{?fedora} && 0%{?fedora} <= 28 -BuildRequires: python2-lxml -BuildRequires: python2-sphinx -%else BuildRequires: python3-lxml BuildRequires: python3-sphinx -%endif -%endif BuildRequires: velocity BuildRequires: xalan-j2 BuildRequires: xerces-j2 %if 0%{?rhel} -%if 0%{?rhel} <= 7 -# 'resteasy-base' is a subset of the complete set of -# 'resteasy' packages and consists of what is needed to -# support the PKI Restful interface on certain RHEL platforms -BuildRequires: resteasy-base-atom-provider >= 3.0.6-1 -BuildRequires: resteasy-base-client >= 3.0.6-1 -BuildRequires: resteasy-base-jaxb-provider >= 3.0.6-1 -BuildRequires: resteasy-base-jaxrs >= 3.0.6-1 -BuildRequires: resteasy-base-jaxrs-api >= 3.0.6-1 -BuildRequires: resteasy-base-jackson-provider >= 3.0.6-1 -%else BuildRequires: resteasy >= 3.0.26 -%endif %else BuildRequires: jboss-annotations-1.2-api BuildRequires: jboss-jaxrs-2.0-api @@ -248,22 +194,6 @@ BuildRequires: resteasy-core >= 3.0.17-1 BuildRequires: resteasy-jackson2-provider >= 3.0.17-1 %endif -%if 0%{?with_python2} -%if 0%{?rhel} -# no pylint -%else -BuildRequires: pylint -%if 0%{?fedora} && 0%{?fedora} <= 27 -BuildRequires: python-flake8 >= 2.5.4 -BuildRequires: pyflakes >= 1.2.3 -%else -BuildRequires: python2-flake8 >= 2.5.4 -BuildRequires: python2-pyflakes >= 1.2.3 -%endif -%endif -%endif # with_python2 - -%if 0%{?with_python3} %if 0%{?rhel} # no pylint %else @@ -271,79 +201,34 @@ BuildRequires: python3-pylint BuildRequires: python3-flake8 >= 2.5.4 BuildRequires: python3-pyflakes >= 1.2.3 %endif -%endif # with_python3 - -%if 0%{?with_python2} -BuildRequires: python2 -BuildRequires: python2-devel -BuildRequires: python2-cryptography -%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27 -BuildRequires: python-nss -BuildRequires: python-requests >= 2.6.0 -BuildRequires: python-six -BuildRequires: libselinux-python -BuildRequires: policycoreutils-python -BuildRequires: python-ldap -%else -BuildRequires: python2-nss -BuildRequires: python2-requests >= 2.6.0 -BuildRequires: python2-six -BuildRequires: python2-libselinux -BuildRequires: python2-policycoreutils -BuildRequires: python2-ldap -%endif -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no policycoreutils-python-utils -%else -BuildRequires: policycoreutils-python-utils -%endif -%endif # with_python2 -%if 0%{?with_python3} -BuildRequires: python3 +BuildRequires: python3 >= 3.5 BuildRequires: python3-devel BuildRequires: python3-cryptography BuildRequires: python3-lxml -%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27 -BuildRequires: python3-pyldap -# no python3-libselinux -%else BuildRequires: python3-ldap BuildRequires: python3-libselinux -%endif BuildRequires: python3-nss BuildRequires: python3-requests >= 2.6.0 BuildRequires: python3-six -%endif # with_python3 + +%if 0%{?rhel} +# no python3-pytest-runner +%else +BuildRequires: python3-pytest-runner +%endif BuildRequires: junit BuildRequires: jpackage-utils >= 0:1.7.5-10 -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: jss >= 4.4.0-11 -BuildRequires: tomcatjss >= 7.2.1-4 -%else -BuildRequires: jss >= 4.6.0-4 +BuildRequires: jss >= 4.6.0 BuildRequires: tomcatjss >= 7.4.1 -%endif BuildRequires: systemd-units -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: tomcat >= 7.0.69 -%else -%if 0%{?fedora} && 0%{?fedora} <= 27 -BuildRequires: tomcat >= 8.0.49 -%else -%if 0%{?fedora} && 0%{?fedora} <= 28 -BuildRequires: tomcat >= 1:8.5.23 -%else %if 0%{?rhel} BuildRequires: pki-servlet-engine %else BuildRequires: tomcat >= 1:9.0.7 %endif -%endif -%endif -%endif # additional build requirements needed to build native 'tpsclient' # REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app @@ -363,6 +248,13 @@ BuildRequires: go-md2man BuildRequires: golang-github-cpuguy83-md2man %endif +# pki-healthcheck depends on the following library +%if 0%{?rhel} +BuildRequires: ipa-healthcheck-core +%else +BuildRequires: freeipa-healthcheck-core +%endif + # PKICertImport depends on certutil and openssl BuildRequires: nss-tools BuildRequires: openssl @@ -413,11 +305,7 @@ Requires: pki-javadoc = %{version} # Make certain that this 'meta' package requires the latest version(s) # of ALL PKI clients -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: esc >= 1.1.0 -%else Requires: esc >= 1.1.1 -%endif # description for top-level package (unless there is a separate meta package) %if "%{name}" == "%{vendor_id}-pki" @@ -437,7 +325,8 @@ PKI consists of the following components: * Token Key Service (TKS) * Token Processing Service (TPS) -%endif # with meta +# with meta +%endif %if %{with base} ################################################################################ @@ -448,11 +337,7 @@ Summary: PKI Symmetric Key Package Requires: java-1.8.0-openjdk-headless Requires: jpackage-utils >= 0:1.7.5-10 -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: jss >= 4.4.0-11 -%else -Requires: jss >= 4.6.0-4 -%endif +Requires: jss >= 4.6.0 Requires: nss >= 3.38.0 # Ensure we end up with a useful installation @@ -473,13 +358,9 @@ Summary: PKI Base Package BuildArch: noarch Requires: nss >= 3.36.1 -%if 0%{?with_python3_default} + Requires: python3-pki = %{version} Requires(post): python3-pki = %{version} -%else -Requires: python2-pki = %{version} -Requires(post): python2-pki = %{version} -%endif # with_python3_default # Ensure we end up with a useful installation Conflicts: pki-symkey < %{version} @@ -491,38 +372,6 @@ Conflicts: pki-console-theme < %{version} The PKI Base Package contains the common and client libraries and utilities written in Python. -%if 0%{?with_python2} -################################################################################ -%package -n python2-pki -################################################################################ - -Summary: PKI Python 2 Package -BuildArch: noarch - -Obsoletes: pki-base-python2 < %{version} -Provides: pki-base-python2 = %{version} -%if 0%{?fedora} -%{?python_provide:%python_provide python2-pki} -%endif - -Requires: pki-base = %{version} -Requires: python2-cryptography -%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27 -Requires: python-nss -Requires: python-requests >= 2.6.0 -Requires: python-six -%else -Requires: python2-nss -Requires: python2-requests >= 2.6.0 -Requires: python2-six -%endif - -%description -n python2-pki -This package contains PKI client library for Python 2. - -%endif # with_python2 - -%if 0%{?with_python3} ################################################################################ %package -n python3-pki ################################################################################ @@ -537,6 +386,7 @@ Provides: pki-base-python3 = %{version} %endif Requires: pki-base = %{version} +Requires: python3 >= 3.5 Requires: python3-cryptography Requires: python3-lxml Requires: python3-nss @@ -546,8 +396,6 @@ Requires: python3-six %description -n python3-pki This package contains PKI client library for Python 3. -%endif # with_python3 for python3-pki - ################################################################################ %package -n pki-base-java ################################################################################ @@ -564,34 +412,14 @@ Requires: apache-commons-logging Requires: jakarta-commons-httpclient Requires: glassfish-jaxb-api Requires: slf4j -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no slf4j-jdk14 -%else Requires: slf4j-jdk14 -%endif Requires: jpackage-utils >= 0:1.7.5-10 -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: jss >= 4.4.0-11 -%else -Requires: jss >= 4.6.0-4 -%endif +Requires: jss >= 4.6.0 Requires: ldapjdk >= 4.21.0 Requires: pki-base = %{version} %if 0%{?rhel} -%if 0%{?rhel} <= 7 -# 'resteasy-base' is a subset of the complete set of -# 'resteasy' packages and consists of what is needed to -# support the PKI Restful interface on certain RHEL platforms -Requires: resteasy-base-atom-provider >= 3.0.6-1 -Requires: resteasy-base-client >= 3.0.6-1 -Requires: resteasy-base-jaxb-provider >= 3.0.6-1 -Requires: resteasy-base-jaxrs >= 3.0.6-1 -Requires: resteasy-base-jaxrs-api >= 3.0.6-1 -Requires: resteasy-base-jackson-provider >= 3.0.6-1 -%else Requires: resteasy >= 3.0.26 -%endif %else Requires: resteasy-atom-provider >= 3.0.17-1 Requires: resteasy-client >= 3.0.17-1 @@ -618,6 +446,7 @@ Summary: PKI Tools Package Requires: openldap-clients Requires: nss-tools >= 3.36.1 Requires: pki-base-java = %{version} +Requires: p11-kit-trust # PKICertImport depends on certutil and openssl Requires: nss-tools @@ -627,7 +456,8 @@ Requires: openssl This package contains PKI executables that can be used to help make Certificate System into a more complete and robust PKI solution. -%endif # with base +# with base +%endif %if %{with server} ################################################################################ @@ -643,74 +473,39 @@ Requires: net-tools Requires: policycoreutils Requires: procps-ng Requires: openldap-clients -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: openssl >= 1.0.2k-11 -%else Requires: openssl -%endif Requires: pki-symkey = %{version} Requires: pki-tools = %{version} Requires: keyutils -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no policycoreutils-python-utils -%else Requires: policycoreutils-python-utils -%endif -%if 0%{?with_python3_default} -%if 0%{?fedora} && 0%{?fedora} <= 27 -Requires: python3-pyldap -%else Requires: python3-ldap -%endif Requires: python3-lxml Requires: python3-libselinux Requires: python3-policycoreutils -%else -%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27 -Requires: python-ldap -Requires: python-lxml -Requires: libselinux-python -Requires: policycoreutils-python -%else -Requires: python2-ldap -Requires: python2-lxml -Requires: python2-libselinux -Requires: python2-policycoreutils -%endif -%endif # with_python3_default Requires: selinux-policy-targeted >= 3.13.1-159 -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: tomcat >= 7.0.69 -%else -%if 0%{?fedora} && 0%{?fedora} <= 27 -Requires: tomcat >= 8.0.49 -%else -%if 0%{?fedora} && 0%{?fedora} <= 28 -Requires: tomcat >= 1:8.5.23 -%else %if 0%{?rhel} Requires: pki-servlet-engine >= 1:9.0.7 %else Requires: tomcat >= 1:9.0.7 %endif -%endif -%endif -%endif Requires: velocity Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires(pre): shadow-utils -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: tomcatjss >= 7.2.1-4 -%else Requires: tomcatjss >= 7.4.1 + +# pki-healthcheck depends on the following library +%if 0%{?rhel} +Requires: ipa-healthcheck-core +%else +Requires: freeipa-healthcheck-core %endif # https://pagure.io/freeipa/issue/7742 @@ -730,7 +525,8 @@ following PKI subsystems: the Token Key Service (TKS), and the Token Processing Service (TPS). -%endif # with server +# with server +%endif %if %{with ca} ################################################################################ @@ -754,7 +550,8 @@ The Certificate Authority can be configured as a self-signing Certificate Authority, where it is the root CA, or it can act as a subordinate CA, where it obtains its own signing certificate from a public CA. -%endif # with ca +# with ca +%endif %if %{with kra} ################################################################################ @@ -784,7 +581,8 @@ protection of the public encryption keys for the users in the PKI deployment. Note that the KRA archives encryption keys; it does NOT archive signing keys, since such archival would undermine non-repudiation properties of signing keys. -%endif # with kra +# with kra +%endif %if %{with ocsp} ################################################################################ @@ -821,7 +619,8 @@ When an instance of OCSP Manager is set up with an instance of CA, and publishing is set up to this OCSP Manager, CRLs are published to it whenever they are issued or updated. -%endif # with ocsp +# with ocsp +%endif %if %{with tks} ################################################################################ @@ -852,7 +651,8 @@ TKS. Tokens with older keys will get new token keys. Because of the sensitivity of the data that TKS manages, TKS should be set up behind the firewall with restricted access. -%endif # with tks +# with tks +%endif %if %{with tps} ################################################################################ @@ -892,7 +692,8 @@ The utility "tpsclient" is a test tool that interacts with TPS. This tool is useful to test TPS server configs without risking an actual smart card. -%endif # with tps +# with tps +%endif %if %{with javadoc} ################################################################################ @@ -911,7 +712,8 @@ Conflicts: pki-console-theme < %{version} %description -n pki-javadoc This package contains PKI API documentation. -%endif # with javadoc +# with javadoc +%endif %if %{with console} ################################################################################ @@ -930,7 +732,8 @@ Requires: pki-console-theme = %{version} %description -n pki-console The PKI Console is a Java application used to administer PKI server. -%endif # with console +# with console +%endif %if %{with theme} ################################################################################ @@ -971,7 +774,8 @@ Conflicts: pki-javadoc < %{version} This PKI Console Theme Package contains %{brand} textual and graphical user interface for PKI Console. -%endif # with theme +# with theme +%endif ################################################################################ %prep @@ -998,6 +802,7 @@ cd build --no-warn-unused-cli \ -DVERSION=%{version}-%{release} \ -DVAR_INSTALL_DIR:PATH=/var \ + -DP11_KIT_TRUST=/etc/alternatives/libnssckbi.so.%{_arch} \ -DJAVA_HOME=%{java_home} \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \ @@ -1006,12 +811,7 @@ cd build -DRESTEASY_LIB=%{resteasy_lib} \ -DNSS_DEFAULT_DB_TYPE=%{nss_default_db_type} \ -DBUILD_PKI_CORE:BOOL=ON \ - -DWITH_PYTHON2:BOOL=%{?with_python2:ON}%{!?with_python2:OFF} \ - -DWITH_PYTHON3:BOOL=%{?with_python3:ON}%{!?with_python3:OFF} \ -%if 0%{?with_python3_default} - -DWITH_PYTHON3_DEFAULT:BOOL=ON \ -%endif - -DPYTHON_EXECUTABLE=%{__python3} \ + -DPYTHON_EXECUTABLE=%{python_executable} \ -DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \ %if ! %{with server} && ! %{with ca} && ! %{with kra} && ! %{with ocsp} && ! %{with tks} && ! %{with tps} -DWITH_SERVER:BOOL=OFF \ @@ -1047,96 +847,20 @@ cat > %{buildroot}%{_datadir}/doc/pki/README << EOF This package is a "meta-package" whose dependencies pull in all of the packages comprising the %{brand} Public Key Infrastructure (PKI) Suite. EOF -%endif # with meta - -# Customize system upgrade scripts in /usr/share/pki/upgrade -%if 0%{?rhel} && 0%{?rhel} <= 7 -# merge newer upgrade scripts into 10.3.3 for RHEL -/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.3.4 -/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.3.5 - -# merge newer upgrade scripts into 10.4.1 for RHEL -/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.2 -/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.3 -/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.4 -/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.5 -/bin/rm -rf %{buildroot}%{_datadir}/pki/upgrade/10.4.6 +# with meta %endif # Customize client library links in /usr/share/pki/lib -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no link customization -%else - ln -sf /usr/share/java/jboss-logging/jboss-logging.jar %{buildroot}%{_datadir}/pki/lib/jboss-logging.jar - ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar %{buildroot}%{_datadir}/pki/lib/jboss-annotations-api_1.2_spec.jar -%endif +ln -sf /usr/share/java/jboss-logging/jboss-logging.jar %{buildroot}%{_datadir}/pki/lib/jboss-logging.jar +ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar %{buildroot}%{_datadir}/pki/lib/jboss-annotations-api_1.2_spec.jar %if %{with server} -# Customize server upgrade scripts in /usr/share/pki/server/upgrade -%if 0%{?rhel} && 0%{?rhel} <= 7 - -# merge newer upgrade scripts into 10.3.3 for RHEL -mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/01-FixServerLibrary \ - %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/02-FixServerLibrary -mv %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5/02-FixDeploymentDescriptor \ - %{buildroot}%{_datadir}/pki/server/upgrade/10.3.3/03-FixDeploymentDescriptor -/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.3.4 -/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.3.5 - -# merge newer upgrade scripts into 10.4.1 for RHEL -mv %{buildroot}%{_datadir}/pki/server/upgrade/10.4.2/01-AddSessionAuthenticationPlugin \ - %{buildroot}%{_datadir}/pki/server/upgrade/10.4.1/01-AddSessionAuthenticationPlugin -mv %{buildroot}%{_datadir}/pki/server/upgrade/10.4.2/02-AddKRAWrappingParams \ - %{buildroot}%{_datadir}/pki/server/upgrade/10.4.1/02-AddKRAWrappingParams -mv %{buildroot}%{_datadir}/pki/server/upgrade/10.4.6/01-UpdateKeepAliveTimeout \ - %{buildroot}%{_datadir}/pki/server/upgrade/10.4.1/03-UpdateKeepAliveTimeout -/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.2 -/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.3 -/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.4 -/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.5 -/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.4.6 - -# merge newer upgrade script into 10.5.1 for RHEL -mv %{buildroot}%{_datadir}/pki/server/upgrade/10.5.5/01-AddTPSExternalRegISEtokenParams \ - %{buildroot}%{_datadir}/pki/server/upgrade/10.5.1/01-AddTPSExternalRegISEtokenParams - -/bin/rm -rf %{buildroot}%{_datadir}/pki/server/upgrade/10.5.5 - -%endif - # Customize server common library links in /usr/share/pki/server/common/lib -%if 0%{?fedora} || 0%{?rhel} > 7 - 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 - 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 - -%else - -if [ -f /etc/debian_version ]; then - ln -sf /usr/share/java/commons-collections3.jar %{buildroot}%{_datadir}/pki/server/common/lib/commons-collections.jar - ln -sf /usr/share/java/httpclient.jar %{buildroot}%{_datadir}/pki/server/common/lib/httpclient.jar - ln -sf /usr/share/java/httpcore.jar %{buildroot}%{_datadir}/pki/server/common/lib/httpcore.jar - ln -sf /usr/share/java/jackson-core-asl.jar %{buildroot}%{_datadir}/pki/server/common/lib/jackson-core-asl.jar - ln -sf /usr/share/java/jackson-jaxrs.jar %{buildroot}%{_datadir}/pki/server/common/lib/jackson-jaxrs.jar - ln -sf /usr/share/java/jackson-mapper-asl.jar %{buildroot}%{_datadir}/pki/server/common/lib/jackson-mapper-asl.jar - ln -sf /usr/share/java/jackson-mrbean.jar %{buildroot}%{_datadir}/pki/server/common/lib/jackson-mrbean.jar - ln -sf /usr/share/java/jackson-smile.jar %{buildroot}%{_datadir}/pki/server/common/lib/jackson-smile.jar - ln -sf /usr/share/java/jackson-xc.jar %{buildroot}%{_datadir}/pki/server/common/lib/jackson-xc.jar - ln -sf /usr/share/java/jss4.jar %{buildroot}%{_datadir}/pki/server/common/lib/jss4.jar - ln -sf /usr/share/java/symkey.jar %{buildroot}%{_datadir}/pki/server/common/lib/symkey.jar - ln -sf /usr/share/java/xercesImpl.jar %{buildroot}%{_datadir}/pki/server/common/lib/xerces-j2.jar - ln -sf /usr/share/java/xml-apis.jar %{buildroot}%{_datadir}/pki/server/common/lib/xml-commons-apis.jar - ln -sf /usr/share/java/xml-resolver.jar %{buildroot}%{_datadir}/pki/server/common/lib/xml-commons-resolver.jar -fi - -%endif - -# Customize server library links in /usr/share/pki/server/lib -%if 0%{?rhel} && 0%{?rhel} <= 7 - rm -f %{buildroot}%{_datadir}/pki/server/lib/slf4j-jdk14.jar -%endif +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 +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 %if 0%{?rhel} # no pylint @@ -1146,97 +870,38 @@ fi echo "Scanning Python code with pylint" ################################################################################ -%if 0%{?with_python3_default} -%{__python3} ../tools/pylint-build-scan.py rpm --prefix %{buildroot} +%{python_executable} -I ../tools/pylint-build-scan.py rpm --prefix %{buildroot} if [ $? -ne 0 ]; then echo "pylint for Python 3 failed. RC: $?" exit 1 fi -%else -%{__python2} ../tools/pylint-build-scan.py rpm --prefix %{buildroot} -if [ $? -ne 0 ]; then - echo "pylint for Python 2 failed. RC: $?" - exit 1 -fi - -%{__python2} ../tools/pylint-build-scan.py rpm --prefix %{buildroot} -- --py3k -if [ $? -ne 0 ]; then - echo "pylint for Python 2 with --py3k failed. RC: $?" - exit 1 -fi -%endif # with_python3_default ################################################################################ echo "Scanning Python code with flake8" ################################################################################ -%if 0%{?with_python2} -flake8 --config ../tox.ini %{buildroot} -if [ $? -ne 0 ]; then - echo "flake8 for Python 2 failed. RC: $?" - exit 1 -fi -%endif # with_python2 - -%if 0%{?with_python3} python3-flake8 --config ../tox.ini %{buildroot} if [ $? -ne 0 ]; then echo "flake8 for Python 3 failed. RC: $?" exit 1 fi -%endif # with_python3 %endif -%endif # with server - -%if %{with base} - -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no upgrade check -%else -%pretrans -n pki-base -p -function test(a) - if posix.stat(a) then - for f in posix.files(a) do - if f~=".." and f~="." then - return true - end - end - end - return false -end - -if (test("/etc/sysconfig/pki/ca") or - test("/etc/sysconfig/pki/kra") or - test("/etc/sysconfig/pki/ocsp") or - test("/etc/sysconfig/pki/tks")) then - msg = "Unable to upgrade to Fedora 20. There are PKI 9 instances\n" .. - "that will no longer work since they require Tomcat 6, and \n" .. - "Tomcat 6 is no longer available in Fedora 20.\n\n" .. - "Please follow these instructions to migrate the instances to \n" .. - "PKI 10:\n\n" .. - "http://www.dogtagpki.org/wiki/Migrating_PKI_9_Instances_to_PKI_10" - error(msg) -end +# with server %endif -%endif # with base - %if %{with server} %pre -n pki-server getent group %{pki_groupname} >/dev/null || groupadd -f -g %{pki_gid} -r %{pki_groupname} if ! getent passwd %{pki_username} >/dev/null ; then - if ! getent passwd %{pki_uid} >/dev/null ; then - useradd -r -u %{pki_uid} -g %{pki_groupname} -d %{pki_homedir} -s /sbin/nologin -c "Certificate System" %{pki_username} - else - useradd -r -g %{pki_groupname} -d %{pki_homedir} -s /sbin/nologin -c "Certificate System" %{pki_username} - fi + useradd -r -u %{pki_uid} -g %{pki_groupname} -d %{pki_homedir} -s /sbin/nologin -c "Certificate System" %{pki_username} fi exit 0 -%endif # with server +# with server +%endif %if %{with base} @@ -1262,7 +927,8 @@ then rm -f %{_sysconfdir}/pki/pki.version fi -%endif # with base +# with base +%endif %if %{with server} @@ -1292,7 +958,8 @@ fi ## from EITHER 'sysVinit' OR previous 'systemd' processes to the new ## PKI deployment process -%endif # with server +# with server +%endif %if %{with meta} %if "%{name}" != "%{vendor_id}-pki" @@ -1305,7 +972,8 @@ fi %doc %{_datadir}/doc/pki/README -%endif # with meta +# with meta +%endif %if %{with base} ################################################################################ @@ -1325,9 +993,11 @@ fi %doc %{_datadir}/doc/pki-base/html %dir %{_datadir}/pki %{_datadir}/pki/VERSION +%{_datadir}/pki/pom.xml %dir %{_datadir}/pki/etc %{_datadir}/pki/etc/pki.conf %{_datadir}/pki/etc/logging.properties +%dir %{_datadir}/pki/lib %dir %{_datadir}/pki/scripts %{_datadir}/pki/scripts/config %{_datadir}/pki/upgrade/ @@ -1340,19 +1010,6 @@ fi %{_mandir}/man5/pki-logging.5.gz %{_mandir}/man8/pki-upgrade.8.gz -%if 0%{?with_python2} -################################################################################ -%files -n python2-pki -################################################################################ - -%doc base/common/LICENSE -%doc base/common/LICENSE.LESSER -%if %{with server} && ! %{?with_python3_default} -%exclude %{python2_sitelib}/pki/server -%endif -%{python2_sitelib}/pki -%endif # with_python2 - ################################################################################ %files -n pki-base-java ################################################################################ @@ -1360,32 +1017,31 @@ fi %doc base/common/LICENSE %doc base/common/LICENSE.LESSER %{_datadir}/pki/examples/java/ -%{_datadir}/pki/lib/ +%{_datadir}/pki/lib/*.jar %dir %{_javadir}/pki %{_javadir}/pki/pki-cmsutil.jar %{_javadir}/pki/pki-nsutil.jar %{_javadir}/pki/pki-certsrv.jar -%if 0%{?with_python3} ################################################################################ %files -n python3-pki ################################################################################ %doc base/common/LICENSE %doc base/common/LICENSE.LESSER -%if %{with server} && %{?with_python3_default} +%if %{with server} %exclude %{python3_sitelib}/pki/server %endif %{python3_sitelib}/pki -%endif # with_python3 ################################################################################ %files -n pki-tools ################################################################################ %doc base/native-tools/LICENSE base/native-tools/doc/README -%{_bindir}/pki %{_bindir}/p7tool +%{_bindir}/pistool +%{_bindir}/pki %{_bindir}/revoker %{_bindir}/setpin %{_bindir}/sslget @@ -1416,6 +1072,7 @@ fi %{_bindir}/TokenInfo %{_javadir}/pki/pki-tools.jar %{_datadir}/pki/java-tools/ +%{_datadir}/pki/lib/p11-kit-trust.so %{_mandir}/man1/AtoB.1.gz %{_mandir}/man1/AuditVerify.1.gz %{_mandir}/man1/BtoA.1.gz @@ -1447,7 +1104,8 @@ fi %{_mandir}/man1/PKCS10Client.1.gz %{_mandir}/man1/PKICertImport.1.gz -%endif # with base +# with base +%endif %if %{with server} ################################################################################ @@ -1463,11 +1121,11 @@ fi %{_sbindir}/pkidestroy %{_sbindir}/pki-server %{_sbindir}/pki-server-upgrade -%if 0%{?with_python3_default} %{python3_sitelib}/pki/server/ -%else -%{python2_sitelib}/pki/server/ -%endif # with_python3_default +%{_sbindir}/pki-healthcheck +%{python3_sitelib}/pki/server/healthcheck/ +%{python3_sitelib}/pkihealthcheck-*.egg-info/ +%config(noreplace) %{_sysconfdir}/pki/healthcheck.conf %{_datadir}/pki/etc/tomcat.conf %dir %{_datadir}/pki/deployment @@ -1483,7 +1141,6 @@ fi %attr(644,-,-) %{_unitdir}/pki-tomcatd-nuxwdog.target %{_javadir}/pki/pki-cms.jar %{_javadir}/pki/pki-cmsbundle.jar -%{_javadir}/pki/pki-cmscore.jar %{_javadir}/pki/pki-tomcat.jar %dir %{_sharedstatedir}/pki %{_mandir}/man1/pkidaemon.1.gz @@ -1503,10 +1160,14 @@ fi %{_mandir}/man8/pki-server-ocsp.8.gz %{_mandir}/man8/pki-server-tks.8.gz %{_mandir}/man8/pki-server-tps.8.gz +%{_mandir}/man8/pki-healthcheck.8.gz %{_datadir}/pki/setup/ %{_datadir}/pki/server/ +%{_datadir}/pki/acme/ +%{_javadir}/pki/pki-acme.jar -%endif # with server +# with server +%endif %if %{with ca} ################################################################################ @@ -1518,12 +1179,12 @@ fi %dir %{_datadir}/pki/ca %{_datadir}/pki/ca/conf/ %{_datadir}/pki/ca/emails/ -%dir %{_datadir}/pki/ca/profiles -%{_datadir}/pki/ca/profiles/ca/ +%{_datadir}/pki/ca/profiles/ %{_datadir}/pki/ca/setup/ %{_datadir}/pki/ca/webapps/ -%endif # with ca +# with ca +%endif %if %{with kra} ################################################################################ @@ -1537,7 +1198,8 @@ fi %{_datadir}/pki/kra/setup/ %{_datadir}/pki/kra/webapps/ -%endif # with kra +# with kra +%endif %if %{with ocsp} ################################################################################ @@ -1551,7 +1213,8 @@ fi %{_datadir}/pki/ocsp/setup/ %{_datadir}/pki/ocsp/webapps/ -%endif # with ocsp +# with ocsp +%endif %if %{with tks} ################################################################################ @@ -1565,7 +1228,8 @@ fi %{_datadir}/pki/tks/setup/ %{_datadir}/pki/tks/webapps/ -%endif # with tks +# with tks +%endif %if %{with tps} ################################################################################ @@ -1590,7 +1254,8 @@ fi %{_libdir}/tps/libtps.so %{_libdir}/tps/libtokendb.so -%endif # with tps +# with tps +%endif %if %{with javadoc} ################################################################################ @@ -1599,7 +1264,8 @@ fi %{_javadocdir}/pki-%{version}/ -%endif # with javadoc +# with javadoc +%endif %if %{with console} ################################################################################ @@ -1610,7 +1276,8 @@ fi %{_bindir}/pkiconsole %{_javadir}/pki/pki-console.jar -%endif # with console +# with console +%endif %if %{with theme} ################################################################################ @@ -1638,122 +1305,157 @@ fi %doc themes/%{vendor_id}/console-ui/LICENSE %{_javadir}/pki/pki-console-theme.jar -%endif # with theme +# with theme +%endif ################################################################################ %changelog -* Wed Aug 14 2019 Red Hat PKI Team - 10.7.3-1 +* Tue Mar 03 2020 Red Hat PKI Team 10.8.3-1 +- Rebased to PKI 10.8.3 +- Bug #1809210 - TPS installation failure on HSM machine +- Bug #1807421 - Subordinate CA installation failed +- Bug #1806840 - KRA cloning with HSM failed + +* Wed Feb 19 2020 Red Hat PKI Team 10.8.2-2 +- Bug #1795215 - pkispawn interactive installation failed + +* Mon Feb 17 2020 Red Hat PKI Team 10.8.2-1 +- Rebased to PKI 10.8.2 +- Bug #1802006 - KRA installation failed to create ECC admin cert + +* Mon Feb 10 2020 Red Hat PKI Team 10.8.1-1 +- Rebased to PKI 10.8.1 + +* Fri Feb 07 2020 Red Hat PKI Team 10.8.0-1 +- Rebased to PKI 10.8.0 + +* Thu Jan 16 2020 Red Hat PKI Team 10.8.0-0.5 +- Rebased to PKI 10.8.0-b3 + +* Fri Dec 13 2019 Red Hat PKI Team 10.8.0-0.4 +- Rebased to PKI 10.8.0-b2 + +* Wed Dec 11 2019 Red Hat PKI Team 10.8.0-0.3 +- Rebased to PKI 10.8.0-b1 + +* Fri Nov 22 2019 Red Hat PKI Team 10.8.0-0.2 +- Rebased to PKI 10.8.0-a2 + +* Thu Oct 31 2019 Red Hat PKI Team 10.8.0-0.1 +- Rebased to PKI 10.8.0-a1 + +* Wed Aug 14 2019 Red Hat PKI Team 10.7.3-1 - Rebased to PKI 10.7.3 - Bug #1698084 - pkidestroy not working as expected - Bug #1468050 and Bug #1448235 - Support AES for LWCA key replication -* Tue Jul 23 2019 Red Hat PKI Team - 10.7.2-1 +* Tue Jul 23 2019 Red Hat PKI Team 10.7.2-1 - Rebased to PKI 10.7.2 - Bug #1721340 - TPS installation failure - Bug #1248216 - Incorrect pkidaemon status - Bug #1729215 - cert-fix: detect and prevent pkidbuser being used as --agent-uid - Bug #1698059 - pki-core implements crypto -* Thu Jun 13 2019 Red Hat PKI Team - 10.7.1-2 +* Thu Jun 13 2019 Red Hat PKI Team 10.7.1-2 - Fixed cloning issue - Fixed TPS installation issue -* Wed Jun 12 2019 Red Hat PKI Team - 10.7.1-1 +* Wed Jun 12 2019 Red Hat PKI Team 10.7.1-1 - Rebased to PKI 10.7.1 -* Wed Apr 24 2019 Red Hat PKI Team - 10.7.0-1 +* Wed Apr 24 2019 Red Hat PKI Team 10.7.0-1 - Rebased to PKI 10.7.0 -* Mon Jan 28 2019 Red Hat PKI Team - 10.6.9-2 +* Mon Jan 28 2019 Red Hat PKI Team 10.6.9-2 - Bug #1652269 - Replace Nuxwdog -* Mon Jan 14 2019 Red Hat PKI Team - 10.6.9-1 +* Mon Jan 14 2019 Red Hat PKI Team 10.6.9-1 - Rebased to PKI 10.6.9 - Bug #1629048 - X500Name.directoryStringEncodingOrder overridden by CSR encoding - Bug #1652269 - Replace Nuxwdog - Bug #1656856 - Need Method to Include SKI in CA Signing Certificate Request -* Thu Nov 29 2018 Red Hat PKI Team - 10.6.8-1 +* Thu Nov 29 2018 Red Hat PKI Team 10.6.8-1 - Rebased to PKI 10.6.8 - Bug #1602659 - Fix issues found by covscan - Bug #1566360 - Fix missing serial number from pki-server subsystem-cert-find -* Fri Oct 26 2018 Red Hat PKI Team - 10.6.7-3 +* Fri Oct 26 2018 Red Hat PKI Team 10.6.7-3 - Bug #1643101 - Fix problems due to token normalization -* Tue Oct 23 2018 Red Hat PKI Team - 10.6.7-2 +* Tue Oct 23 2018 Red Hat PKI Team 10.6.7-2 - Bug #1623444 - Fix Python KeyClient KeyRequestResponse parsing -* Fri Oct 05 2018 Red Hat PKI Team - 10.6.7-1 +* Fri Oct 05 2018 Red Hat PKI Team 10.6.7-1 - Rebased to PKI 10.6.7 -* Fri Aug 24 2018 Alexander Bokovoy - 10.6.6-3 +* Fri Aug 24 2018 Alexander Bokovoy 10.6.6-3 - Build on s390x -* Wed Aug 22 2018 Alexander Bokovoy - 10.6.6-2 +* Wed Aug 22 2018 Alexander Bokovoy 10.6.6-2 - Use platform-python interpreter - Bug #1620066 - pkispawn crashes as /usr/bin/python3 does not exist -* Mon Aug 13 2018 Red Hat PKI Team - 10.6.6-1 +* Mon Aug 13 2018 Red Hat PKI Team 10.6.6-1 - Rebased to PKI 10.6.6 -* Wed Aug 08 2018 Red Hat PKI Team - 10.6.5-1 +* Wed Aug 08 2018 Red Hat PKI Team 10.6.5-1 - Rebased to PKI 10.6.5 * Tue Aug 07 2018 Red Hat PKI Team 10.6.4-4 - Bug #1612063 - Do not override system crypto policy (support TLS 1.3) -* Wed Aug 01 2018 Red Hat PKI Team - 10.6.4-3 +* Wed Aug 01 2018 Red Hat PKI Team 10.6.4-3 - Patch PKI to use Jackson 2 and avoid Jackson 1 dependency. Add direct dependency on slf4j-jdk14. -* Tue Jul 31 2018 Red Hat PKI Team - 10.6.4-2 +* Tue Jul 31 2018 Red Hat PKI Team 10.6.4-2 - Updated Jackson and RESTEasy dependencies -* Fri Jul 20 2018 Red Hat PKI Team - 10.6.4-1 +* Fri Jul 20 2018 Red Hat PKI Team 10.6.4-1 - Rebased to PKI 10.6.4 -* Thu Jul 05 2018 Red Hat PKI Team - 10.6.3-1 +* Thu Jul 05 2018 Red Hat PKI Team 10.6.3-1 - Rebased to PKI 10.6.3 -* Mon Jul 02 2018 Miro Hrončok - 10.6.2-4 +* Mon Jul 02 2018 Miro Hrončok 10.6.2-4 - Rebuilt for Python 3.7 -* Thu Jun 28 2018 Red Hat PKI Team - 10.6.2-3 +* Thu Jun 28 2018 Red Hat PKI Team 10.6.2-3 - Fixed macro expressions - Bug #1566606 - pki-core: Switch to Python 3 - Bug #1590467 - pki-core: Drop pylint dependency from RHEL 8 -* Tue Jun 19 2018 Miro Hrončok - 10.6.2-2 +* Tue Jun 19 2018 Miro Hrončok 10.6.2-2 - Rebuilt for Python 3.7 -* Fri Jun 15 2018 Red Hat PKI Team - 10.6.2-1 +* Fri Jun 15 2018 Red Hat PKI Team 10.6.2-1 - Rebased to PKI 10.6.2 -* Wed May 30 2018 Red Hat PKI Team - 10.6.1-3 +* Wed May 30 2018 Red Hat PKI Team 10.6.1-3 - Updated JSS dependency - Updated Tomcat dependency - Fixed rpmlint warnings -* Fri May 04 2018 Red Hat PKI Team - 10.6.1-2 +* Fri May 04 2018 Red Hat PKI Team 10.6.1-2 - Bug #1574711 - pki-tools cannot be installed on current Rawhide - Fixed rpmlint warnings -* Thu May 03 2018 Red Hat PKI Team - 10.6.1-1 +* Thu May 03 2018 Red Hat PKI Team 10.6.1-1 - Rebased to PKI 10.6.1 - Bug #1559047 - pki-core misses a dependency to pki-symkey - Bug #1573094 - FreeIPA external CA installation fails -* Wed Apr 11 2018 Red Hat PKI Team - 10.6.0-1 +* Wed Apr 11 2018 Red Hat PKI Team 10.6.0-1 - Updated project URL and package descriptions - Cleaned up spec file - Rebased to PKI 10.6.0 final -* Thu Mar 29 2018 Red Hat PKI Team - 10.6.0-0.3 +* Thu Mar 29 2018 Red Hat PKI Team 10.6.0-0.3 - Iryna Shcherbina : Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - Rebased to PKI 10.6.0 beta2 -* Thu Mar 15 2018 Red Hat PKI Team - 10.6.0-0.2 +* Thu Mar 15 2018 Red Hat PKI Team 10.6.0-0.2 - Rebased to PKI 10.6.0 beta