rpms/dogtag-pki
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebased to PKI 10.6.6

Browse Source
This commit is contained in:
Endi S. Dewata 2018-08-13 23:26:05 +02:00
parent 24461c6d87
commit 715ea5c074
3 changed files with 65 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/pki-10.6.3.tar.gz
/pki-10.6.4.tar.gz
/pki-10.6.5.tar.gz
/pki-10.6.6.tar.gz

238
dogtag-pki.spec
View File

@ -15,7 +15,7 @@ License: GPLv2 and LGPLv2
ExcludeArch: aarch64 s390x
%endif
Version: 10.6.5
Version: 10.6.6
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
@ -156,6 +156,8 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
%define pki_gid 17
%define pki_homedir /usr/share/pki
%global brand dogtag
%global saveFileContext() \
if [ -s /etc/selinux/config ]; then \
. %{_sysconfdir}/selinux/config; \
@ -186,7 +188,7 @@ BuildRequires: gcc-c++
BuildRequires: zip
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: redhat-rpm-config
BuildRequires: ldapjdk >= 4.19-5
BuildRequires: ldapjdk >= 4.20
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-io
@ -322,8 +324,8 @@ BuildRequires: jpackage-utils >= 0:1.7.5-10
BuildRequires: jss >= 4.4.0-11
BuildRequires: tomcatjss >= 7.2.1-4
%else
BuildRequires: jss >= 4.5.0-0.6
BuildRequires: tomcatjss >= 7.3.4
BuildRequires: jss >= 4.5.0-1
BuildRequires: tomcatjss >= 7.3.5
%endif
BuildRequires: systemd-units
@ -352,16 +354,39 @@ BuildRequires: systemd
BuildRequires: zlib
BuildRequires: zlib-devel
# description for top-level package (if there is a separate meta package)
%if "%{name}" != "%{brand}-pki"
%description
Dogtag PKI is an enterprise software system designed
to manage enterprise Public Key Infrastructure deployments.
PKI consists of the following components:
* Certificate Authority (CA)
* Key Recovery Authority (KRA)
* Online Certificate Status Protocol (OCSP) Manager
* Token Key Service (TKS)
* Token Processing Service (TPS)
%endif
%if %{with meta}
%if "%{name}" != "%{brand}-pki"
################################################################################
%package -n %{brand}-pki
################################################################################
Summary: Dogtag PKI Package
%endif
# Make certain that this 'meta' package requires the latest version(s)
# of ALL PKI theme packages
Requires: %{name}-server-theme >= %{version}
Requires: %{name}-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 >= %{version}
Requires: pki-base-java >= %{version}
%if 0%{?with_python3}
Requires: pki-base-python3 >= %{version}
@ -386,9 +411,12 @@ Requires: esc >= 1.1.0
Requires: esc >= 1.1.1
%endif
%endif # with meta
# description for top-level package (unless there is a separate meta package)
%if "%{name}" == "%{brand}-pki"
%description
%else
%description -n %{brand}-pki
%endif
Dogtag PKI is an enterprise software system designed
to manage enterprise Public Key Infrastructure deployments.
@ -401,6 +429,8 @@ PKI consists of the following components:
* Token Key Service (TKS)
* Token Processing Service (TPS)
%endif # with meta
%if %{with base}
################################################################################
%package -n pki-symkey
@ -413,31 +443,10 @@ 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-0.6
Requires: jss >= 4.5.0-1
%endif
Requires: nss >= 3.36.1
Provides: symkey = %{version}-%{release}
Obsoletes: symkey < %{version}-%{release}
%if 0%{?rhel} && 0%{?rhel} <= 7
## Because RHCS 9.0 does not run on RHEL 7.3+, obsolete all
## RHCS 9.0 packages that can be replaced by RHCS 9.1 packages:
# pki-console
Obsoletes: pki-console < 10.3.0
# pki-core
Obsoletes: pki-core-debug = 10.2.6
Obsoletes: pki-ocsp < 10.3.0
Obsoletes: pki-tks < 10.3.0
Obsoletes: pki-tps < 10.3.0
# redhat-pki
Obsoletes: redhat-pki < 10.3.0
# redhat-pki-theme
Obsoletes: redhat-pki-console-theme < 10.3.0
Obsoletes: redhat-pki-server-theme < 10.3.0
%endif
%description -n pki-symkey
The PKI Symmetric Key Java Package supplies various native
symmetric key operations to Java programs.
@ -449,14 +458,6 @@ symmetric key operations to Java programs.
Summary: PKI Base Package
BuildArch: noarch
Provides: pki-common = %{version}-%{release}
Provides: pki-util = %{version}-%{release}
Obsoletes: pki-common < %{version}-%{release}
Obsoletes: pki-util < %{version}-%{release}
Conflicts: freeipa-server < 3.0.0
Requires: nss >= 3.36.1
%if 0%{?with_python3_default}
Requires: python3-pki = %{version}-%{release}
@ -552,9 +553,9 @@ 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-0.6
Requires: jss >= 4.5.0-1
%endif
Requires: ldapjdk >= 4.19-5
Requires: ldapjdk >= 4.20
Requires: pki-base >= %{version}-%{release}
%if 0%{?rhel} && 0%{?rhel} <= 7
@ -590,18 +591,9 @@ written in Java.
Summary: PKI Tools Package
Provides: pki-native-tools = %{version}-%{release}
Provides: pki-java-tools = %{version}-%{release}
Obsoletes: pki-native-tools < %{version}-%{release}
Obsoletes: pki-java-tools < %{version}-%{release}
Requires: openldap-clients
Requires: nss-tools >= 3.36.1
Requires: java-1.8.0-openjdk-headless
Requires: pki-base >= %{version}-%{release}
Requires: pki-base-java >= %{version}-%{release}
Requires: jpackage-utils >= 0:1.7.5-10
%description -n pki-tools
This package contains PKI executables that can be used to help make
@ -617,15 +609,6 @@ Certificate System into a more complete and robust PKI solution.
Summary: PKI Server Package
BuildArch: noarch
Provides: pki-deploy = %{version}-%{release}
Provides: pki-setup = %{version}-%{release}
Provides: pki-silent = %{version}-%{release}
Obsoletes: pki-deploy < %{version}-%{release}
Obsoletes: pki-setup < %{version}-%{release}
Obsoletes: pki-silent < %{version}-%{release}
Requires: java-1.8.0-openjdk-headless
Requires: hostname
Requires: net-tools
@ -644,7 +627,6 @@ Requires: openssl >= 1.0.2k-11
Requires: openssl
%endif
Requires: pki-symkey >= %{version}-%{release}
Requires: pki-base >= %{version}-%{release}
Requires: pki-base-java >= %{version}-%{release}
Requires: pki-tools >= %{version}-%{release}
@ -701,24 +683,7 @@ Requires(pre): shadow-utils
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: tomcatjss >= 7.2.1-4
%else
Requires: tomcatjss >= 7.3.4
%endif
%if 0%{?rhel} && 0%{?rhel} <= 7
## Because RHCS 9.0 does not run on RHEL 7.3+, obsolete all
## RHCS 9.0 packages that can be replaced by RHCS 9.1 packages:
# pki-console
Obsoletes: pki-console < 10.3.0
# pki-core
Obsoletes: pki-core-debug = 10.2.6
Obsoletes: pki-ocsp < 10.3.0
Obsoletes: pki-tks < 10.3.0
Obsoletes: pki-tps < 10.3.0
# redhat-pki
Obsoletes: redhat-pki < 10.3.0
# redhat-pki-theme
Obsoletes: redhat-pki-console-theme < 10.3.0
Obsoletes: redhat-pki-server-theme < 10.3.0
Requires: tomcatjss >= 7.3.5
%endif
%description -n pki-server
@ -741,7 +706,6 @@ following PKI subsystems:
Summary: PKI CA Package
BuildArch: noarch
Requires: java-1.8.0-openjdk-headless
Requires: pki-server >= %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
@ -766,7 +730,6 @@ where it obtains its own signing certificate from a public CA.
Summary: PKI KRA Package
BuildArch: noarch
Requires: java-1.8.0-openjdk-headless
Requires: pki-server >= %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
@ -797,7 +760,6 @@ since such archival would undermine non-repudiation properties of signing keys.
Summary: PKI OCSP Package
BuildArch: noarch
Requires: java-1.8.0-openjdk-headless
Requires: pki-server >= %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
@ -835,7 +797,6 @@ whenever they are issued or updated.
Summary: PKI TKS Package
BuildArch: noarch
Requires: java-1.8.0-openjdk-headless
Requires: pki-server >= %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
@ -866,13 +827,6 @@ behind the firewall with restricted access.
Summary: PKI TPS Package
Provides: pki-tps-tomcat = %{version}-%{release}
Provides: pki-tps-client = %{version}-%{release}
Obsoletes: pki-tps-tomcat < %{version}-%{release}
Obsoletes: pki-tps-client < %{version}-%{release}
Requires: java-1.8.0-openjdk-headless
Requires: pki-server >= %{version}-%{release}
Requires(post): systemd-units
Requires(preun): systemd-units
@ -914,14 +868,6 @@ smart card.
Summary: PKI Javadoc Package
BuildArch: noarch
Provides: pki-util-javadoc = %{version}-%{release}
Provides: pki-java-tools-javadoc = %{version}-%{release}
Provides: pki-common-javadoc = %{version}-%{release}
Obsoletes: pki-util-javadoc < %{version}-%{release}
Obsoletes: pki-java-tools-javadoc < %{version}-%{release}
Obsoletes: pki-common-javadoc < %{version}-%{release}
%description -n pki-javadoc
This package contains PKI API documentation.
@ -935,14 +881,11 @@ This package contains PKI API documentation.
Summary: PKI Console Package
BuildArch: noarch
BuildRequires: idm-console-framework >= 1.1.17-4
BuildRequires: idm-console-framework >= 1.2.0
Requires: idm-console-framework >= 1.1.17-4
Requires: java-1.8.0-openjdk
Requires: ldapjdk >= 4.19-5
Requires: idm-console-framework >= 1.2.0
Requires: pki-base-java >= %{version}
Requires: pki-console-theme >= %{version}
Requires: jpackage-utils >= 1.7.5-10
%description -n pki-console
The PKI Console is a Java application used to administer PKI server.
@ -957,73 +900,28 @@ following "Mutually-Exclusive" PKI Theme packages:
%if %{with theme}
################################################################################
%package -n %{name}-server-theme
%package -n %{brand}-pki-server-theme
################################################################################
Summary: Dogtag PKI Server Theme Package
BuildArch: noarch
Obsoletes: %{name}-common-theme < %{version}-%{release}
Obsoletes: %{name}-common-ui < %{version}-%{release}
Obsoletes: %{name}-ca-theme < %{version}-%{release}
Obsoletes: %{name}-ca-ui < %{version}-%{release}
Obsoletes: %{name}-kra-theme < %{version}-%{release}
Obsoletes: %{name}-kra-ui < %{version}-%{release}
Obsoletes: %{name}-ocsp-theme < %{version}-%{release}
Obsoletes: %{name}-ocsp-ui < %{version}-%{release}
Obsoletes: %{name}-tks-theme < %{version}-%{release}
Obsoletes: %{name}-tks-ui < %{version}-%{release}
Obsoletes: %{name}-tps-theme < %{version}-%{release}
Obsoletes: %{name}-tps-ui < %{version}-%{release}
Provides: %{name}-common-theme = %{version}-%{release}
Provides: %{name}-common-ui = %{version}-%{release}
Provides: %{name}-ca-theme = %{version}-%{release}
Provides: %{name}-ca-ui = %{version}-%{release}
Provides: %{name}-kra-theme = %{version}-%{release}
Provides: %{name}-kra-ui = %{version}-%{release}
Provides: %{name}-ocsp-theme = %{version}-%{release}
Provides: %{name}-ocsp-ui = %{version}-%{release}
Provides: %{name}-tks-theme = %{version}-%{release}
Provides: %{name}-tks-ui = %{version}-%{release}
Provides: %{name}-tps-theme = %{version}-%{release}
Provides: %{name}-tps-ui = %{version}-%{release}
Provides: pki-server-theme = %{version}-%{release}
Provides: pki-common-theme = %{version}-%{release}
Provides: pki-common-ui = %{version}-%{release}
Provides: pki-ca-theme = %{version}-%{release}
Provides: pki-ca-ui = %{version}-%{release}
Provides: pki-kra-theme = %{version}-%{release}
Provides: pki-kra-ui = %{version}-%{release}
Provides: pki-ocsp-theme = %{version}-%{release}
Provides: pki-ocsp-ui = %{version}-%{release}
Provides: pki-tks-theme = %{version}-%{release}
Provides: pki-tks-ui = %{version}-%{release}
Provides: pki-tps-theme = %{version}-%{release}
Provides: pki-tps-ui = %{version}-%{release}
%description -n %{name}-server-theme
%description -n %{brand}-pki-server-theme
This PKI Server Theme Package contains
Dogtag textual and graphical user interface for PKI Server.
################################################################################
%package -n %{name}-console-theme
%package -n %{brand}-pki-console-theme
################################################################################
Summary: Dogtag PKI Console Theme Package
BuildArch: noarch
%if 0%{?rhel}
# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
Conflicts: redhat-pki-console-theme
Conflicts: redhat-pki-console-ui
%endif
Provides: pki-console-theme = %{version}-%{release}
Provides: pki-console-ui = %{version}-%{release}
%description -n %{name}-console-theme
%description -n %{brand}-pki-console-theme
This PKI Console Theme Package contains
Dogtag textual and graphical user interface for PKI Console.
@ -1073,7 +971,7 @@ cd build
%endif
-DWITH_JAVADOC:BOOL=%{?with_javadoc:ON}%{!?with_javadoc:OFF} \
-DBUILD_PKI_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \
-DBUILD_DOGTAG_PKI_THEME:BOOL=%{?with_theme:ON}%{!?with_theme:OFF} \
-DTHEME=%{?with_theme:%{brand}} \
..
################################################################################
@ -1095,7 +993,7 @@ cd build
%{__mkdir_p} %{buildroot}%{_datadir}/doc/pki
cat > %{buildroot}%{_datadir}/doc/pki/README << EOF
This package is just a "meta-package" whose dependencies pull in all of the
This package is a "meta-package" whose dependencies pull in all of the
packages comprising the Dogtag Public Key Infrastructure (PKI) Suite.
EOF
%endif # with meta
@ -1349,11 +1247,14 @@ fi
%endif # with server
%if %{with meta}
%if "%{name}" != "%{brand}-pki"
################################################################################
%files -n %{brand}-pki
################################################################################
%else
%files
################################################################################
%endif
%defattr(-,root,root,-)
%doc %{_datadir}/doc/pki/README
%endif # with meta
@ -1363,7 +1264,6 @@ fi
%files -n pki-symkey
################################################################################
%defattr(-,root,root,-)
%doc base/symkey/LICENSE
%{_jnidir}/symkey.jar
%{_libdir}/symkey/
@ -1372,7 +1272,6 @@ fi
%files -n pki-base
################################################################################
%defattr(-,root,root,-)
%doc base/common/LICENSE
%doc base/common/LICENSE.LESSER
%doc %{_datadir}/doc/pki-base/html
@ -1398,7 +1297,6 @@ fi
%files -n python2-pki
################################################################################
%defattr(-,root,root,-)
%doc base/common/LICENSE
%doc base/common/LICENSE.LESSER
%if %{with server} && ! %{?with_python3_default}
@ -1411,7 +1309,6 @@ fi
%files -n pki-base-java
################################################################################
%defattr(-,root,root,-)
%doc base/common/LICENSE
%doc base/common/LICENSE.LESSER
%{_datadir}/pki/examples/java/
@ -1426,7 +1323,6 @@ fi
%files -n python3-pki
################################################################################
%defattr(-,root,root,-)
%doc base/common/LICENSE
%doc base/common/LICENSE.LESSER
%if %{with server} && %{?with_python3_default}
@ -1439,7 +1335,6 @@ fi
%files -n pki-tools
################################################################################
%defattr(-,root,root,-)
%doc base/native-tools/LICENSE base/native-tools/doc/README
%{_bindir}/pki
%{_bindir}/p7tool
@ -1509,7 +1404,6 @@ fi
%files -n pki-server
################################################################################
%defattr(-,root,root,-)
%doc base/common/THIRD_PARTY_LICENSES
%doc base/server/LICENSE
%doc base/server/README
@ -1569,7 +1463,6 @@ fi
%files -n pki-ca
################################################################################
%defattr(-,root,root,-)
%doc base/ca/LICENSE
%{_javadir}/pki/pki-ca.jar
%dir %{_datadir}/pki/ca
@ -1587,7 +1480,6 @@ fi
%files -n pki-kra
################################################################################
%defattr(-,root,root,-)
%doc base/kra/LICENSE
%{_javadir}/pki/pki-kra.jar
%dir %{_datadir}/pki/kra
@ -1602,7 +1494,6 @@ fi
%files -n pki-ocsp
################################################################################
%defattr(-,root,root,-)
%doc base/ocsp/LICENSE
%{_javadir}/pki/pki-ocsp.jar
%dir %{_datadir}/pki/ocsp
@ -1617,7 +1508,6 @@ fi
%files -n pki-tks
################################################################################
%defattr(-,root,root,-)
%doc base/tks/LICENSE
%{_javadir}/pki/pki-tks.jar
%dir %{_datadir}/pki/tks
@ -1632,7 +1522,6 @@ fi
%files -n pki-tps
################################################################################
%defattr(-,root,root,-)
%doc base/tps/LICENSE
%{_javadir}/pki/pki-tps.jar
%dir %{_datadir}/pki/tps
@ -1658,7 +1547,6 @@ fi
%files -n pki-javadoc
################################################################################
%defattr(-,root,root,-)
%{_javadocdir}/pki-%{version}/
%endif # with javadoc
@ -1668,7 +1556,6 @@ fi
%files -n pki-console
################################################################################
%defattr(-,root,root,-)
%doc base/console/LICENSE
%{_bindir}/pkiconsole
%{_javadir}/pki/pki-console.jar
@ -1677,11 +1564,10 @@ fi
%if %{with theme}
################################################################################
%files -n %{name}-server-theme
%files -n %{brand}-pki-server-theme
################################################################################
%defattr(-,root,root,-)
%doc dogtag/common-ui/LICENSE
%doc themes/%{brand}/common-ui/LICENSE
%dir %{_datadir}/pki
%{_datadir}/pki/common-ui/
%{_datadir}/pki/server/webapps/pki/ca
@ -1695,17 +1581,19 @@ fi
%{_datadir}/pki/server/webapps/pki/tks
################################################################################
%files -n %{name}-console-theme
%files -n %{brand}-pki-console-theme
################################################################################
%defattr(-,root,root,-)
%doc dogtag/console-ui/LICENSE
%doc themes/%{brand}/console-ui/LICENSE
%{_javadir}/pki/pki-console-theme.jar
%endif # with theme
################################################################################
%changelog
* Mon Aug 13 2018 Dogtag PKI Team <pki-team@redhat.com> - 10.6.6-1
- Rebased to PKI 10.6.6
* Wed Aug 08 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.5-1
- Rebased to PKI 10.6.5

2
sources
View File

@ -1 +1 @@
SHA512 (pki-10.6.5.tar.gz) = e86e540e3211bd560f330d33cd61c4ad2d81a6451e251879df0062a3ae2272041d1d52866d04b2ac4bab56c6ad9cc63c37b67babd6e69a80e13674dac3488b35
SHA512 (pki-10.6.6.tar.gz) = 7f64a5b991ae9997c009ee8fb69968713cd5c0297e68bc1c0e35628839c4e64db709599985ea739cf35133e145c4ca6d24e62728648f9460026aaecb3b2dc79d