Rebase dogtag-pki to v10.6.9
Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
This commit is contained in:
Dinesh Prasanth M K
parent
1a3b1adfeb
commit
a6d0d287e4
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
||||
118
dogtag-pki.spec
118
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@redhat.com> - 10.6.9-1
|
||||
- Rebased to PKI 10.6.9
|
||||
|
||||
* Tue Dec 04 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.8-3
|
||||
- Conflict older PKI versions
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (pki-10.6.8.tar.gz) = 112f5290857477736a810f14058fbc27d9add3299da359a8818b1068f388e1a1ca6662a13ac745778cc66777d073caa23a2a46215155f77f30d3771a654b215d
|
||||
SHA512 (pki-10.6.9.tar.gz) = 093a34b6d3b6c36bfa620be653207ed43d345fa7bb2bf704cf306905247e2cb2cd71502c5f02acb2bebd18879a011b62e415236cc9b1db20709d3a51863ee65b
|
||||
|
||||
Loading…
Reference in New Issue
Block a user