diff --git a/.gitignore b/.gitignore
index 94c16a4..2788d0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pki-10.6.9.tar.gz
+SOURCES/pki-10.7.3.tar.gz
diff --git a/.pki-core.metadata b/.pki-core.metadata
index 973de1c..905e4e3 100644
--- a/.pki-core.metadata
+++ b/.pki-core.metadata
@@ -1 +1 @@
-7328a1d3e1a8f743b3663ed8191bb481354bee4f SOURCES/pki-10.6.9.tar.gz
+871e3785e7cf1866fa43aabc07a9aa46bb72bb3c SOURCES/pki-10.7.3.tar.gz
diff --git a/SOURCES/0001-Bug-fix-for-Nuxwdog-150.patch b/SOURCES/0001-Bug-fix-for-Nuxwdog-150.patch
deleted file mode 100644
index bdf9bfc..0000000
--- a/SOURCES/0001-Bug-fix-for-Nuxwdog-150.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From bb759551b1177fb6795405b26067c9a369fb6b52 Mon Sep 17 00:00:00 2001
-From: Dinesh Prasanth M K <SilleBille@users.noreply.github.com>
-Date: Fri, 25 Jan 2019 12:23:10 -0500
-Subject: [PATCH] Bug fix for Nuxwdog (#150)
-
-- systemd doesn't keep the keys pinned between ExecStartPre and ExecStart.
- As a result, PKI server sees an empty keyring when it starts. (Bug #1668954)
-
-- This PR includes a fix to keep a fd open until the PKI server starts. This will
- keep a process running for `User=<pkiuser>` and so the keyring won't be dropped.
-
-Backport of #149
-
-Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
----
- base/server/scripts/pki-server-nuxwdog | 4 ++++
- pki.spec | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/base/server/scripts/pki-server-nuxwdog b/base/server/scripts/pki-server-nuxwdog
-index ab504ae3e..4f11f6de2 100755
---- a/base/server/scripts/pki-server-nuxwdog
-+++ b/base/server/scripts/pki-server-nuxwdog
-@@ -122,3 +122,7 @@ for tag in sorted(iter(tags)):
- key_name = instance_name + '/' + tag
-
- keyring.put_password(key_name=key_name, password=entered_pass)
-+
-+# 4. Put this script to sleep in background to keep the keyring fd open until main program starts
-+# due to systemd bug #1668954
-+subprocess.Popen(['/usr/bin/sleep', '10'])
-diff --git a/pki.spec b/pki.spec
-index 80cd74a94..358a8a758 100644
---- a/pki.spec
-+++ b/pki.spec
-@@ -609,6 +609,8 @@ Requires: pki-symkey >= %{version}-%{release}
- Requires: pki-base-java >= %{version}-%{release}
- Requires: pki-tools >= %{version}-%{release}
-
-+Requires: keyutils
-+
- %if 0%{?rhel} && 0%{?rhel} <= 7
- # no policycoreutils-python-utils
- %else
---
-2.20.1
-
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
new file mode 100644
index 0000000..ef430f0
--- /dev/null
+++ b/SOURCES/0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch
@@ -0,0 +1,42 @@
+From d57b32e2b4e0f7aa43f8f38e7ce539da6e0e93d7 Mon Sep 17 00:00:00 2001
+From: Dinesh Prasanth M K <SilleBille@users.noreply.github.com>
+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 <dmoluguw@redhat.com>
+---
+ 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
+ <tr valign="TOP">
+ <td>
+ <td>
+-<li><font size=4 face="PrimaSans BT, Verdana, sans-serif"><a href="ee/kra">SSL End Users Services</a></font>
++<li><font size=4 face="PrimaSans BT, Verdana, sans-serif"><a href="agent/kra">Agent Services</a></font>
+ </font>
+ </td>
+ </tr>
+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
+ <tr valign="TOP">
+ <td>
+ <td>
+-<li><font size=4 face="PrimaSans BT, Verdana, sans-serif"><a href="ee/ocsp">SSL End Users Services</a></font>
++<li><font size=4 face="PrimaSans BT, Verdana, sans-serif"><a href="agent/ocsp">Agent Services</a></font>
+ </font>
+ </td>
+ </tr>
+--
+2.21.0
+
diff --git a/SPECS/pki-core.spec b/SPECS/pki-core.spec
index 039311e..51889b1 100644
--- a/SPECS/pki-core.spec
+++ b/SPECS/pki-core.spec
@@ -2,13 +2,16 @@
Name: pki-core
################################################################################
+%global vendor_id redhat
+%global brand Red Hat
+
Summary: 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.6.9
-Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
+Version: 10.7.3
+Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -26,7 +29,7 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
# > pki-VERSION-RELEASE.patch
# Patch: pki-VERSION-RELEASE.patch
-Patch: 0001-Bug-fix-for-Nuxwdog-150.patch
+Patch1: 0001-Fix-URL-redirection-for-KRA-and-OCSP-web-UI-241.patch
################################################################################
# NSS
@@ -152,8 +155,6 @@ Patch: 0001-Bug-fix-for-Nuxwdog-150.patch
%define pki_gid 17
%define pki_homedir /usr/share/pki
-%global brand redhat
-
%global saveFileContext() \
if [ -s /etc/selinux/config ]; then \
. %{_sysconfdir}/selinux/config; \
@@ -185,7 +186,7 @@ BuildRequires: gcc-c++
BuildRequires: zip
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: redhat-rpm-config
-BuildRequires: ldapjdk >= 4.20
+BuildRequires: ldapjdk >= 4.21.0
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-io
@@ -321,8 +322,8 @@ BuildRequires: jpackage-utils >= 0:1.7.5-10
BuildRequires: jss >= 4.4.0-11
BuildRequires: tomcatjss >= 7.2.1-4
%else
-BuildRequires: jss >= 4.5.0-1
-BuildRequires: tomcatjss >= 7.3.6
+BuildRequires: jss >= 4.6.0-4
+BuildRequires: tomcatjss >= 7.4.1
%endif
BuildRequires: systemd-units
@@ -336,7 +337,7 @@ BuildRequires: tomcat >= 8.0.49
BuildRequires: tomcat >= 1:8.5.23
%else
%if 0%{?rhel}
-BuildRequires: pki-servlet-container
+BuildRequires: pki-servlet-engine
%else
BuildRequires: tomcat >= 1:9.0.7
%endif
@@ -355,11 +356,22 @@ BuildRequires: systemd
BuildRequires: zlib
BuildRequires: zlib-devel
+# build dependency to build man pages
+%if 0%{?fedora} && 0%{?fedora} <= 30 || 0%{?rhel}
+BuildRequires: go-md2man
+%else
+BuildRequires: golang-github-cpuguy83-md2man
+%endif
+
+# PKICertImport depends on certutil and openssl
+BuildRequires: nss-tools
+BuildRequires: openssl
+
# description for top-level package (if there is a separate meta package)
-%if "%{name}" != "%{brand}-pki"
+%if "%{name}" != "%{vendor_id}-pki"
%description
-Red Hat PKI is an enterprise software system designed
+%{brand} PKI is an enterprise software system designed
to manage enterprise Public Key Infrastructure deployments.
PKI consists of the following components:
@@ -373,36 +385,31 @@ PKI consists of the following components:
%endif
%if %{with meta}
-%if "%{name}" != "%{brand}-pki"
+%if "%{name}" != "%{vendor_id}-pki"
################################################################################
-%package -n %{brand}-pki
+%package -n %{vendor_id}-pki
################################################################################
-Summary: Red Hat PKI Package
+Summary: %{brand} PKI Package
%endif
# Make certain that this 'meta' package requires the latest version(s)
# of ALL PKI theme packages
-Requires: %{brand}-pki-server-theme >= %{version}
-Requires: %{brand}-pki-console-theme >= %{version}
+Requires: %{vendor_id}-pki-server-theme = %{version}
+Requires: %{vendor_id}-pki-console-theme = %{version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL PKI core packages
-Requires: pki-base-java >= %{version}
-%if 0%{?with_python3}
-Requires: pki-base-python3 >= %{version}
-%endif
-Requires: pki-tools >= %{version}
-Requires: pki-server >= %{version}
-Requires: pki-ca >= %{version}
-Requires: pki-kra >= %{version}
-Requires: pki-ocsp >= %{version}
-Requires: pki-tks >= %{version}
-Requires: pki-tps >= %{version}
+Requires: pki-ca = %{version}
+Requires: pki-kra = %{version}
+Requires: pki-ocsp = %{version}
+Requires: pki-tks = %{version}
+Requires: pki-tps = %{version}
# Make certain that this 'meta' package requires the latest version(s)
# of PKI console
-Requires: pki-console >= %{version}
+Requires: pki-console = %{version}
+Requires: pki-javadoc = %{version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL PKI clients
@@ -413,13 +420,13 @@ Requires: esc >= 1.1.1
%endif
# description for top-level package (unless there is a separate meta package)
-%if "%{name}" == "%{brand}-pki"
+%if "%{name}" == "%{vendor_id}-pki"
%description
%else
-%description -n %{brand}-pki
+%description -n %{vendor_id}-pki
%endif
-Red Hat PKI is an enterprise software system designed
+%{brand} PKI is an enterprise software system designed
to manage enterprise Public Key Infrastructure deployments.
PKI consists of the following components:
@@ -444,10 +451,16 @@ Requires: jpackage-utils >= 0:1.7.5-10
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: jss >= 4.4.0-11
%else
-Requires: jss >= 4.5.0-1
+Requires: jss >= 4.6.0-4
%endif
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: pki-console-theme < %{version}
+
%description -n pki-symkey
The PKI Symmetric Key Java Package supplies various native
symmetric key operations to Java programs.
@@ -461,13 +474,19 @@ BuildArch: noarch
Requires: nss >= 3.36.1
%if 0%{?with_python3_default}
-Requires: python3-pki = %{version}-%{release}
-Requires(post): python3-pki = %{version}-%{release}
+Requires: python3-pki = %{version}
+Requires(post): python3-pki = %{version}
%else
-Requires: python2-pki = %{version}-%{release}
-Requires(post): python2-pki = %{version}-%{release}
+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}
+Conflicts: pki-javadoc < %{version}
+Conflicts: pki-server-theme < %{version}
+Conflicts: pki-console-theme < %{version}
+
%description -n pki-base
The PKI Base Package contains the common and client libraries and utilities
written in Python.
@@ -481,12 +500,12 @@ Summary: PKI Python 2 Package
BuildArch: noarch
Obsoletes: pki-base-python2 < %{version}
-Provides: pki-base-python2 = %{version}-%{release}
+Provides: pki-base-python2 = %{version}
%if 0%{?fedora}
%{?python_provide:%python_provide python2-pki}
%endif
-Requires: pki-base >= %{version}-%{release}
+Requires: pki-base = %{version}
Requires: python2-cryptography
%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27
Requires: python-nss
@@ -512,12 +531,12 @@ Summary: PKI Python 3 Package
BuildArch: noarch
Obsoletes: pki-base-python3 < %{version}
-Provides: pki-base-python3 = %{version}-%{release}
+Provides: pki-base-python3 = %{version}
%if 0%{?fedora}
%{?python_provide:%python_provide python3-pki}
%endif
-Requires: pki-base >= %{version}-%{release}
+Requires: pki-base = %{version}
Requires: python3-cryptography
Requires: python3-lxml
Requires: python3-nss
@@ -550,15 +569,14 @@ Requires: slf4j
%else
Requires: slf4j-jdk14
%endif
-Requires: javassist
Requires: jpackage-utils >= 0:1.7.5-10
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: jss >= 4.4.0-11
%else
-Requires: jss >= 4.5.0-1
+Requires: jss >= 4.6.0-4
%endif
-Requires: ldapjdk >= 4.20
-Requires: pki-base >= %{version}-%{release}
+Requires: ldapjdk >= 4.21.0
+Requires: pki-base = %{version}
%if 0%{?rhel}
%if 0%{?rhel} <= 7
@@ -599,7 +617,11 @@ Summary: PKI Tools Package
Requires: openldap-clients
Requires: nss-tools >= 3.36.1
-Requires: pki-base-java >= %{version}-%{release}
+Requires: pki-base-java = %{version}
+
+# PKICertImport depends on certutil and openssl
+Requires: nss-tools
+Requires: openssl
%description -n pki-tools
This package contains PKI executables that can be used to help make
@@ -626,9 +648,10 @@ Requires: openssl >= 1.0.2k-11
%else
Requires: openssl
%endif
-Requires: pki-symkey >= %{version}-%{release}
-Requires: pki-base-java >= %{version}-%{release}
-Requires: pki-tools >= %{version}-%{release}
+Requires: pki-symkey = %{version}
+Requires: pki-tools = %{version}
+
+Requires: keyutils
%if 0%{?rhel} && 0%{?rhel} <= 7
# no policycoreutils-python-utils
@@ -671,7 +694,7 @@ Requires: tomcat >= 8.0.49
Requires: tomcat >= 1:8.5.23
%else
%if 0%{?rhel}
-Requires: pki-servlet-container >= 1:9.0.7
+Requires: pki-servlet-engine >= 1:9.0.7
%else
Requires: tomcat >= 1:9.0.7
%endif
@@ -687,7 +710,7 @@ Requires(pre): shadow-utils
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: tomcatjss >= 7.2.1-4
%else
-Requires: tomcatjss >= 7.3.6
+Requires: tomcatjss >= 7.4.1
%endif
# https://pagure.io/freeipa/issue/7742
@@ -717,7 +740,7 @@ following PKI subsystems:
Summary: PKI CA Package
BuildArch: noarch
-Requires: pki-server >= %{version}-%{release}
+Requires: pki-server = %{version}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -741,7 +764,7 @@ where it obtains its own signing certificate from a public CA.
Summary: PKI KRA Package
BuildArch: noarch
-Requires: pki-server >= %{version}-%{release}
+Requires: pki-server = %{version}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -771,7 +794,7 @@ since such archival would undermine non-repudiation properties of signing keys.
Summary: PKI OCSP Package
BuildArch: noarch
-Requires: pki-server >= %{version}-%{release}
+Requires: pki-server = %{version}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -808,7 +831,7 @@ whenever they are issued or updated.
Summary: PKI TKS Package
BuildArch: noarch
-Requires: pki-server >= %{version}-%{release}
+Requires: pki-server = %{version}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -838,7 +861,7 @@ behind the firewall with restricted access.
Summary: PKI TPS Package
-Requires: pki-server >= %{version}-%{release}
+Requires: pki-server = %{version}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -879,6 +902,12 @@ smart card.
Summary: PKI Javadoc Package
BuildArch: noarch
+# Ensure we end up with a useful installation
+Conflicts: pki-base < %{version}
+Conflicts: pki-symkey < %{version}
+Conflicts: pki-server-theme < %{version}
+Conflicts: pki-console-theme < %{version}
+
%description -n pki-javadoc
This package contains PKI API documentation.
@@ -895,8 +924,8 @@ BuildArch: noarch
BuildRequires: idm-console-framework >= 1.2.0
Requires: idm-console-framework >= 1.2.0
-Requires: pki-base-java >= %{version}
-Requires: pki-console-theme >= %{version}
+Requires: pki-base-java = %{version}
+Requires: pki-console-theme = %{version}
%description -n pki-console
The PKI Console is a Java application used to administer PKI server.
@@ -905,30 +934,42 @@ The PKI Console is a Java application used to administer PKI server.
%if %{with theme}
################################################################################
-%package -n %{brand}-pki-server-theme
+%package -n %{vendor_id}-pki-server-theme
################################################################################
-Summary: Red Hat PKI Server Theme Package
+Summary: %{brand} PKI Server Theme Package
BuildArch: noarch
-Provides: pki-server-theme = %{version}-%{release}
+Provides: pki-server-theme = %{version}
+
+# Ensure we end up with a useful installation
+Conflicts: pki-base < %{version}
+Conflicts: pki-symkey < %{version}
+Conflicts: pki-console-theme < %{version}
+Conflicts: pki-javadoc < %{version}
-%description -n %{brand}-pki-server-theme
+%description -n %{vendor_id}-pki-server-theme
This PKI Server Theme Package contains
-Red Hat textual and graphical user interface for PKI Server.
+%{brand} textual and graphical user interface for PKI Server.
################################################################################
-%package -n %{brand}-pki-console-theme
+%package -n %{vendor_id}-pki-console-theme
################################################################################
-Summary: Red Hat PKI Console Theme Package
+Summary: %{brand} PKI Console Theme Package
BuildArch: noarch
-Provides: pki-console-theme = %{version}-%{release}
+Provides: pki-console-theme = %{version}
-%description -n %{brand}-pki-console-theme
+# 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}
+
+%description -n %{vendor_id}-pki-console-theme
This PKI Console Theme Package contains
-Red Hat textual and graphical user interface for PKI Console.
+%{brand} textual and graphical user interface for PKI Console.
%endif # with theme
@@ -977,7 +1018,7 @@ cd build
%endif
-DWITH_JAVADOC:BOOL=%{?with_javadoc:ON}%{!?with_javadoc:OFF} \
-DBUILD_PKI_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \
- -DTHEME=%{?with_theme:%{brand}} \
+ -DTHEME=%{?with_theme:%{vendor_id}} \
..
################################################################################
@@ -995,12 +1036,16 @@ cd build
--no-print-directory \
all install
+%if %{with_test}
+ctest --output-on-failure
+%endif
+
%if %{with meta}
%{__mkdir_p} %{buildroot}%{_datadir}/doc/pki
cat > %{buildroot}%{_datadir}/doc/pki/README << EOF
This package is a "meta-package" whose dependencies pull in all of the
-packages comprising the Red Hat Public Key Infrastructure (PKI) Suite.
+packages comprising the %{brand} Public Key Infrastructure (PKI) Suite.
EOF
%endif # with meta
@@ -1023,7 +1068,6 @@ EOF
%if 0%{?rhel} && 0%{?rhel} <= 7
# no link customization
%else
- rm -f %{buildroot}%{_datadir}/pki/lib/scannotation.jar
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
@@ -1064,8 +1108,6 @@ mv %{buildroot}%{_datadir}/pki/server/upgrade/10.5.5/01-AddTPSExternalRegISEtoke
# Customize server common library links in /usr/share/pki/server/common/lib
%if 0%{?fedora} || 0%{?rhel} > 7
- rm -f %{buildroot}%{_datadir}/pki/server/common/lib/scannotation.jar
- rm -f %{buildroot}%{_datadir}/pki/server/common/lib/resteasy-jaxrs-api.jar
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
@@ -1229,8 +1271,8 @@ fi
## from EITHER 'sysVinit' OR previous 'systemd' processes to the new
## PKI deployment process
-echo "Upgrading PKI server configuration at `/bin/date`." >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
-/sbin/pki-server-upgrade --silent >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+echo "Upgrading PKI server configuration on `/bin/date`." >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
+/sbin/pki-server upgrade --silent >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
# Reload systemd daemons on upgrade only
@@ -1253,9 +1295,9 @@ fi
%endif # with server
%if %{with meta}
-%if "%{name}" != "%{brand}-pki"
+%if "%{name}" != "%{vendor_id}-pki"
################################################################################
-%files -n %{brand}-pki
+%files -n %{vendor_id}-pki
################################################################################
%else
%files
@@ -1368,6 +1410,7 @@ fi
%{_bindir}/OCSPClient
%{_bindir}/PKCS10Client
%{_bindir}/PKCS12Export
+%{_bindir}/PKICertImport
%{_bindir}/PrettyPrintCert
%{_bindir}/PrettyPrintCrl
%{_bindir}/TokenInfo
@@ -1386,13 +1429,13 @@ fi
%{_mandir}/man1/PrettyPrintCrl.1.gz
%{_mandir}/man1/pki.1.gz
%{_mandir}/man1/pki-audit.1.gz
+%{_mandir}/man1/pki-ca-cert.1.gz
%{_mandir}/man1/pki-ca-kraconnector.1.gz
%{_mandir}/man1/pki-ca-profile.1.gz
-%{_mandir}/man1/pki-cert.1.gz
%{_mandir}/man1/pki-client.1.gz
%{_mandir}/man1/pki-group.1.gz
%{_mandir}/man1/pki-group-member.1.gz
-%{_mandir}/man1/pki-key.1.gz
+%{_mandir}/man1/pki-kra-key.1.gz
%{_mandir}/man1/pki-pkcs12-cert.1.gz
%{_mandir}/man1/pki-pkcs12-key.1.gz
%{_mandir}/man1/pki-pkcs12.1.gz
@@ -1402,6 +1445,7 @@ fi
%{_mandir}/man1/pki-user-cert.1.gz
%{_mandir}/man1/pki-user-membership.1.gz
%{_mandir}/man1/PKCS10Client.1.gz
+%{_mandir}/man1/PKICertImport.1.gz
%endif # with base
@@ -1570,10 +1614,10 @@ fi
%if %{with theme}
################################################################################
-%files -n %{brand}-pki-server-theme
+%files -n %{vendor_id}-pki-server-theme
################################################################################
-%doc themes/%{brand}/common-ui/LICENSE
+%doc themes/%{vendor_id}/common-ui/LICENSE
%dir %{_datadir}/pki
%{_datadir}/pki/CS_SERVER_VERSION
%{_datadir}/pki/common-ui/
@@ -1588,16 +1632,38 @@ fi
%{_datadir}/pki/server/webapps/pki/tks
################################################################################
-%files -n %{brand}-pki-console-theme
+%files -n %{vendor_id}-pki-console-theme
################################################################################
-%doc themes/%{brand}/console-ui/LICENSE
+%doc themes/%{vendor_id}/console-ui/LICENSE
%{_javadir}/pki/pki-console-theme.jar
%endif # with theme
################################################################################
%changelog
+* Wed Aug 14 2019 Red Hat PKI Team <rhcs-maint@redhat.com> - 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 <rhcs-maint@redhat.com> - 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 <rhcs-maint@redhat.com> - 10.7.1-2
+- Fixed cloning issue
+- Fixed TPS installation issue
+
+* Wed Jun 12 2019 Red Hat PKI Team <rhcs-maint@redhat.com> - 10.7.1-1
+- Rebased to PKI 10.7.1
+
+* Wed Apr 24 2019 Red Hat PKI Team <rhcs-maint@redhat.com> - 10.7.0-1
+- Rebased to PKI 10.7.0
+
* Mon Jan 28 2019 Red Hat PKI Team <rhcs-maint@redhat.com> - 10.6.9-2
- Bug #1652269 - Replace Nuxwdog