Import from AlmaLinux stable repository
This commit is contained in:
parent
7f14edaeae
commit
6b399f3c60
|
|
@ -1 +1 @@
|
|||
SOURCES/pki-11.3.0.tar.gz
|
||||
SOURCES/pki-11.5.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
b1c586a9698fa27521222d7c384e2181fddcda80 SOURCES/pki-11.3.0.tar.gz
|
||||
dd717a1d8e14cfd558d8772ef37f425db84debee SOURCES/pki-11.5.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Name: pki-core
|
|||
|
||||
# Upstream version number:
|
||||
%global major_version 11
|
||||
%global minor_version 3
|
||||
%global minor_version 5
|
||||
%global update_version 0
|
||||
|
||||
# Downstream release number:
|
||||
|
|
@ -28,7 +28,7 @@ Name: pki-core
|
|||
Summary: %{product_name} Package
|
||||
URL: https://www.dogtagpki.org
|
||||
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
|
||||
License: GPLv2 and LGPLv2
|
||||
License: GPL-2.0-only and LGPL-2.0-only
|
||||
Version: %{major_version}.%{minor_version}.%{update_version}
|
||||
Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?phase:-}%{?phase}
|
|||
# > pki-VERSION-RELEASE.patch
|
||||
# Patch: pki-VERSION-RELEASE.patch
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} > 35
|
||||
%if 0%{?java_arches:1}
|
||||
ExclusiveArch: %{java_arches}
|
||||
%else
|
||||
ExcludeArch: i686
|
||||
|
|
@ -59,12 +59,6 @@ ExcludeArch: i686
|
|||
|
||||
%global p11_kit_trust /usr/lib64/pkcs11/p11-kit-trust.so
|
||||
|
||||
################################################################################
|
||||
# Python
|
||||
################################################################################
|
||||
|
||||
%global python_executable /usr/bin/python3
|
||||
|
||||
################################################################################
|
||||
# Java
|
||||
################################################################################
|
||||
|
|
@ -87,6 +81,8 @@ ExcludeArch: i686
|
|||
%bcond_without test
|
||||
|
||||
# Build the package unless --without <package> is specified.
|
||||
# For idm-pki do not build the following packages:
|
||||
# ocsp, tks, tps, javadoc, theme, tests, debug
|
||||
|
||||
%bcond_without base
|
||||
%bcond_without server
|
||||
|
|
@ -94,18 +90,17 @@ ExcludeArch: i686
|
|||
%bcond_without ca
|
||||
%bcond_without est
|
||||
%bcond_without kra
|
||||
|
||||
# Do not build the following packages for pki-core.
|
||||
|
||||
%bcond_with console
|
||||
%bcond_with ocsp
|
||||
%bcond_with tks
|
||||
%bcond_with tps
|
||||
%bcond_with javadoc
|
||||
%bcond_with theme
|
||||
%bcond_with meta
|
||||
%bcond_without meta
|
||||
%bcond_with tests
|
||||
%bcond_with debug
|
||||
%bcond_without debug
|
||||
|
||||
# Don't build console unless --with console is specified.
|
||||
%bcond_with console
|
||||
|
||||
%if ! %{with debug}
|
||||
%define debug_package %{nil}
|
||||
|
|
@ -152,17 +147,7 @@ BuildRequires: make
|
|||
BuildRequires: cmake >= 3.0.2
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: zip
|
||||
BuildRequires: %{java_devel}
|
||||
BuildRequires: javapackages-tools
|
||||
|
||||
BuildRequires: apache-commons-cli
|
||||
BuildRequires: apache-commons-codec
|
||||
BuildRequires: apache-commons-io
|
||||
BuildRequires: apache-commons-lang3 >= 3.2
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-net
|
||||
BuildRequires: slf4j
|
||||
BuildRequires: slf4j-jdk14
|
||||
BuildRequires: nspr-devel
|
||||
BuildRequires: nss-devel >= 3.36.1
|
||||
|
||||
|
|
@ -170,12 +155,37 @@ BuildRequires: openldap-devel
|
|||
BuildRequires: pkgconfig
|
||||
BuildRequires: policycoreutils
|
||||
|
||||
BuildRequires: python3-lxml
|
||||
BuildRequires: python3-sphinx
|
||||
# Java build dependencies
|
||||
BuildRequires: %{java_devel}
|
||||
BuildRequires: maven-local
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: xmvn-tools
|
||||
%endif
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: mvn(commons-cli:commons-cli)
|
||||
BuildRequires: mvn(commons-codec:commons-codec)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(org.apache.commons:commons-lang3)
|
||||
BuildRequires: mvn(commons-logging:commons-logging)
|
||||
BuildRequires: mvn(commons-net:commons-net)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(xml-apis:xml-apis)
|
||||
BuildRequires: mvn(xml-resolver:xml-resolver)
|
||||
BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api)
|
||||
BuildRequires: mvn(org.jboss.resteasy:resteasy-client)
|
||||
BuildRequires: mvn(org.jboss.resteasy:resteasy-jackson2-provider)
|
||||
BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs)
|
||||
BuildRequires: mvn(org.jboss.resteasy:resteasy-servlet-initializer)
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) >= 9.0.62
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-jaspic-api) >= 9.0.62
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) >= 9.0.62
|
||||
BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
|
||||
BuildRequires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.5.0
|
||||
BuildRequires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0
|
||||
|
||||
BuildRequires: resteasy >= 3.0.26
|
||||
|
||||
BuildRequires: python3 >= 3.9
|
||||
# Python build dependencies
|
||||
BuildRequires: python3 >= 3.6
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-cryptography
|
||||
|
|
@ -184,21 +194,10 @@ BuildRequires: python3-ldap
|
|||
BuildRequires: python3-libselinux
|
||||
BuildRequires: python3-requests >= 2.6.0
|
||||
BuildRequires: python3-six
|
||||
|
||||
BuildRequires: junit
|
||||
BuildRequires: jpackage-utils >= 0:1.7.5-10
|
||||
BuildRequires: jss = 5.3
|
||||
BuildRequires: tomcatjss = 8.3
|
||||
BuildRequires: ldapjdk = 5.3
|
||||
BuildRequires: python3-sphinx
|
||||
|
||||
BuildRequires: systemd-units
|
||||
|
||||
%if 0%{?rhel} && ! 0%{?eln}
|
||||
BuildRequires: pki-servlet-engine >= 9.0.31
|
||||
%else
|
||||
BuildRequires: tomcat >= 1:9.0.31
|
||||
%endif
|
||||
|
||||
# additional build requirements needed to build native 'tpsclient'
|
||||
# REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app
|
||||
BuildRequires: apr-devel
|
||||
|
|
@ -232,12 +231,13 @@ to manage enterprise Public Key Infrastructure deployments.
|
|||
|
||||
%{product_name} consists of the following components:
|
||||
|
||||
* Automatic Certificate Management Environment (ACME) Responder
|
||||
* Certificate Authority (CA)
|
||||
* Key Recovery Authority (KRA)
|
||||
* Online Certificate Status Protocol (OCSP) Manager
|
||||
* Token Key Service (TKS)
|
||||
* Token Processing Service (TPS)
|
||||
* Automatic Certificate Management Environment (ACME) Responder
|
||||
* Enrollment over Secure Transport (EST) Responder
|
||||
|
||||
%endif
|
||||
|
||||
|
|
@ -256,26 +256,69 @@ Obsoletes: pki-console < %{version}
|
|||
Obsoletes: pki-console-theme < %{version}
|
||||
Obsoletes: idm-console-framework < 2.0
|
||||
|
||||
# Make certain that this 'meta' package requires the latest version(s)
|
||||
# of ALL PKI theme packages
|
||||
Requires: %{product_id}-theme = %{version}-%{release}
|
||||
%if %{with base}
|
||||
Requires: %{product_id}-base = %{version}-%{release}
|
||||
Requires: python3-%{product_id} = %{version}-%{release}
|
||||
Requires: %{product_id}-java = %{version}-%{release}
|
||||
Requires: %{product_id}-tools = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
# Make certain that this 'meta' package requires the latest version(s)
|
||||
# of ALL PKI core packages
|
||||
%if %{with server}
|
||||
Requires: %{product_id}-server = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with acme}
|
||||
Requires: %{product_id}-acme = %{version}-%{release}
|
||||
Requires: %{product_id}-ca = %{version}-%{release}
|
||||
Requires: %{product_id}-est = %{version}-%{release}
|
||||
Requires: %{product_id}-kra = %{version}-%{release}
|
||||
Requires: %{product_id}-ocsp = %{version}-%{release}
|
||||
Requires: %{product_id}-tks = %{version}-%{release}
|
||||
Requires: %{product_id}-tps = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with ca}
|
||||
Requires: %{product_id}-ca = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with est}
|
||||
Requires: %{product_id}-est = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with kra}
|
||||
Requires: %{product_id}-kra = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with ocsp}
|
||||
Requires: %{product_id}-ocsp = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with tks}
|
||||
Requires: %{product_id}-tks = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with tps}
|
||||
Requires: %{product_id}-tps = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with javadoc}
|
||||
Requires: %{product_id}-javadoc = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with console}
|
||||
Requires: %{product_id}-console = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{with theme}
|
||||
Requires: %{product_id}-theme = %{version}-%{release}
|
||||
%if %{with console}
|
||||
Requires: %{product_id}-console-theme = %{version}-%{release}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with tests}
|
||||
Requires: %{product_id}-tests = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
# Make certain that this 'meta' package requires the latest version(s)
|
||||
# of ALL PKI clients -- except for s390/s390x where 'esc' is not built
|
||||
# and for idm-pki.
|
||||
%ifnarch s390 s390x
|
||||
Requires: esc >= 1.1.1
|
||||
#Requires: esc >= 1.1.1
|
||||
%endif
|
||||
|
||||
# description for top-level package (unless there is a separate meta package)
|
||||
|
|
@ -290,12 +333,13 @@ to manage enterprise Public Key Infrastructure deployments.
|
|||
|
||||
%{product_name} consists of the following components:
|
||||
|
||||
* Automatic Certificate Management Environment (ACME) Responder
|
||||
* Certificate Authority (CA)
|
||||
* Key Recovery Authority (KRA)
|
||||
* Online Certificate Status Protocol (OCSP) Manager
|
||||
* Token Key Service (TKS)
|
||||
* Token Processing Service (TPS)
|
||||
* Automatic Certificate Management Environment (ACME) Responder
|
||||
* Enrollment over Secure Transport (EST) Responder
|
||||
|
||||
# with meta
|
||||
%endif
|
||||
|
|
@ -340,7 +384,7 @@ Provides: pki-base-python3 = %{version}-%{release}
|
|||
%{?python_provide:%python_provide python3-pki}
|
||||
|
||||
Requires: %{product_id}-base = %{version}-%{release}
|
||||
Requires: python3 >= 3.9
|
||||
Requires: python3 >= 3.6
|
||||
Requires: python3-cryptography
|
||||
Requires: python3-ldap
|
||||
Requires: python3-lxml
|
||||
|
|
@ -364,21 +408,20 @@ Obsoletes: %{product_id}-base-java < %{version}-%{release}
|
|||
Provides: %{product_id}-base-java = %{version}-%{release}
|
||||
|
||||
Requires: %{java_headless}
|
||||
Requires: apache-commons-cli
|
||||
Requires: apache-commons-codec
|
||||
Requires: apache-commons-io
|
||||
Requires: apache-commons-lang3 >= 3.2
|
||||
Requires: apache-commons-logging
|
||||
Requires: apache-commons-net
|
||||
Requires: slf4j
|
||||
Requires: slf4j-jdk14
|
||||
Requires: jpackage-utils >= 0:1.7.5-10
|
||||
Requires: jss = 5.3
|
||||
Requires: ldapjdk = 5.3
|
||||
Requires: mvn(commons-cli:commons-cli)
|
||||
Requires: mvn(commons-codec:commons-codec)
|
||||
Requires: mvn(commons-io:commons-io)
|
||||
Requires: mvn(org.apache.commons:commons-lang3)
|
||||
Requires: mvn(commons-logging:commons-logging)
|
||||
Requires: mvn(commons-net:commons-net)
|
||||
Requires: mvn(org.slf4j:slf4j-api)
|
||||
Requires: mvn(org.slf4j:slf4j-jdk14)
|
||||
Requires: mvn(org.jboss.resteasy:resteasy-client)
|
||||
Requires: mvn(org.jboss.resteasy:resteasy-jackson2-provider)
|
||||
Requires: mvn(org.jboss.resteasy:resteasy-jaxrs)
|
||||
Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
|
||||
Requires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0
|
||||
Requires: %{product_id}-base = %{version}-%{release}
|
||||
Requires: resteasy-client >= 3.0.17-1
|
||||
Requires: resteasy-core >= 3.0.17-1
|
||||
Requires: resteasy-jackson2-provider >= 3.0.17-1
|
||||
|
||||
%description -n %{product_id}-java
|
||||
This package provides common and client libraries for Java.
|
||||
|
|
@ -430,6 +473,8 @@ Requires: openldap-clients
|
|||
Requires: openssl
|
||||
Requires: %{product_id}-tools = %{version}-%{release}
|
||||
|
||||
Requires: %{java_devel}
|
||||
|
||||
Requires: keyutils
|
||||
|
||||
Requires: policycoreutils-python-utils
|
||||
|
|
@ -440,17 +485,14 @@ Requires: python3-policycoreutils
|
|||
|
||||
Requires: selinux-policy-targeted >= 3.13.1-159
|
||||
|
||||
%if 0%{?rhel} && ! 0%{?eln}
|
||||
Requires: pki-servlet-engine >= 9.0.31
|
||||
%else
|
||||
Requires: tomcat >= 1:9.0.31
|
||||
%endif
|
||||
Requires: mvn(org.jboss.resteasy:resteasy-servlet-initializer)
|
||||
Requires: tomcat >= 1:9.0.62
|
||||
Requires: mvn(org.dogtagpki.jss:jss-tomcat) >= 5.5.0
|
||||
|
||||
Requires: systemd
|
||||
Requires(post): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
Requires(pre): shadow-utils
|
||||
Requires: tomcatjss = 8.3
|
||||
|
||||
# pki-healthcheck depends on the following library
|
||||
%if 0%{?rhel}
|
||||
|
|
@ -723,12 +765,12 @@ This package provides %{product_name} API documentation.
|
|||
Summary: %{product_name} Console Package
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: idm-console-framework >= 2.0
|
||||
BuildRequires: mvn(org.dogtagpki.console-framework:console-framework) >= 2.1.0
|
||||
|
||||
Obsoletes: pki-console < %{version}-%{release}
|
||||
Provides: pki-console = %{version}-%{release}
|
||||
|
||||
Requires: idm-console-framework >= 2.0
|
||||
Requires: mvn(org.dogtagpki.console-framework:console-framework) >= 2.1.0
|
||||
Requires: %{product_id}-java = %{version}-%{release}
|
||||
Requires: %{product_id}-console-theme = %{version}-%{release}
|
||||
|
||||
|
|
@ -752,6 +794,14 @@ Provides: pki-server-theme = %{version}-%{release}
|
|||
Obsoletes: %{product_id}-server-theme < %{version}-%{release}
|
||||
Provides: %{product_id}-server-theme = %{version}-%{release}
|
||||
|
||||
%if 0%{?fedora} > 38
|
||||
BuildRequires: fontawesome4-fonts-web
|
||||
Requires: fontawesome4-fonts-web
|
||||
%else
|
||||
BuildRequires: fontawesome-fonts-web
|
||||
Requires: fontawesome-fonts-web
|
||||
%endif
|
||||
|
||||
# Ensure we end up with a useful installation
|
||||
Conflicts: pki-base < %{version}
|
||||
Conflicts: pki-javadoc < %{version}
|
||||
|
|
@ -811,6 +861,91 @@ This package provides test suite for %{product_name}.
|
|||
|
||||
%autosetup -n pki-%{version}%{?phase:-}%{?phase} -p 1
|
||||
|
||||
%if ! %{with base}
|
||||
%pom_disable_module common base
|
||||
%pom_disable_module tools base
|
||||
%endif
|
||||
|
||||
%if ! %{with server}
|
||||
%pom_disable_module tomcat base
|
||||
%pom_disable_module tomcat-9.0 base
|
||||
%pom_disable_module server base
|
||||
%pom_disable_module server-webapp base
|
||||
%endif
|
||||
|
||||
%if ! %{with ca}
|
||||
%pom_disable_module ca base
|
||||
%endif
|
||||
|
||||
%if ! %{with kra}
|
||||
%pom_disable_module kra base
|
||||
%endif
|
||||
|
||||
%if ! %{with ocsp}
|
||||
%pom_disable_module ocsp base
|
||||
%endif
|
||||
|
||||
%if ! %{with tks}
|
||||
%pom_disable_module tks base
|
||||
%endif
|
||||
|
||||
%if ! %{with tps}
|
||||
%pom_disable_module tps base
|
||||
%endif
|
||||
|
||||
%if ! %{with acme}
|
||||
%pom_disable_module acme base
|
||||
%endif
|
||||
|
||||
%if ! %{with est}
|
||||
%pom_disable_module est base
|
||||
%endif
|
||||
|
||||
%if ! %{with console}
|
||||
%pom_disable_module console base
|
||||
%endif
|
||||
|
||||
# flatten-maven-plugin is not available in RPM
|
||||
%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
|
||||
|
||||
# specify Maven artifact locations
|
||||
%mvn_file org.dogtagpki.pki:pki-common pki/pki-common
|
||||
%mvn_file org.dogtagpki.pki:pki-tools pki/pki-tools
|
||||
%mvn_file org.dogtagpki.pki:pki-server pki/pki-server
|
||||
%mvn_file org.dogtagpki.pki:pki-server-webapp pki/pki-server-webapp
|
||||
%mvn_file org.dogtagpki.pki:pki-tomcat pki/pki-tomcat
|
||||
%mvn_file org.dogtagpki.pki:pki-tomcat-9.0 pki/pki-tomcat-9.0
|
||||
%mvn_file org.dogtagpki.pki:pki-ca pki/pki-ca
|
||||
%mvn_file org.dogtagpki.pki:pki-kra pki/pki-kra
|
||||
%mvn_file org.dogtagpki.pki:pki-ocsp pki/pki-ocsp
|
||||
%mvn_file org.dogtagpki.pki:pki-tks pki/pki-tks
|
||||
%mvn_file org.dogtagpki.pki:pki-tps pki/pki-tps
|
||||
%mvn_file org.dogtagpki.pki:pki-acme pki/pki-acme
|
||||
%mvn_file org.dogtagpki.pki:pki-est pki/pki-est
|
||||
|
||||
%if %{with console}
|
||||
%mvn_file org.dogtagpki.pki:pki-console pki/pki-console
|
||||
%endif
|
||||
|
||||
# specify Maven artifact packages
|
||||
%mvn_package org.dogtagpki.pki:pki-common pki-java
|
||||
%mvn_package org.dogtagpki.pki:pki-tools pki-tools
|
||||
%mvn_package org.dogtagpki.pki:pki-server pki-server
|
||||
%mvn_package org.dogtagpki.pki:pki-server-webapp pki-server
|
||||
%mvn_package org.dogtagpki.pki:pki-tomcat pki-server
|
||||
%mvn_package org.dogtagpki.pki:pki-tomcat-9.0 pki-server
|
||||
%mvn_package org.dogtagpki.pki:pki-ca pki-ca
|
||||
%mvn_package org.dogtagpki.pki:pki-kra pki-kra
|
||||
%mvn_package org.dogtagpki.pki:pki-ocsp pki-ocsp
|
||||
%mvn_package org.dogtagpki.pki:pki-tks pki-tks
|
||||
%mvn_package org.dogtagpki.pki:pki-tps pki-tps
|
||||
%mvn_package org.dogtagpki.pki:pki-acme pki-acme
|
||||
%mvn_package org.dogtagpki.pki:pki-est pki-est
|
||||
|
||||
%if %{with console}
|
||||
%mvn_package org.dogtagpki.pki:pki-console pki-console
|
||||
%endif
|
||||
|
||||
################################################################################
|
||||
%build
|
||||
################################################################################
|
||||
|
|
@ -819,6 +954,81 @@ This package provides test suite for %{product_name}.
|
|||
# (see /usr/lib/rpm/macros.d/macros.cmake)
|
||||
%set_build_flags
|
||||
|
||||
export JAVA_HOME=%{java_home}
|
||||
|
||||
# build Java binaries and run unit tests with Maven
|
||||
%mvn_build %{!?with_test:-f} -j
|
||||
|
||||
# create links to Maven-built JAR files for CMake
|
||||
mkdir -p %{_vpath_builddir}/dist
|
||||
pushd %{_vpath_builddir}/dist
|
||||
|
||||
%if %{with base}
|
||||
ln -sf ../../base/common/target/pki-common.jar
|
||||
ln -sf ../../base/tools/target/pki-tools.jar
|
||||
%endif
|
||||
|
||||
%if %{with server}
|
||||
ln -sf ../../base/tomcat/target/pki-tomcat.jar
|
||||
ln -sf ../../base/tomcat-9.0/target/pki-tomcat-9.0.jar
|
||||
ln -sf ../../base/server/target/pki-server.jar
|
||||
ln -sf ../../base/server-webapp/target/pki-server-webapp.jar
|
||||
%endif
|
||||
|
||||
%if %{with ca}
|
||||
ln -sf ../../base/ca/target/pki-ca.jar
|
||||
%endif
|
||||
|
||||
%if %{with kra}
|
||||
ln -sf ../../base/kra/target/pki-kra.jar
|
||||
%endif
|
||||
|
||||
%if %{with ocsp}
|
||||
ln -sf ../../base/ocsp/target/pki-ocsp.jar
|
||||
%endif
|
||||
|
||||
%if %{with tks}
|
||||
ln -sf ../../base/tks/target/pki-tks.jar
|
||||
%endif
|
||||
|
||||
%if %{with tps}
|
||||
ln -sf ../../base/tps/target/pki-tps.jar
|
||||
%endif
|
||||
|
||||
%if %{with acme}
|
||||
ln -sf ../../base/acme/target/pki-acme.jar
|
||||
%endif
|
||||
|
||||
%if %{with est}
|
||||
ln -sf ../../base/est/target/pki-est.jar
|
||||
%endif
|
||||
|
||||
%if %{with console}
|
||||
ln -sf ../../base/console/target/pki-console.jar
|
||||
%endif
|
||||
|
||||
popd
|
||||
|
||||
# Remove all symbol table and relocation information from the executable.
|
||||
C_FLAGS="-s"
|
||||
|
||||
%if 0%{?fedora}
|
||||
# https://sourceware.org/annobin/annobin.html/Test-gaps.html
|
||||
C_FLAGS="$C_FLAGS -fplugin=annobin"
|
||||
|
||||
# https://sourceware.org/annobin/annobin.html/Test-cf-protection.html
|
||||
C_FLAGS="$C_FLAGS -fcf-protection=full"
|
||||
|
||||
# https://sourceware.org/annobin/annobin.html/Test-optimization.html
|
||||
C_FLAGS="$C_FLAGS -O2"
|
||||
|
||||
# https://sourceware.org/annobin/annobin.html/Test-glibcxx-assertions.html
|
||||
C_FLAGS="$C_FLAGS -D_GLIBCXX_ASSERTIONS"
|
||||
|
||||
# https://sourceware.org/annobin/annobin.html/Test-lto.html
|
||||
C_FLAGS="$C_FLAGS -fno-lto"
|
||||
%endif
|
||||
|
||||
pkgs=base\
|
||||
%{?with_server:,server}\
|
||||
%{?with_ca:,ca}\
|
||||
|
|
@ -834,6 +1044,7 @@ pkgs=base\
|
|||
%{?with_tests:,tests}\
|
||||
%{?with_debug:,debug}
|
||||
|
||||
# build PKI console, Javadoc, and native binaries with CMake
|
||||
./build.sh \
|
||||
%{?_verbose:-v} \
|
||||
--product-name="%{product_name}" \
|
||||
|
|
@ -848,19 +1059,26 @@ pkgs=base\
|
|||
--sysconf-dir=%{_sysconfdir} \
|
||||
--share-dir=%{_datadir} \
|
||||
--cmake=%{__cmake} \
|
||||
--c-flags="$C_FLAGS" \
|
||||
--java-home=%{java_home} \
|
||||
--jni-dir=%{_jnidir} \
|
||||
--unit-dir=%{_unitdir} \
|
||||
--python=%{python_executable} \
|
||||
--python=%{python3} \
|
||||
--python-dir=%{python3_sitelib} \
|
||||
--without-java \
|
||||
--with-pkgs=$pkgs \
|
||||
%{?with_console:--with-console} \
|
||||
%{!?with_test:--without-test} \
|
||||
--without-test \
|
||||
dist
|
||||
|
||||
################################################################################
|
||||
%install
|
||||
################################################################################
|
||||
|
||||
# install Java binaries
|
||||
%mvn_install
|
||||
|
||||
# install PKI console, Javadoc, and native binaries
|
||||
./build.sh \
|
||||
%{?_verbose:-v} \
|
||||
--work-dir=%{_vpath_builddir} \
|
||||
|
|
@ -919,16 +1137,36 @@ then
|
|||
systemctl daemon-reload
|
||||
fi
|
||||
|
||||
# Update the fapolicy rules for each PKI server instance
|
||||
for instance in $(ls /var/lib/pki)
|
||||
do
|
||||
target="/etc/fapolicyd/rules.d/61-pki-$instance.rules"
|
||||
|
||||
sed -e "s/\[WORK_DIR\]/\/var\/lib\/pki\/$instance\/work/g" \
|
||||
/usr/share/pki/server/etc/fapolicy.rules \
|
||||
> $target
|
||||
|
||||
chown root:fapolicyd $target
|
||||
chmod 644 $target
|
||||
done
|
||||
|
||||
# Restart fapolicy daemon if it's active
|
||||
status=$(systemctl is-active fapolicyd)
|
||||
if [ "$status" = "active" ]
|
||||
then
|
||||
systemctl restart fapolicyd
|
||||
fi
|
||||
|
||||
# with server
|
||||
%endif
|
||||
|
||||
%if %{with meta}
|
||||
%if "%{name}" != "%{product_id}"
|
||||
################################################################################
|
||||
%files -n %{product_id}
|
||||
%files -n %{product_id} -f .mfiles
|
||||
################################################################################
|
||||
%else
|
||||
%files
|
||||
%files -f .mfiles
|
||||
%endif
|
||||
|
||||
%doc %{_datadir}/doc/pki/README
|
||||
|
|
@ -964,15 +1202,13 @@ fi
|
|||
%{_mandir}/man8/pki-upgrade.8.gz
|
||||
|
||||
################################################################################
|
||||
%files -n %{product_id}-java
|
||||
%files -n %{product_id}-java -f .mfiles-pki-java
|
||||
################################################################################
|
||||
|
||||
%license base/common/LICENSE
|
||||
%license base/common/LICENSE.LESSER
|
||||
%{_datadir}/pki/examples/java/
|
||||
%{_datadir}/pki/lib/*.jar
|
||||
%dir %{_javadir}/pki
|
||||
%{_javadir}/pki/pki-certsrv.jar
|
||||
|
||||
################################################################################
|
||||
%files -n python3-%{product_id}
|
||||
|
|
@ -986,7 +1222,7 @@ fi
|
|||
%{python3_sitelib}/pki
|
||||
|
||||
################################################################################
|
||||
%files -n %{product_id}-tools
|
||||
%files -n %{product_id}-tools -f .mfiles-pki-tools
|
||||
################################################################################
|
||||
|
||||
%license base/tools/LICENSE
|
||||
|
|
@ -1009,7 +1245,6 @@ fi
|
|||
%{_bindir}/CMCRevoke
|
||||
%{_bindir}/CMCSharedToken
|
||||
%{_bindir}/CRMFPopClient
|
||||
%{_bindir}/DRMTool
|
||||
%{_bindir}/ExtJoiner
|
||||
%{_bindir}/GenExtKeyUsage
|
||||
%{_bindir}/GenIssuerAltNameExt
|
||||
|
|
@ -1023,10 +1258,8 @@ fi
|
|||
%{_bindir}/PrettyPrintCert
|
||||
%{_bindir}/PrettyPrintCrl
|
||||
%{_bindir}/TokenInfo
|
||||
%{_javadir}/pki/pki-tools.jar
|
||||
%{_datadir}/pki/tools/
|
||||
%{_datadir}/pki/lib/p11-kit-trust.so
|
||||
%{_libdir}/tps/libtps.so
|
||||
%{_mandir}/man1/AtoB.1.gz
|
||||
%{_mandir}/man1/AuditVerify.1.gz
|
||||
%{_mandir}/man1/BtoA.1.gz
|
||||
|
|
@ -1034,7 +1267,6 @@ fi
|
|||
%{_mandir}/man1/CMCRequest.1.gz
|
||||
%{_mandir}/man1/CMCSharedToken.1.gz
|
||||
%{_mandir}/man1/CMCResponse.1.gz
|
||||
%{_mandir}/man1/DRMTool.1.gz
|
||||
%{_mandir}/man1/KRATool.1.gz
|
||||
%{_mandir}/man1/PrettyPrintCert.1.gz
|
||||
%{_mandir}/man1/PrettyPrintCrl.1.gz
|
||||
|
|
@ -1064,7 +1296,7 @@ fi
|
|||
|
||||
%if %{with server}
|
||||
################################################################################
|
||||
%files -n %{product_id}-server
|
||||
%files -n %{product_id}-server -f .mfiles-pki-server
|
||||
################################################################################
|
||||
|
||||
%license base/common/THIRD_PARTY_LICENSES
|
||||
|
|
@ -1093,8 +1325,6 @@ fi
|
|||
%dir %{_sysconfdir}/systemd/system/pki-tomcatd-nuxwdog.target.wants
|
||||
%attr(644,-,-) %{_unitdir}/pki-tomcatd-nuxwdog@.service
|
||||
%attr(644,-,-) %{_unitdir}/pki-tomcatd-nuxwdog.target
|
||||
%{_javadir}/pki/pki-cms.jar
|
||||
%{_javadir}/pki/pki-tomcat.jar
|
||||
%dir %{_sharedstatedir}/pki
|
||||
%{_mandir}/man1/pkidaemon.1.gz
|
||||
%{_mandir}/man5/pki_default.cfg.5.gz
|
||||
|
|
@ -1125,10 +1355,9 @@ fi
|
|||
|
||||
%if %{with acme}
|
||||
################################################################################
|
||||
%files -n %{product_id}-acme
|
||||
%files -n %{product_id}-acme -f .mfiles-pki-acme
|
||||
################################################################################
|
||||
|
||||
%{_javadir}/pki/pki-acme.jar
|
||||
%{_datadir}/pki/acme/
|
||||
|
||||
# with acme
|
||||
|
|
@ -1136,11 +1365,10 @@ fi
|
|||
|
||||
%if %{with ca}
|
||||
################################################################################
|
||||
%files -n %{product_id}-ca
|
||||
%files -n %{product_id}-ca -f .mfiles-pki-ca
|
||||
################################################################################
|
||||
|
||||
%license base/ca/LICENSE
|
||||
%{_javadir}/pki/pki-ca.jar
|
||||
%{_datadir}/pki/ca/
|
||||
|
||||
# with ca
|
||||
|
|
@ -1148,10 +1376,9 @@ fi
|
|||
|
||||
%if %{with est}
|
||||
################################################################################
|
||||
%files -n %{product_id}-est
|
||||
%files -n %{product_id}-est -f .mfiles-pki-est
|
||||
################################################################################
|
||||
|
||||
%{_javadir}/pki/pki-est.jar
|
||||
%{_datadir}/pki/est/
|
||||
|
||||
# with est
|
||||
|
|
@ -1159,11 +1386,10 @@ fi
|
|||
|
||||
%if %{with kra}
|
||||
################################################################################
|
||||
%files -n %{product_id}-kra
|
||||
%files -n %{product_id}-kra -f .mfiles-pki-kra
|
||||
################################################################################
|
||||
|
||||
%license base/kra/LICENSE
|
||||
%{_javadir}/pki/pki-kra.jar
|
||||
%{_datadir}/pki/kra/
|
||||
|
||||
# with kra
|
||||
|
|
@ -1171,11 +1397,10 @@ fi
|
|||
|
||||
%if %{with ocsp}
|
||||
################################################################################
|
||||
%files -n %{product_id}-ocsp
|
||||
%files -n %{product_id}-ocsp -f .mfiles-pki-ocsp
|
||||
################################################################################
|
||||
|
||||
%license base/ocsp/LICENSE
|
||||
%{_javadir}/pki/pki-ocsp.jar
|
||||
%{_datadir}/pki/ocsp/
|
||||
|
||||
# with ocsp
|
||||
|
|
@ -1183,11 +1408,10 @@ fi
|
|||
|
||||
%if %{with tks}
|
||||
################################################################################
|
||||
%files -n %{product_id}-tks
|
||||
%files -n %{product_id}-tks -f .mfiles-pki-tks
|
||||
################################################################################
|
||||
|
||||
%license base/tks/LICENSE
|
||||
%{_javadir}/pki/pki-tks.jar
|
||||
%{_datadir}/pki/tks/
|
||||
|
||||
# with tks
|
||||
|
|
@ -1195,11 +1419,10 @@ fi
|
|||
|
||||
%if %{with tps}
|
||||
################################################################################
|
||||
%files -n %{product_id}-tps
|
||||
%files -n %{product_id}-tps -f .mfiles-pki-tps
|
||||
################################################################################
|
||||
|
||||
%license base/tps/LICENSE
|
||||
%{_javadir}/pki/pki-tps.jar
|
||||
%{_datadir}/pki/tps/
|
||||
%{_mandir}/man5/pki-tps-connector.5.gz
|
||||
%{_mandir}/man5/pki-tps-profile.5.gz
|
||||
|
|
@ -1219,12 +1442,11 @@ fi
|
|||
|
||||
%if %{with console}
|
||||
################################################################################
|
||||
%files -n %{product_id}-console
|
||||
%files -n %{product_id}-console -f .mfiles-pki-console
|
||||
################################################################################
|
||||
|
||||
%license base/console/LICENSE
|
||||
%{_bindir}/pkiconsole
|
||||
%{_javadir}/pki/pki-console.jar
|
||||
|
||||
# with console
|
||||
%endif
|
||||
|
|
@ -1236,6 +1458,8 @@ fi
|
|||
|
||||
%license themes/%{theme}/common-ui/LICENSE
|
||||
%dir %{_datadir}/pki
|
||||
|
||||
%if %{with server}
|
||||
%{_datadir}/pki/CS_SERVER_VERSION
|
||||
%{_datadir}/pki/common-ui/
|
||||
%{_datadir}/pki/server/webapps/pki/ca
|
||||
|
|
@ -1248,6 +1472,9 @@ fi
|
|||
%{_datadir}/pki/server/webapps/pki/pki.properties
|
||||
%{_datadir}/pki/server/webapps/pki/tks
|
||||
|
||||
# with server
|
||||
%endif
|
||||
|
||||
%if %{with console}
|
||||
################################################################################
|
||||
%files -n %{product_id}-console-theme
|
||||
|
|
@ -1274,6 +1501,12 @@ fi
|
|||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Wed Feb 21 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.5.0-1
|
||||
- Rebase to PKI 11.5.0
|
||||
|
||||
* Mon Jun 05 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.4.2-1
|
||||
- Rebase to PKI 11.4.2
|
||||
|
||||
* Mon Jan 30 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.3.0-1
|
||||
- Rebase to PKI 11.3.0
|
||||
- Bug #2091993 - IdM Install fails on RHEL 8.5 Beta when DISA STIG is applied
|
||||
|
|
|
|||
Loading…
Reference in New Issue