The package rpms/pki-core.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pki-core.git/commit/?id=402299162....
Change:
-ExcludeArch: s390 s390x
Thanks.
Full change:
============
commit d84c7498dfbd7ce3de1ed9e2c234f5e495efb171
Merge: c9db9ae 50b1054
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Tue May 7 16:13:10 2019 -0400
Merge branch 'master' into f29 for PKI 10.7.0 rebase
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
commit 50b1054e78589a8c567f3aa1d6001a1c84dda131
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Tue May 7 12:31:05 2019 -0400
Updated sources
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 55f3fa9..49572d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@
/pki-10.6.7.tar.gz
/pki-10.6.8.tar.gz
/pki-10.6.9.tar.gz
+/pki-10.7.0.tar.gz
diff --git a/sources b/sources
index 39681f2..ef918c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.6.9.tar.gz) =
093a34b6d3b6c36bfa620be653207ed43d345fa7bb2bf704cf306905247e2cb2cd71502c5f02acb2bebd18879a011b62e415236cc9b1db20709d3a51863ee65b
+SHA512 (pki-10.7.0.tar.gz) =
7f6a2abf9ba72da1048349da8dedc7d2897dd7fe70d5dee31b13f63e8cecf9f865ecfb56570b7c2e5827e9ea1a180cf9321a8e4a33895b753915e1c8caaeb2f8
commit b2dea936acb4afe45d585d8c2db036901dc9de32
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Mon May 6 17:22:39 2019 -0400
Rebased to 10.7.0
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
diff --git a/pki-core.spec b/pki-core.spec
index 902378a..0b44563 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -7,8 +7,8 @@ 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.0
+Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -247,31 +247,6 @@ 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
-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
@@ -320,24 +295,16 @@ 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.5.3
+BuildRequires: tomcatjss >= 7.4.0
%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
BuildRequires: tomcat >= 1:9.0.7
%endif
-%endif
-%endif
# additional build requirements needed to build native 'tpsclient'
# REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app
@@ -350,6 +317,13 @@ BuildRequires: systemd
BuildRequires: zlib
BuildRequires: zlib-devel
+# build dependency to build man pages
+BuildRequires: go-md2man
+
+# 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"
%description
@@ -378,26 +352,27 @@ Summary: Dogtag PKI Package
# 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: %{brand}-pki-server-theme = %{version}
+Requires: %{brand}-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}
+Requires: pki-base-java = %{version}
%if 0%{?with_python3}
-Requires: pki-base-python3 >= %{version}
+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-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}
# 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
@@ -439,10 +414,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.5.3
%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.
@@ -456,13 +437,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.
@@ -476,12 +463,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
@@ -507,12 +494,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
@@ -545,15 +532,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.5.3
%endif
Requires: ldapjdk >= 4.20
-Requires: pki-base >= %{version}-%{release}
+Requires: pki-base = %{version}
%if 0%{?rhel} && 0%{?rhel} <= 7
# 'resteasy-base' is a subset of the complete set of
@@ -590,7 +576,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
@@ -617,9 +607,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
@@ -674,7 +665,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.0
%endif
#
https://pagure.io/freeipa/issue/7742
@@ -700,7 +691,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
@@ -724,7 +715,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
@@ -754,7 +745,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
@@ -791,7 +782,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
@@ -821,7 +812,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
@@ -862,6 +853,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.
@@ -878,8 +875,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.
@@ -894,7 +891,7 @@ The PKI Console is a Java application used to administer PKI server.
Summary: Dogtag PKI Server Theme Package
BuildArch: noarch
-Provides: pki-server-theme = %{version}-%{release}
+Provides: pki-server-theme = %{version}
%description -n %{brand}-pki-server-theme
This PKI Server Theme Package contains
@@ -907,7 +904,7 @@ Dogtag textual and graphical user interface for PKI Server.
Summary: Dogtag PKI Console Theme Package
BuildArch: noarch
-Provides: pki-console-theme = %{version}-%{release}
+Provides: pki-console-theme = %{version}
%description -n %{brand}-pki-console-theme
This PKI Console Theme Package contains
@@ -1047,8 +1044,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
@@ -1079,56 +1074,6 @@ fi
rm -f %{buildroot}%{_datadir}/pki/server/lib/slf4j-jdk14.jar
%endif
-%if 0%{?rhel}
-# no pylint
-%else
-
-################################################################################
-echo "Scanning Python code with pylint"
-################################################################################
-
-%if 0%{?with_python3_default}
-%{__python3} ../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}
@@ -1351,6 +1296,7 @@ fi
%{_bindir}/OCSPClient
%{_bindir}/PKCS10Client
%{_bindir}/PKCS12Export
+%{_bindir}/PKICertImport
%{_bindir}/PrettyPrintCert
%{_bindir}/PrettyPrintCrl
%{_bindir}/TokenInfo
@@ -1369,13 +1315,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
@@ -1385,6 +1331,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
@@ -1581,87 +1528,7 @@ fi
################################################################################
%changelog
-* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.6.9-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 15 2019 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.9-1
-- Rebased to PKI 10.6.9
-
-* Wed Jan 09 2019 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-4
-- Testing gating for upstream
-
-* Tue Dec 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-3
-- Conflict older PKI versions
-
-* Tue Dec 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-2
-- Updated internal dependency versions
-
-* Fri Nov 30 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-1
-- Rebased to PKI 10.6.8
-
-* Fri Oct 26 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.7-3
-- Fixed default token normalization in initialization.py
-
-* Thu Oct 25 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.7-2
-- Fixed missing token in verify_certificate_exists
-
-* Thu Oct 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.7-1
-- Rebased to PKI 10.6.7
-
-* Mon Sep 10 2018 Dennis Gilmore <dennis(a)ausil.us> - 10.6.6-2
-- add back aarch64 support as esc is now built for aarch64
-
-* Mon Aug 13 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.6-1
-- Rebased to PKI 10.6.6
-
-* Wed Aug 08 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.5-1
-- Rebased to PKI 10.6.5
-
-* Fri Jul 20 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.4-1
-- Rebased to PKI 10.6.4
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.6.3-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 05 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.3-1
-- Rebased to PKI 10.6.3
-
-* Mon Jul 02 2018 Miro Hronok <mhroncok(a)redhat.com> - 10.6.2-4
-- Rebuilt for Python 3.7
-
-* Thu Jun 28 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.2-3
-- Fixed macro expressions
-
-* Tue Jun 19 2018 Miro Hronok <mhroncok(a)redhat.com> - 10.6.2-2
-- Rebuilt for Python 3.7
-
-* Fri Jun 15 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.2-1
-- Rebased to PKI 10.6.2
-
-* Wed May 30 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.1-3
-- Updated JSS dependency
-- Updated Tomcat dependency
-- Fixed rpmlint warnings
-
-* Fri May 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.1-2
-- Bugzilla #1574711: pki-tools cannot be installed on current Rawhide
-- Fixed rpmlint warnings
-
-* Thu May 03 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.1-1
-- Rebased to PKI 10.6.1
-- Bugzilla #1559047: pki-core misses a dependency to pki-symkey
-- Bugzilla #1573094: FreeIPA external CA installation fails
-
-* Wed Apr 11 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 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 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.0-0.3
-- Iryna Shcherbina <ishcherb(a)redhat.com>: Update Python 2 dependency declarations
to new packaging standards
- (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-- Rebased to PKI 10.6.0 beta2
+* Mon May 06 2019 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.7.0-1
+- Rebased to PKI 10.7.0
-* Thu Mar 15 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.0-0.2
-- Rebased to PKI 10.6.0 beta
commit cd144318ced651e9913d100b00193c2c76f1b465
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 2 04:18:59 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/pki-core.spec b/pki-core.spec
index 46ddb1e..902378a 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,7 +8,7 @@ URL:
http://www.dogtagpki.org/
License: GPLv2 and LGPLv2
Version: 10.6.9
-Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
+Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -1581,6 +1581,9 @@ fi
################################################################################
%changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.6.9-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Tue Jan 15 2019 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.9-1
- Rebased to PKI 10.6.9
commit f05ada89a8c7d8a71e72ce9ed68b9d790b3c7a8a
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Tue Jan 15 12:22:27 2019 -0500
Remove Gating
opt-out gating
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 7d59401..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
- - fedora-30
-decision_context: bodhi_update_push_testing
-rules:
- - !PassingTestCaseRule {test_case_name: dist.depcheck}
\ No newline at end of file
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index e233fda..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: localhost
- roles:
- - role: standard-test-basic
- tags:
- - classic
- tests:
- - simple:
- dir: .
- run: "pki --help"
commit 27803e8c562d704e069d8f75c05b77a695a1847f
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Tue Jan 15 10:41:27 2019 -0500
Rebased to PKI v10.6.9
diff --git a/.gitignore b/.gitignore
index 5895c3c..55f3fa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@
/pki-10.6.6.tar.gz
/pki-10.6.7.tar.gz
/pki-10.6.8.tar.gz
+/pki-10.6.9.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index eb71737..46ddb1e 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -7,8 +7,8 @@ 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.8
-Release: 4%{?_timestamp}%{?_commit_id}%{?dist}
+Version: 10.6.9
+Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -181,6 +181,7 @@ fi;
# autosetup
BuildRequires: git
+BuildRequires: make
BuildRequires: cmake >= 2.8.9-1
BuildRequires: gcc-c++
@@ -203,12 +204,6 @@ BuildRequires: slf4j-jdk14
BuildRequires: nspr-devel
BuildRequires: nss-devel >= 3.36.1
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires: nuxwdog-client-java >= 1.0.3-7
-%else
-BuildRequires: nuxwdog-client-java >= 1.0.5
-%endif
-
BuildRequires: openldap-devel
BuildRequires: pkgconfig
BuildRequires: policycoreutils
@@ -308,12 +303,13 @@ 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-pyldap
BuildRequires: python3-requests >= 2.6.0
BuildRequires: python3-six
%endif # with_python3
@@ -382,26 +378,26 @@ Summary: Dogtag PKI Package
# Make certain that this 'meta' package requires the latest version(s)
# of ALL PKI theme packages
-Requires: %{brand}-pki-server-theme = %{version}-%{release}
-Requires: %{brand}-pki-console-theme = %{version}-%{release}
+Requires: %{brand}-pki-server-theme >= %{version}
+Requires: %{brand}-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}-%{release}
+Requires: pki-base-java >= %{version}
%if 0%{?with_python3}
-Requires: pki-base-python3 = %{version}-%{release}
+Requires: pki-base-python3 >= %{version}
%endif
-Requires: pki-tools = %{version}-%{release}
-Requires: pki-server = %{version}-%{release}
-Requires: pki-ca = %{version}-%{release}
-Requires: pki-kra = %{version}-%{release}
-Requires: pki-ocsp = %{version}-%{release}
-Requires: pki-tks = %{version}-%{release}
-Requires: pki-tps = %{version}-%{release}
+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}
# Make certain that this 'meta' package requires the latest version(s)
# of PKI console
-Requires: pki-console = %{version}-%{release}
+Requires: pki-console >= %{version}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL PKI clients
@@ -445,20 +441,7 @@ Requires: jss >= 4.4.0-11
%else
Requires: jss >= 4.5.0-1
%endif
-Requires: nss >= 3.36.1
-
-# Ensure we end up with a useful installation
-Conflicts: pki-base < %{version}-%{release}
-Conflicts: pki-symkey < %{version}-%{release}
-Conflicts: pki-server < %{version}-%{release}
-Conflicts: pki-ca < %{version}-%{release}
-Conflicts: pki-kra < %{version}-%{release}
-Conflicts: pki-ocsp < %{version}-%{release}
-Conflicts: pki-tks < %{version}-%{release}
-Conflicts: pki-tps < %{version}-%{release}
-Conflicts: pki-javadoc < %{version}-%{release}
-Conflicts: pki-console < %{version}-%{release}
-Conflicts: dogtag-pki < %{version}-%{release}
+Requires: nss >= 3.38.0
%description -n pki-symkey
The PKI Symmetric Key Java Package supplies various native
@@ -480,19 +463,6 @@ Requires: python2-pki = %{version}-%{release}
Requires(post): python2-pki = %{version}-%{release}
%endif # with_python3_default
-# Ensure we end up with a useful installation
-Conflicts: pki-base < %{version}-%{release}
-Conflicts: pki-symkey < %{version}-%{release}
-Conflicts: pki-server < %{version}-%{release}
-Conflicts: pki-ca < %{version}-%{release}
-Conflicts: pki-kra < %{version}-%{release}
-Conflicts: pki-ocsp < %{version}-%{release}
-Conflicts: pki-tks < %{version}-%{release}
-Conflicts: pki-tps < %{version}-%{release}
-Conflicts: pki-javadoc < %{version}-%{release}
-Conflicts: pki-console < %{version}-%{release}
-Conflicts: dogtag-pki < %{version}-%{release}
-
%description -n pki-base
The PKI Base Package contains the common and client libraries and utilities
written in Python.
@@ -511,7 +481,7 @@ Provides: pki-base-python2 = %{version}-%{release}
%{?python_provide:%python_provide python2-pki}
%endif
-Requires: pki-base = %{version}-%{release}
+Requires: pki-base >= %{version}-%{release}
Requires: python2-cryptography
%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <=
27
Requires: python-nss
@@ -542,7 +512,7 @@ Provides: pki-base-python3 = %{version}-%{release}
%{?python_provide:%python_provide python3-pki}
%endif
-Requires: pki-base = %{version}-%{release}
+Requires: pki-base >= %{version}-%{release}
Requires: python3-cryptography
Requires: python3-lxml
Requires: python3-nss
@@ -583,7 +553,7 @@ Requires: jss >= 4.4.0-11
Requires: jss >= 4.5.0-1
%endif
Requires: ldapjdk >= 4.20
-Requires: pki-base = %{version}-%{release}
+Requires: pki-base >= %{version}-%{release}
%if 0%{?rhel} && 0%{?rhel} <= 7
# 'resteasy-base' is a subset of the complete set of
@@ -620,7 +590,7 @@ Summary: PKI Tools Package
Requires: openldap-clients
Requires: nss-tools >= 3.36.1
-Requires: pki-base-java = %{version}-%{release}
+Requires: pki-base-java >= %{version}-%{release}
%description -n pki-tools
This package contains PKI executables that can be used to help make
@@ -639,12 +609,6 @@ BuildArch: noarch
Requires: hostname
Requires: net-tools
-%if 0%{?rhel} && 0%{?rhel} <= 7
-Requires: nuxwdog-client-java >= 1.0.3-7
-%else
-Requires: nuxwdog-client-java >= 1.0.5
-%endif
-
Requires: policycoreutils
Requires: procps-ng
Requires: openldap-clients
@@ -653,9 +617,9 @@ 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}-%{release}
+Requires: pki-base-java >= %{version}-%{release}
+Requires: pki-tools >= %{version}-%{release}
%if 0%{?rhel} && 0%{?rhel} <= 7
# no policycoreutils-python-utils
@@ -736,7 +700,7 @@ following PKI subsystems:
Summary: PKI CA Package
BuildArch: noarch
-Requires: pki-server = %{version}-%{release}
+Requires: pki-server >= %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -760,7 +724,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}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -790,7 +754,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}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -827,7 +791,7 @@ whenever they are issued or updated.
Summary: PKI TKS Package
BuildArch: noarch
-Requires: pki-server = %{version}-%{release}
+Requires: pki-server >= %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -857,7 +821,7 @@ behind the firewall with restricted access.
Summary: PKI TPS Package
-Requires: pki-server = %{version}-%{release}
+Requires: pki-server >= %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -898,19 +862,6 @@ smart card.
Summary: PKI Javadoc Package
BuildArch: noarch
-# Ensure we end up with a useful installation
-Conflicts: pki-base < %{version}-%{release}
-Conflicts: pki-symkey < %{version}-%{release}
-Conflicts: pki-server < %{version}-%{release}
-Conflicts: pki-ca < %{version}-%{release}
-Conflicts: pki-kra < %{version}-%{release}
-Conflicts: pki-ocsp < %{version}-%{release}
-Conflicts: pki-tks < %{version}-%{release}
-Conflicts: pki-tps < %{version}-%{release}
-Conflicts: pki-javadoc < %{version}-%{release}
-Conflicts: pki-console < %{version}-%{release}
-Conflicts: dogtag-pki < %{version}-%{release}
-
%description -n pki-javadoc
This package contains PKI API documentation.
@@ -927,8 +878,8 @@ BuildArch: noarch
BuildRequires: idm-console-framework >= 1.2.0
Requires: idm-console-framework >= 1.2.0
-Requires: pki-base-java = %{version}-%{release}
-Requires: pki-console-theme = %{version}-%{release}
+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.
@@ -1450,7 +1401,6 @@ fi
%{_sbindir}/pkispawn
%{_sbindir}/pkidestroy
%{_sbindir}/pki-server
-%{_sbindir}/pki-server-nuxwdog
%{_sbindir}/pki-server-upgrade
%if 0%{?with_python3_default}
%{python3_sitelib}/pki/server/
@@ -1463,6 +1413,7 @@ fi
%{_datadir}/pki/deployment/config/
%{_datadir}/pki/scripts/operations
%{_bindir}/pkidaemon
+%{_bindir}/pki-server-nuxwdog
%dir %{_sysconfdir}/systemd/system/pki-tomcatd.target.wants
%attr(644,-,-) %{_unitdir}/pki-tomcatd@.service
%attr(644,-,-) %{_unitdir}/pki-tomcatd.target
@@ -1630,6 +1581,9 @@ fi
################################################################################
%changelog
+* Tue Jan 15 2019 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.9-1
+- Rebased to PKI 10.6.9
+
* Wed Jan 09 2019 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-4
- Testing gating for upstream
diff --git a/sources b/sources
index e8b3d53..39681f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.6.8.tar.gz) =
112f5290857477736a810f14058fbc27d9add3299da359a8818b1068f388e1a1ca6662a13ac745778cc66777d073caa23a2a46215155f77f30d3771a654b215d
+SHA512 (pki-10.6.9.tar.gz) =
093a34b6d3b6c36bfa620be653207ed43d345fa7bb2bf704cf306905247e2cb2cd71502c5f02acb2bebd18879a011b62e415236cc9b1db20709d3a51863ee65b
commit 875d70a498515e010c71d09809a30762d5dc0eb1
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Wed Jan 9 10:23:24 2019 -0500
Testing Gating
Running first test for gating
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..7d59401
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+ - fedora-30
+decision_context: bodhi_update_push_testing
+rules:
+ - !PassingTestCaseRule {test_case_name: dist.depcheck}
\ No newline at end of file
diff --git a/pki-core.spec b/pki-core.spec
index f02cbd3..eb71737 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,7 +8,7 @@ URL:
http://www.dogtagpki.org/
License: GPLv2 and LGPLv2
Version: 10.6.8
-Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
+Release: 4%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -1630,6 +1630,9 @@ fi
################################################################################
%changelog
+* Wed Jan 09 2019 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-4
+- Testing gating for upstream
+
* Tue Dec 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-3
- Conflict older PKI versions
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..e233fda
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,9 @@
+- hosts: localhost
+ roles:
+ - role: standard-test-basic
+ tags:
+ - classic
+ tests:
+ - simple:
+ dir: .
+ run: "pki --help"
commit cd95b1e54fcd7dcdb081fec6ac7683fd4a246eae
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Tue Dec 4 13:45:28 2018 -0500
Fix conflicts as pathset 3
Signed-off-by: Alexander Scheel <ascheel(a)redhat.com>
diff --git a/pki-core.spec b/pki-core.spec
index f87c556..f02cbd3 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,7 +8,7 @@ URL:
http://www.dogtagpki.org/
License: GPLv2 and LGPLv2
Version: 10.6.8
-Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
+Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -1630,6 +1630,9 @@ fi
################################################################################
%changelog
+* Tue Dec 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-3
+- Conflict older PKI versions
+
* Tue Dec 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-2
- Updated internal dependency versions
commit 01211e55fc60ab1eb10ee39e7774e167db6f4fed
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Tue Dec 4 13:36:07 2018 -0500
Fix typos
Signed-off-by: Alexander Scheel <ascheel(a)redhat.com>
diff --git a/pki-core.spec b/pki-core.spec
index 7c28020..f87c556 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -449,16 +449,16 @@ Requires: nss >= 3.36.1
# Ensure we end up with a useful installation
Conflicts: pki-base < %{version}-%{release}
-Conflicts: pki-symkey < %{version}-%release}
-Conflicts: pki-server < %{version}-%release}
-Conflicts: pki-ca < %{version}-%release}
-Conflicts: pki-kra < %{version}-%release}
-Conflicts: pki-ocsp < %{version}-%release}
-Conflicts: pki-tks < %{version}-%release}
-Conflicts: pki-tps < %{version}-%release}
-Conflicts: pki-javadoc < %{version}-%release}
-Conflicts: pki-console < %{version}-%release}
-Conflicts: dogtag-pki < %{version}-%release}
+Conflicts: pki-symkey < %{version}-%{release}
+Conflicts: pki-server < %{version}-%{release}
+Conflicts: pki-ca < %{version}-%{release}
+Conflicts: pki-kra < %{version}-%{release}
+Conflicts: pki-ocsp < %{version}-%{release}
+Conflicts: pki-tks < %{version}-%{release}
+Conflicts: pki-tps < %{version}-%{release}
+Conflicts: pki-javadoc < %{version}-%{release}
+Conflicts: pki-console < %{version}-%{release}
+Conflicts: dogtag-pki < %{version}-%{release}
%description -n pki-symkey
The PKI Symmetric Key Java Package supplies various native
@@ -482,16 +482,16 @@ Requires(post): python2-pki = %{version}-%{release}
# Ensure we end up with a useful installation
Conflicts: pki-base < %{version}-%{release}
-Conflicts: pki-symkey < %{version}-%release}
-Conflicts: pki-server < %{version}-%release}
-Conflicts: pki-ca < %{version}-%release}
-Conflicts: pki-kra < %{version}-%release}
-Conflicts: pki-ocsp < %{version}-%release}
-Conflicts: pki-tks < %{version}-%release}
-Conflicts: pki-tps < %{version}-%release}
-Conflicts: pki-javadoc < %{version}-%release}
-Conflicts: pki-console < %{version}-%release}
-Conflicts: dogtag-pki < %{version}-%release}
+Conflicts: pki-symkey < %{version}-%{release}
+Conflicts: pki-server < %{version}-%{release}
+Conflicts: pki-ca < %{version}-%{release}
+Conflicts: pki-kra < %{version}-%{release}
+Conflicts: pki-ocsp < %{version}-%{release}
+Conflicts: pki-tks < %{version}-%{release}
+Conflicts: pki-tps < %{version}-%{release}
+Conflicts: pki-javadoc < %{version}-%{release}
+Conflicts: pki-console < %{version}-%{release}
+Conflicts: dogtag-pki < %{version}-%{release}
%description -n pki-base
The PKI Base Package contains the common and client libraries and utilities
@@ -900,16 +900,16 @@ BuildArch: noarch
# Ensure we end up with a useful installation
Conflicts: pki-base < %{version}-%{release}
-Conflicts: pki-symkey < %{version}-%release}
-Conflicts: pki-server < %{version}-%release}
-Conflicts: pki-ca < %{version}-%release}
-Conflicts: pki-kra < %{version}-%release}
-Conflicts: pki-ocsp < %{version}-%release}
-Conflicts: pki-tks < %{version}-%release}
-Conflicts: pki-tps < %{version}-%release}
-Conflicts: pki-javadoc < %{version}-%release}
-Conflicts: pki-console < %{version}-%release}
-Conflicts: dogtag-pki < %{version}-%release}
+Conflicts: pki-symkey < %{version}-%{release}
+Conflicts: pki-server < %{version}-%{release}
+Conflicts: pki-ca < %{version}-%{release}
+Conflicts: pki-kra < %{version}-%{release}
+Conflicts: pki-ocsp < %{version}-%{release}
+Conflicts: pki-tks < %{version}-%{release}
+Conflicts: pki-tps < %{version}-%{release}
+Conflicts: pki-javadoc < %{version}-%{release}
+Conflicts: pki-console < %{version}-%{release}
+Conflicts: dogtag-pki < %{version}-%{release}
%description -n pki-javadoc
This package contains PKI API documentation.
commit 0318d151f61c0936c04b99da79db57c92516498e
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Tue Dec 4 13:33:12 2018 -0500
Add conflicts against other package versions
Signed-off-by: Alexander Scheel <ascheel(a)redhat.com>
diff --git a/pki-core.spec b/pki-core.spec
index 025e712..7c28020 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -447,6 +447,19 @@ Requires: jss >= 4.5.0-1
%endif
Requires: nss >= 3.36.1
+# Ensure we end up with a useful installation
+Conflicts: pki-base < %{version}-%{release}
+Conflicts: pki-symkey < %{version}-%release}
+Conflicts: pki-server < %{version}-%release}
+Conflicts: pki-ca < %{version}-%release}
+Conflicts: pki-kra < %{version}-%release}
+Conflicts: pki-ocsp < %{version}-%release}
+Conflicts: pki-tks < %{version}-%release}
+Conflicts: pki-tps < %{version}-%release}
+Conflicts: pki-javadoc < %{version}-%release}
+Conflicts: pki-console < %{version}-%release}
+Conflicts: dogtag-pki < %{version}-%release}
+
%description -n pki-symkey
The PKI Symmetric Key Java Package supplies various native
symmetric key operations to Java programs.
@@ -467,6 +480,19 @@ Requires: python2-pki = %{version}-%{release}
Requires(post): python2-pki = %{version}-%{release}
%endif # with_python3_default
+# Ensure we end up with a useful installation
+Conflicts: pki-base < %{version}-%{release}
+Conflicts: pki-symkey < %{version}-%release}
+Conflicts: pki-server < %{version}-%release}
+Conflicts: pki-ca < %{version}-%release}
+Conflicts: pki-kra < %{version}-%release}
+Conflicts: pki-ocsp < %{version}-%release}
+Conflicts: pki-tks < %{version}-%release}
+Conflicts: pki-tps < %{version}-%release}
+Conflicts: pki-javadoc < %{version}-%release}
+Conflicts: pki-console < %{version}-%release}
+Conflicts: dogtag-pki < %{version}-%release}
+
%description -n pki-base
The PKI Base Package contains the common and client libraries and utilities
written in Python.
@@ -872,6 +898,19 @@ smart card.
Summary: PKI Javadoc Package
BuildArch: noarch
+# Ensure we end up with a useful installation
+Conflicts: pki-base < %{version}-%{release}
+Conflicts: pki-symkey < %{version}-%release}
+Conflicts: pki-server < %{version}-%release}
+Conflicts: pki-ca < %{version}-%release}
+Conflicts: pki-kra < %{version}-%release}
+Conflicts: pki-ocsp < %{version}-%release}
+Conflicts: pki-tks < %{version}-%release}
+Conflicts: pki-tps < %{version}-%release}
+Conflicts: pki-javadoc < %{version}-%release}
+Conflicts: pki-console < %{version}-%release}
+Conflicts: dogtag-pki < %{version}-%release}
+
%description -n pki-javadoc
This package contains PKI API documentation.
commit d8be3b97296f32499a97fb8d022394def2090ea0
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Tue Dec 4 10:54:44 2018 -0500
Update internal dependency versions
Signed-off-by: Alexander Scheel <ascheel(a)redhat.com>
diff --git a/pki-core.spec b/pki-core.spec
index 009729f..025e712 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,7 +8,7 @@ URL:
http://www.dogtagpki.org/
License: GPLv2 and LGPLv2
Version: 10.6.8
-Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
+Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -382,26 +382,26 @@ Summary: Dogtag PKI Package
# 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: %{brand}-pki-server-theme = %{version}-%{release}
+Requires: %{brand}-pki-console-theme = %{version}-%{release}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL PKI core packages
-Requires: pki-base-java >= %{version}
+Requires: pki-base-java = %{version}-%{release}
%if 0%{?with_python3}
-Requires: pki-base-python3 >= %{version}
+Requires: pki-base-python3 = %{version}-%{release}
%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-tools = %{version}-%{release}
+Requires: pki-server = %{version}-%{release}
+Requires: pki-ca = %{version}-%{release}
+Requires: pki-kra = %{version}-%{release}
+Requires: pki-ocsp = %{version}-%{release}
+Requires: pki-tks = %{version}-%{release}
+Requires: pki-tps = %{version}-%{release}
# Make certain that this 'meta' package requires the latest version(s)
# of PKI console
-Requires: pki-console >= %{version}
+Requires: pki-console = %{version}-%{release}
# Make certain that this 'meta' package requires the latest version(s)
# of ALL PKI clients
@@ -485,7 +485,7 @@ Provides: pki-base-python2 = %{version}-%{release}
%{?python_provide:%python_provide python2-pki}
%endif
-Requires: pki-base >= %{version}-%{release}
+Requires: pki-base = %{version}-%{release}
Requires: python2-cryptography
%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <=
27
Requires: python-nss
@@ -516,7 +516,7 @@ Provides: pki-base-python3 = %{version}-%{release}
%{?python_provide:%python_provide python3-pki}
%endif
-Requires: pki-base >= %{version}-%{release}
+Requires: pki-base = %{version}-%{release}
Requires: python3-cryptography
Requires: python3-lxml
Requires: python3-nss
@@ -557,7 +557,7 @@ Requires: jss >= 4.4.0-11
Requires: jss >= 4.5.0-1
%endif
Requires: ldapjdk >= 4.20
-Requires: pki-base >= %{version}-%{release}
+Requires: pki-base = %{version}-%{release}
%if 0%{?rhel} && 0%{?rhel} <= 7
# 'resteasy-base' is a subset of the complete set of
@@ -594,7 +594,7 @@ Summary: PKI Tools Package
Requires: openldap-clients
Requires: nss-tools >= 3.36.1
-Requires: pki-base-java >= %{version}-%{release}
+Requires: pki-base-java = %{version}-%{release}
%description -n pki-tools
This package contains PKI executables that can be used to help make
@@ -627,9 +627,9 @@ 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}-%{release}
+Requires: pki-base-java = %{version}-%{release}
+Requires: pki-tools = %{version}-%{release}
%if 0%{?rhel} && 0%{?rhel} <= 7
# no policycoreutils-python-utils
@@ -710,7 +710,7 @@ following PKI subsystems:
Summary: PKI CA Package
BuildArch: noarch
-Requires: pki-server >= %{version}-%{release}
+Requires: pki-server = %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -734,7 +734,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}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -764,7 +764,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}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -801,7 +801,7 @@ whenever they are issued or updated.
Summary: PKI TKS Package
BuildArch: noarch
-Requires: pki-server >= %{version}-%{release}
+Requires: pki-server = %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -831,7 +831,7 @@ behind the firewall with restricted access.
Summary: PKI TPS Package
-Requires: pki-server >= %{version}-%{release}
+Requires: pki-server = %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -888,8 +888,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}-%{release}
+Requires: pki-console-theme = %{version}-%{release}
%description -n pki-console
The PKI Console is a Java application used to administer PKI server.
@@ -1591,6 +1591,9 @@ fi
################################################################################
%changelog
+* Tue Dec 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-2
+- Updated internal dependency versions
+
* Fri Nov 30 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-1
- Rebased to PKI 10.6.8
commit 4022991627bf0ff4128f8f75156880666cf8fea1
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Fri Nov 30 13:32:39 2018 -0500
Rebased to 10.6.8
diff --git a/.gitignore b/.gitignore
index 338e412..5895c3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@
/pki-10.6.5.tar.gz
/pki-10.6.6.tar.gz
/pki-10.6.7.tar.gz
+/pki-10.6.8.tar.gz
diff --git a/0001-Fixed-default-token-normalization-in-initialization..patch
b/0001-Fixed-default-token-normalization-in-initialization..patch
deleted file mode 100644
index b79af16..0000000
--- a/0001-Fixed-default-token-normalization-in-initialization..patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 54edd1a7dd4e7e49bff4ef4fde15fc4d97802b00 Mon Sep 17 00:00:00 2001
-From: "Endi S. Dewata" <edewata(a)redhat.com>
-Date: Fri, 26 Oct 2018 04:29:20 -0400
-Subject: [PATCH] Fixed default token normalization in initialization.py (#83)
-
-Previously the initialization.py did not normalize the default
-token name in pki_self_signed_token which was blank. This caused
-an error when installing an additional subsystem into the same
-instance since the code could not find the existing internal
-token password from the first subsystem installation.
-
-The code has been modified to normalize the default token name
-into 'internal' such that it can find the existing internal token
-password.
-
-https://pagure.io/dogtagpki/issue/3073
----
- .../python/pki/server/deployment/scriptlets/initialization.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/base/server/python/pki/server/deployment/scriptlets/initialization.py
b/base/server/python/pki/server/deployment/scriptlets/initialization.py
-index 112c2e8e9..a75592736 100644
---- a/base/server/python/pki/server/deployment/scriptlets/initialization.py
-+++ b/base/server/python/pki/server/deployment/scriptlets/initialization.py
-@@ -46,21 +46,26 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
- instance.load()
-
- internal_token = deployer.mdict['pki_self_signed_token']
-+ if not pki.nssdb.normalize_token(internal_token):
-+ internal_token = pki.nssdb.INTERNAL_TOKEN_NAME
-
- # if instance already exists and has password, reuse the password
- if internal_token in instance.passwords:
-+ logger.info('Reusing server NSS database password')
- deployer.mdict['pki_server_database_password'] =
instance.passwords.get(internal_token)
-
- # otherwise, use user-provided password if specified
- elif deployer.mdict['pki_server_database_password']:
-- pass
-+ logger.info('Using specified server NSS database password')
-
- # otherwise, use user-provided pin if specified
- elif deployer.mdict['pki_pin']:
-+ logger.info('Using specified PIN as server NSS database password')
- deployer.mdict['pki_server_database_password'] =
deployer.mdict['pki_pin']
-
- # otherwise, generate a random password
- else:
-+ logger.info('Generating random server NSS database password')
- deployer.mdict['pki_server_database_password'] =
pki.generate_password()
-
- # generate random password for client database if not specified
---
-2.14.4
-
diff --git a/pki-core.spec b/pki-core.spec
index 6bf3573..009729f 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -7,16 +7,8 @@ URL:
http://www.dogtagpki.org/
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPLv2 and LGPLv2
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no arch exclusion
-%else
-# Exclude 's390' and 's390x' architectures since
-# 'esc' does not exist on these two platforms
-ExcludeArch: s390 s390x
-%endif
-
-Version: 10.6.7
-Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
+Version: 10.6.8
+Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -34,11 +26,6 @@ Source:
https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
# > pki-VERSION-RELEASE.patch
# Patch: pki-VERSION-RELEASE.patch
-# TODO: The following patches have landed in master and are necessary to fix
-# FreeIPA integration. Please remove next time PKI is released.
-Patch1: tiran-fix-certutil-token.patch
-Patch2: 0001-Fixed-default-token-normalization-in-initialization..patch
-
################################################################################
# NSS
################################################################################
@@ -206,6 +193,7 @@ BuildRequires: apache-commons-codec
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
BuildRequires: jakarta-commons-httpclient
+BuildRequires: glassfish-jaxb-api
BuildRequires: slf4j
%if 0%{?rhel} && 0%{?rhel} <= 7
# no slf4j-jdk14
@@ -260,11 +248,11 @@ BuildRequires: resteasy-atom-provider >= 3.0.17-1
BuildRequires: resteasy-client >= 3.0.17-1
BuildRequires: resteasy-jaxb-provider >= 3.0.17-1
BuildRequires: resteasy-core >= 3.0.17-1
-BuildRequires: resteasy-jackson-provider >= 3.0.17-1
+BuildRequires: resteasy-jackson2-provider >= 3.0.17-1
%endif
%if 0%{?with_python2}
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel}
# no pylint
%else
BuildRequires: pylint
@@ -279,7 +267,7 @@ BuildRequires: python2-pyflakes >= 1.2.3
%endif # with_python2
%if 0%{?with_python3}
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel}
# no pylint
%else
BuildRequires: python3-pylint
@@ -554,6 +542,7 @@ Requires: apache-commons-io
Requires: apache-commons-lang
Requires: apache-commons-logging
Requires: jakarta-commons-httpclient
+Requires: glassfish-jaxb-api
Requires: slf4j
%if 0%{?rhel} && 0%{?rhel} <= 7
# no slf4j-jdk14
@@ -585,7 +574,7 @@ Requires: resteasy-atom-provider >= 3.0.17-1
Requires: resteasy-client >= 3.0.17-1
Requires: resteasy-jaxb-provider >= 3.0.17-1
Requires: resteasy-core >= 3.0.17-1
-Requires: resteasy-jackson-provider >= 3.0.17-1
+Requires: resteasy-jackson2-provider >= 3.0.17-1
%endif
Requires: xalan-j2
@@ -698,6 +687,9 @@ Requires: tomcatjss >= 7.2.1-4
Requires: tomcatjss >= 7.3.6
%endif
+#
https://pagure.io/freeipa/issue/7742
+Conflicts: freeipa-server < 4.7.1
+
%description -n pki-server
The PKI Server Package contains libraries and utilities needed by the
following PKI subsystems:
@@ -902,12 +894,6 @@ Requires: pki-console-theme >= %{version}
%description -n pki-console
The PKI Console is a Java application used to administer PKI server.
-For deployment purposes, a PKI Console requires ONE AND ONLY ONE of the
-following "Mutually-Exclusive" PKI Theme packages:
-
- * dogtag-pki-console-theme (Dogtag Certificate System deployments)
- * redhat-pki-console-theme (Red Hat Certificate System deployments)
-
%endif # with console
%if %{with theme}
@@ -977,6 +963,7 @@ cd build
%if 0%{?with_python3_default}
-DWITH_PYTHON3_DEFAULT:BOOL=ON \
%endif
+ -DPYTHON_EXECUTABLE=%{__python3} \
-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 \
@@ -1102,7 +1089,7 @@ fi
rm -f %{buildroot}%{_datadir}/pki/server/lib/slf4j-jdk14.jar
%endif
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel}
# no pylint
%else
@@ -1581,6 +1568,7 @@ fi
%doc themes/%{brand}/common-ui/LICENSE
%dir %{_datadir}/pki
+%{_datadir}/pki/CS_SERVER_VERSION
%{_datadir}/pki/common-ui/
%{_datadir}/pki/server/webapps/pki/ca
%{_datadir}/pki/server/webapps/pki/css
@@ -1603,6 +1591,9 @@ fi
################################################################################
%changelog
+* Fri Nov 30 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-1
+- Rebased to PKI 10.6.8
+
* Fri Oct 26 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.7-3
- Fixed default token normalization in initialization.py
diff --git a/sources b/sources
index f61a50c..e8b3d53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.6.7.tar.gz) =
06174ade48cf458469e7bda106aabb0d0c580b7e6e14a6fbf1c068a92fb2b9c53653d2d67c5401292ad398a5413bf3febe2d09b5d3a463a1f17416fc7a906510
+SHA512 (pki-10.6.8.tar.gz) =
112f5290857477736a810f14058fbc27d9add3299da359a8818b1068f388e1a1ca6662a13ac745778cc66777d073caa23a2a46215155f77f30d3771a654b215d
diff --git a/tiran-fix-certutil-token.patch b/tiran-fix-certutil-token.patch
deleted file mode 100644
index 31cddae..0000000
--- a/tiran-fix-certutil-token.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0fba3c2710ee14f2d4ddb2bd401ed6d592f3f2b8 Mon Sep 17 00:00:00 2001
-From: Christian Heimes <cheimes(a)redhat.com>
-Date: Thu, 25 Oct 2018 15:10:06 +0200
-Subject: [PATCH] No missing token in verify_certificate_exists
-
-Remove the missing token check from verify_certificate_exists. It was
-the one place that was not adopted to use blank token as default.
-
-Change-Id: Ic192e0699ff32af474976039af08e1503925dfd1
-See: 17677ae4d2cda456b64ec67e2b25ba63f4a58a70
-Fixes:
https://pagure.io/dogtagpki/issue/3073
-Signed-off-by: Christian Heimes <cheimes(a)redhat.com>
----
- base/server/python/pki/server/deployment/pkihelper.py | 5 -----
- base/server/python/pki/server/deployment/pkimessages.py | 1 -
- 2 files changed, 6 deletions(-)
-
-diff --git a/base/server/python/pki/server/deployment/pkihelper.py
b/base/server/python/pki/server/deployment/pkihelper.py
-index 0346559da..3c7dbab7a 100644
---- a/base/server/python/pki/server/deployment/pkihelper.py
-+++ b/base/server/python/pki/server/deployment/pkihelper.py
-@@ -2436,11 +2436,6 @@ def verify_certificate_exists(self, path, token, nickname,
- # Specify the 'token'
- if token:
- command.extend(["-h", token])
-- else:
-- config.pki_log.error(
-- log.PKIHELPER_CERTUTIL_MISSING_TOKEN,
-- extra=config.PKI_INDENTATION_LEVEL_2)
-- raise Exception(log.PKIHELPER_CERTUTIL_MISSING_TOKEN)
- # Specify the nickname of this self-signed certificate
- if nickname:
- command.extend(["-n", nickname])
-diff --git a/base/server/python/pki/server/deployment/pkimessages.py
b/base/server/python/pki/server/deployment/pkimessages.py
-index a2723b04d..d6597e28d 100644
---- a/base/server/python/pki/server/deployment/pkimessages.py
-+++ b/base/server/python/pki/server/deployment/pkimessages.py
-@@ -188,7 +188,6 @@
- PKIHELPER_CERTUTIL_MISSING_SERIAL_NUMBER = \
- "certutil: Missing '-m serial-number' option!"
- PKIHELPER_CERTUTIL_MISSING_SUBJECT = "certutil: Missing '-s subject'
option!"
--PKIHELPER_CERTUTIL_MISSING_TOKEN = "certutil: Missing '-h token'
option!"
- PKIHELPER_CERTUTIL_MISSING_TRUSTARGS = \
- "certutil: Missing '-t trustargs' option!"
- PKIHELPER_CERTUTIL_MISSING_VALIDITY_PERIOD = \
commit dad511509643ba31ae8b4c8650893b86b2b55e31
Author: Endi S. Dewata <edewata(a)redhat.com>
Date: Fri Oct 26 21:58:34 2018 +0200
Fixed default token normalization in initialization.py
diff --git a/0001-Fixed-default-token-normalization-in-initialization..patch
b/0001-Fixed-default-token-normalization-in-initialization..patch
new file mode 100644
index 0000000..b79af16
--- /dev/null
+++ b/0001-Fixed-default-token-normalization-in-initialization..patch
@@ -0,0 +1,55 @@
+From 54edd1a7dd4e7e49bff4ef4fde15fc4d97802b00 Mon Sep 17 00:00:00 2001
+From: "Endi S. Dewata" <edewata(a)redhat.com>
+Date: Fri, 26 Oct 2018 04:29:20 -0400
+Subject: [PATCH] Fixed default token normalization in initialization.py (#83)
+
+Previously the initialization.py did not normalize the default
+token name in pki_self_signed_token which was blank. This caused
+an error when installing an additional subsystem into the same
+instance since the code could not find the existing internal
+token password from the first subsystem installation.
+
+The code has been modified to normalize the default token name
+into 'internal' such that it can find the existing internal token
+password.
+
+https://pagure.io/dogtagpki/issue/3073
+---
+ .../python/pki/server/deployment/scriptlets/initialization.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/base/server/python/pki/server/deployment/scriptlets/initialization.py
b/base/server/python/pki/server/deployment/scriptlets/initialization.py
+index 112c2e8e9..a75592736 100644
+--- a/base/server/python/pki/server/deployment/scriptlets/initialization.py
++++ b/base/server/python/pki/server/deployment/scriptlets/initialization.py
+@@ -46,21 +46,26 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
+ instance.load()
+
+ internal_token = deployer.mdict['pki_self_signed_token']
++ if not pki.nssdb.normalize_token(internal_token):
++ internal_token = pki.nssdb.INTERNAL_TOKEN_NAME
+
+ # if instance already exists and has password, reuse the password
+ if internal_token in instance.passwords:
++ logger.info('Reusing server NSS database password')
+ deployer.mdict['pki_server_database_password'] =
instance.passwords.get(internal_token)
+
+ # otherwise, use user-provided password if specified
+ elif deployer.mdict['pki_server_database_password']:
+- pass
++ logger.info('Using specified server NSS database password')
+
+ # otherwise, use user-provided pin if specified
+ elif deployer.mdict['pki_pin']:
++ logger.info('Using specified PIN as server NSS database password')
+ deployer.mdict['pki_server_database_password'] =
deployer.mdict['pki_pin']
+
+ # otherwise, generate a random password
+ else:
++ logger.info('Generating random server NSS database password')
+ deployer.mdict['pki_server_database_password'] =
pki.generate_password()
+
+ # generate random password for client database if not specified
+--
+2.14.4
+
diff --git a/pki-core.spec b/pki-core.spec
index db5e713..6bf3573 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -16,7 +16,7 @@ ExcludeArch: s390 s390x
%endif
Version: 10.6.7
-Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
+Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@@ -34,9 +34,10 @@ Source:
https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
# > pki-VERSION-RELEASE.patch
# Patch: pki-VERSION-RELEASE.patch
-# TODO: The following patch has landed in master and is necessary to fix
+# TODO: The following patches have landed in master and are necessary to fix
# FreeIPA integration. Please remove next time PKI is released.
Patch1: tiran-fix-certutil-token.patch
+Patch2: 0001-Fixed-default-token-normalization-in-initialization..patch
################################################################################
# NSS
@@ -1602,6 +1603,12 @@ fi
################################################################################
%changelog
+* Fri Oct 26 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.7-3
+- Fixed default token normalization in initialization.py
+
+* Thu Oct 25 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.7-2
+- Fixed missing token in verify_certificate_exists
+
* Thu Oct 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.7-1
- Rebased to PKI 10.6.7
commit 1d2ceeb9fe9d958932f8bb00ad8f0adc47d846b7
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Thu Oct 25 11:08:24 2018 -0400
Increment version to 10.6.7-2
Signed-off-by: Alexander Scheel <ascheel(a)redhat.com>
diff --git a/pki-core.spec b/pki-core.spec
index 8391a22..db5e713 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -16,7 +16,7 @@ ExcludeArch: s390 s390x
%endif
Version: 10.6.7
-Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
+Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
commit 99254ad80b5a01e8048bcdf961fa5fbd5a6f6a44
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Thu Oct 25 11:06:46 2018 -0400
Backport No missing token in verify_certificate_exists
Signed-off-by: Alexander Scheel <ascheel(a)redhat.com>
diff --git a/pki-core.spec b/pki-core.spec
index 814cdee..8391a22 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -34,6 +34,10 @@ Source:
https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
# > pki-VERSION-RELEASE.patch
# Patch: pki-VERSION-RELEASE.patch
+# TODO: The following patch has landed in master and is necessary to fix
+# FreeIPA integration. Please remove next time PKI is released.
+Patch1: tiran-fix-certutil-token.patch
+
################################################################################
# NSS
################################################################################
diff --git a/tiran-fix-certutil-token.patch b/tiran-fix-certutil-token.patch
new file mode 100644
index 0000000..31cddae
--- /dev/null
+++ b/tiran-fix-certutil-token.patch
@@ -0,0 +1,45 @@
+From 0fba3c2710ee14f2d4ddb2bd401ed6d592f3f2b8 Mon Sep 17 00:00:00 2001
+From: Christian Heimes <cheimes(a)redhat.com>
+Date: Thu, 25 Oct 2018 15:10:06 +0200
+Subject: [PATCH] No missing token in verify_certificate_exists
+
+Remove the missing token check from verify_certificate_exists. It was
+the one place that was not adopted to use blank token as default.
+
+Change-Id: Ic192e0699ff32af474976039af08e1503925dfd1
+See: 17677ae4d2cda456b64ec67e2b25ba63f4a58a70
+Fixes:
https://pagure.io/dogtagpki/issue/3073
+Signed-off-by: Christian Heimes <cheimes(a)redhat.com>
+---
+ base/server/python/pki/server/deployment/pkihelper.py | 5 -----
+ base/server/python/pki/server/deployment/pkimessages.py | 1 -
+ 2 files changed, 6 deletions(-)
+
+diff --git a/base/server/python/pki/server/deployment/pkihelper.py
b/base/server/python/pki/server/deployment/pkihelper.py
+index 0346559da..3c7dbab7a 100644
+--- a/base/server/python/pki/server/deployment/pkihelper.py
++++ b/base/server/python/pki/server/deployment/pkihelper.py
+@@ -2436,11 +2436,6 @@ def verify_certificate_exists(self, path, token, nickname,
+ # Specify the 'token'
+ if token:
+ command.extend(["-h", token])
+- else:
+- config.pki_log.error(
+- log.PKIHELPER_CERTUTIL_MISSING_TOKEN,
+- extra=config.PKI_INDENTATION_LEVEL_2)
+- raise Exception(log.PKIHELPER_CERTUTIL_MISSING_TOKEN)
+ # Specify the nickname of this self-signed certificate
+ if nickname:
+ command.extend(["-n", nickname])
+diff --git a/base/server/python/pki/server/deployment/pkimessages.py
b/base/server/python/pki/server/deployment/pkimessages.py
+index a2723b04d..d6597e28d 100644
+--- a/base/server/python/pki/server/deployment/pkimessages.py
++++ b/base/server/python/pki/server/deployment/pkimessages.py
+@@ -188,7 +188,6 @@
+ PKIHELPER_CERTUTIL_MISSING_SERIAL_NUMBER = \
+ "certutil: Missing '-m serial-number' option!"
+ PKIHELPER_CERTUTIL_MISSING_SUBJECT = "certutil: Missing '-s subject'
option!"
+-PKIHELPER_CERTUTIL_MISSING_TOKEN = "certutil: Missing '-h token'
option!"
+ PKIHELPER_CERTUTIL_MISSING_TRUSTARGS = \
+ "certutil: Missing '-t trustargs' option!"
+ PKIHELPER_CERTUTIL_MISSING_VALIDITY_PERIOD = \