The package rpms/dogtag-pki.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/dogtag-pki.git/commit/?id=99bad34...
https://src.fedoraproject.org/cgit/rpms/dogtag-pki.git/commit/?id=3fd10fb....
Change:
-ExcludeArch: s390 s390x
+ExcludeArch: s390 s390x
Thanks.
Full change:
============
commit 40844037414ccaf99ea18032d3f977494d0df1a5
Merge: f805aec 263c294
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Tue May 7 18:11:29 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 263c294814caac55acb35943b55602c9d36d5520
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Tue May 7 16:54:45 2019 -0400
Rebase PKI 10.7.0
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index f6e349f..67dd762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,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/dogtag-pki.spec b/dogtag-pki.spec
index c454fdc..999df00 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.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:
@@ -240,31 +240,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
@@ -313,24 +288,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
@@ -343,6 +310,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
@@ -376,21 +350,22 @@ 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
@@ -432,10 +407,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.
@@ -449,13 +430,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.
@@ -469,12 +456,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
@@ -500,12 +487,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
@@ -538,15 +525,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
@@ -583,7 +569,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
@@ -610,9 +600,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
@@ -667,7 +658,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
@@ -693,7 +684,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
@@ -717,7 +708,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
@@ -747,7 +738,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
@@ -784,7 +775,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
@@ -814,7 +805,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
@@ -855,6 +846,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.
@@ -871,8 +868,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.
@@ -893,7 +890,13 @@ following "Mutually-Exclusive" PKI Theme packages:
Summary: Dogtag 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
This PKI Server Theme Package contains
@@ -906,7 +909,13 @@ 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}
+
+# 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 %{brand}-pki-console-theme
This PKI Console Theme Package contains
@@ -1005,7 +1014,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
@@ -1046,8 +1054,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
@@ -1078,56 +1084,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}
@@ -1350,6 +1306,7 @@ fi
%{_bindir}/OCSPClient
%{_bindir}/PKCS10Client
%{_bindir}/PKCS12Export
+%{_bindir}/PKICertImport
%{_bindir}/PrettyPrintCert
%{_bindir}/PrettyPrintCrl
%{_bindir}/TokenInfo
@@ -1368,13 +1325,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
@@ -1384,6 +1341,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
@@ -1580,69 +1538,5 @@ fi
################################################################################
%changelog
-* Thu Jan 31 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
-
-* 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-team(a)redhat.com> - 10.6.8-1
-- Rebased to PKI 10.6.8
-
-* Mon Aug 13 2018 Dogtag PKI Team <pki-team(a)redhat.com> - 10.6.7-1
-- Rebased to PKI 10.6.7
-
-* Mon Aug 13 2018 Dogtag PKI Team <pki-team(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
-
-* Thu Jul 12 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
-
-* 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
-
-* 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
-
-* Mon Apr 09 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.0-1
-- Updated project URL
-- Cleaned up spec file
-- Fixed README location
-- Rebased to PKI 10.6.0 final
-
-* Thu Mar 29 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.0-0.3
-- Rebased to PKI 10.6.0 beta2
-
-* Thu Mar 15 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.0-0.2
-- Rebased to PKI 10.6.0 beta
-
+* Tue May 07 2019 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.7.0-1
+- Rebased to PKI 10.7.0
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 b521c97b53898db0e6dbdae65275571e2f3e6434
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 31 17:29:09 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/dogtag-pki.spec b/dogtag-pki.spec
index 46b5095..c454fdc 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.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:
@@ -1580,6 +1580,9 @@ fi
################################################################################
%changelog
+* Thu Jan 31 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 a6d0d287e47e26ac7528516a521674b3f932b4c7
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Tue Jan 15 12:44:08 2019 -0500
Rebase dogtag-pki to v10.6.9
Signed-off-by: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index c0ad13e..f6e349f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,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/dogtag-pki.spec b/dogtag-pki.spec
index 15391a6..46b5095 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.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: 3%{?_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:
@@ -174,6 +174,7 @@ fi;
# autosetup
BuildRequires: git
+BuildRequires: make
BuildRequires: cmake >= 2.8.9-1
BuildRequires: gcc-c++
@@ -196,12 +197,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
@@ -301,12 +296,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
@@ -375,26 +371,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
@@ -438,20 +434,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
@@ -473,19 +456,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.
@@ -504,7 +474,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
@@ -535,7 +505,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
@@ -576,7 +546,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
@@ -613,7 +583,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
@@ -632,12 +602,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
@@ -646,9 +610,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
@@ -729,7 +693,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
@@ -753,7 +717,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
@@ -783,7 +747,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
@@ -820,7 +784,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
@@ -850,7 +814,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
@@ -891,19 +855,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.
@@ -920,8 +871,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.
@@ -1449,7 +1400,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/
@@ -1462,6 +1412,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
@@ -1629,6 +1580,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
+
* Tue Dec 04 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.8-3
- Conflict older PKI versions
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 1a3b1adfeb7d7ad5ad89d2408a5222f9a2f9abe3
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Tue Dec 4 14:02:15 2018 -0500
Add internal conflicts against old versions, bump to patchset -3
Signed-off-by: Alexander Scheel <ascheel(a)redhat.com>
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index 27ff7eb..15391a6 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.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:
@@ -440,6 +440,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.
@@ -460,6 +473,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.
@@ -865,6 +891,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.
@@ -1590,6 +1629,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 246750c37fc0a0fab55a1518f24d7c5251c1cde9
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Tue Dec 4 11:03:20 2018 -0500
Updated internal dependency versions
Signed-off-by: Alexander Scheel <ascheel(a)redhat.com>
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index c280781..27ff7eb 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.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:
@@ -375,26 +375,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
@@ -478,7 +478,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
@@ -509,7 +509,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
@@ -550,7 +550,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
@@ -587,7 +587,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
@@ -620,9 +620,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
@@ -703,7 +703,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
@@ -727,7 +727,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
@@ -757,7 +757,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
@@ -794,7 +794,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
@@ -824,7 +824,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
@@ -881,8 +881,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.
@@ -1590,6 +1590,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-team(a)redhat.com> - 10.6.8-1
- Rebased to PKI 10.6.8
commit 99bad34f3f288d98a662329c7defb5293417dbd7
Author: Dinesh Prasanth M K <dmoluguw(a)redhat.com>
Date: Fri Nov 30 15:56:35 2018 -0500
Rebased to PKI 10.6.8
diff --git a/.gitignore b/.gitignore
index d3af8cd..c0ad13e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,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/dogtag-pki.spec b/dogtag-pki.spec
index 4dec726..c280781 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -7,15 +7,7 @@ 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
+Version: 10.6.8
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
@@ -194,6 +186,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
@@ -248,11 +241,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
@@ -267,7 +260,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
@@ -542,6 +535,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
@@ -573,7 +567,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
@@ -686,6 +680,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:
@@ -965,6 +962,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 \
@@ -1090,7 +1088,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
@@ -1569,6 +1567,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
@@ -1591,6 +1590,9 @@ fi
################################################################################
%changelog
+* Fri Nov 30 2018 Dogtag PKI Team <pki-team(a)redhat.com> - 10.6.8-1
+- Rebased to PKI 10.6.8
+
* Mon Aug 13 2018 Dogtag PKI Team <pki-team(a)redhat.com> - 10.6.7-1
- Rebased to PKI 10.6.7
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
commit 3fd10fb37e67b4dc246f5f2b05791e1eaeed86a3
Author: Alexander Scheel <ascheel(a)redhat.com>
Date: Thu Oct 4 17:20:03 2018 -0400
Rebased to PKI 10.6.7
diff --git a/.gitignore b/.gitignore
index 1a087fb..d3af8cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/pki-10.6.4.tar.gz
/pki-10.6.5.tar.gz
/pki-10.6.6.tar.gz
+/pki-10.6.7.tar.gz
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index 8237cad..4dec726 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -10,12 +10,12 @@ License: GPLv2 and LGPLv2
%if 0%{?rhel} && 0%{?rhel} <= 7
# no arch exclusion
%else
-# Exclude 'aarch64' and 's390x' architectures since
+# Exclude 's390' and 's390x' architectures since
# 'esc' does not exist on these two platforms
-ExcludeArch: aarch64 s390x
+ExcludeArch: s390 s390x
%endif
-Version: 10.6.6
+Version: 10.6.7
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
@@ -206,7 +206,7 @@ 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.3-13
+BuildRequires: nuxwdog-client-java >= 1.0.5
%endif
BuildRequires: openldap-devel
@@ -325,7 +325,7 @@ BuildRequires: jss >= 4.4.0-11
BuildRequires: tomcatjss >= 7.2.1-4
%else
BuildRequires: jss >= 4.5.0-1
-BuildRequires: tomcatjss >= 7.3.5
+BuildRequires: tomcatjss >= 7.3.6
%endif
BuildRequires: systemd-units
@@ -615,7 +615,7 @@ Requires: net-tools
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: nuxwdog-client-java >= 1.0.3-7
%else
-Requires: nuxwdog-client-java >= 1.0.3-13
+Requires: nuxwdog-client-java >= 1.0.5
%endif
Requires: policycoreutils
@@ -683,7 +683,7 @@ Requires(pre): shadow-utils
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: tomcatjss >= 7.2.1-4
%else
-Requires: tomcatjss >= 7.3.5
+Requires: tomcatjss >= 7.3.6
%endif
%description -n pki-server
@@ -1591,6 +1591,9 @@ fi
################################################################################
%changelog
+* Mon Aug 13 2018 Dogtag PKI Team <pki-team(a)redhat.com> - 10.6.7-1
+- Rebased to PKI 10.6.7
+
* Mon Aug 13 2018 Dogtag PKI Team <pki-team(a)redhat.com> - 10.6.6-1
- Rebased to PKI 10.6.6
diff --git a/sources b/sources
index 103d51b..f61a50c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.6.6.tar.gz) =
7f64a5b991ae9997c009ee8fb69968713cd5c0297e68bc1c0e35628839c4e64db709599985ea739cf35133e145c4ca6d24e62728648f9460026aaecb3b2dc79d
+SHA512 (pki-10.6.7.tar.gz) =
06174ade48cf458469e7bda106aabb0d0c580b7e6e14a6fbf1c068a92fb2b9c53653d2d67c5401292ad398a5413bf3febe2d09b5d3a463a1f17416fc7a906510