From fcd4a816331eb48d97d2c323819ebf187d970978 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 29 Apr 2021 09:42:58 -0500 Subject: [PATCH] Disable non-core packages Resolves: #1952530 --- ...Fix-renewal-profile-approval-process.patch | 0 pki-core.spec | 152 +++++++++--------- 2 files changed, 79 insertions(+), 73 deletions(-) rename 0002-Fix-renewal-profile-approval-process.patch => 0001-Fix-renewal-profile-approval-process.patch (100%) diff --git a/0002-Fix-renewal-profile-approval-process.patch b/0001-Fix-renewal-profile-approval-process.patch similarity index 100% rename from 0002-Fix-renewal-profile-approval-process.patch rename to 0001-Fix-renewal-profile-approval-process.patch diff --git a/pki-core.spec b/pki-core.spec index 4304058..2c49e51 100644 --- a/pki-core.spec +++ b/pki-core.spec @@ -13,7 +13,7 @@ License: GPLv2 and LGPLv2 # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 10.10.5 -Release: 8%{?_timestamp}%{?_commit_id}%{?dist} +Release: 9%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -beta1 # To create a tarball from a version tag: @@ -30,8 +30,14 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver # \ # > pki-VERSION-RELEASE.patch # Patch: pki-VERSION-RELEASE.patch -Patch1: 0001-remove-jakarta-commons-httpclient.patch -Patch2: 0002-Fix-renewal-profile-approval-process.patch + +# Do not remove this!! pytest-runner isn't available on RHEL. Removing this +# patch will break RHEL builds. The error message is: +# BUILDSTDERR: Download error on https://pypi.org/simple/pytest-runner/: +# [Errno 111] Connection refused -- Some packages may not be found! +Patch1: 0001-Removed-dependency-on-pytest-runner.patch +Patch2: 0001-Fix-renewal-profile-approval-process.patch +Patch3: 0001-remove-jakarta-commons-httpclient.patch # md2man isn't available on i686. Additionally, we aren't generally multi-lib # compatible (https://fedoraproject.org/wiki/Packaging:Java) @@ -51,7 +57,7 @@ ExcludeArch: i686 # Python ################################################################################ -%if 0%{?rhel} && 0%{?rhel} < 9 +%if 0%{?rhel} && 0%{?rhel} <= 8 %global python_executable /usr/libexec/platform-python %else %global python_executable /usr/bin/python3 @@ -64,7 +70,7 @@ ExcludeArch: i686 %define java_devel java-devel %define java_headless java-headless -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%if 0%{?fedora} >= 33 || 0%{?rhel} > 8 %define min_java_version 1:11 %define java_home /usr/lib/jvm/java-11-openjdk %else @@ -110,19 +116,25 @@ ExcludeArch: i686 # Define --with or --without options depending on # package selection method. +# package_option base %global with_base 1 +# package_option server %global with_server 1 +# package_option acme %global with_acme 1 +# package_option ca %global with_ca 1 +# package_option kra %global with_kra 1 -%global with_ocsp 1 -%global with_tks 1 -%global with_tps 1 -%global with_javadoc 1 -%global with_console 1 -%global without_theme 1 -%global without_meta 1 -%global without_tests 1 +# package_option ocsp +# package_option tks +# package_option tps +# package_option javadoc +# package_option console +# package_option theme +# package_option meta +# package_option tests +# package_option debug %global with_debug 1 %if ! %{with debug} @@ -201,7 +213,7 @@ BuildRequires: velocity BuildRequires: xalan-j2 BuildRequires: xerces-j2 -%if 0%{?rhel} && !0%{?eln} +%if 0%{?rhel} && ! 0%{?eln} BuildRequires: resteasy >= 3.0.26 %else BuildRequires: jboss-annotations-1.2-api @@ -225,7 +237,7 @@ BuildRequires: python3-nss BuildRequires: python3-requests >= 2.6.0 BuildRequires: python3-six -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} > 8 BuildRequires: python3-pytest-runner %endif @@ -258,7 +270,7 @@ BuildRequires: zlib BuildRequires: zlib-devel # build dependency to build man pages -%if 0%{?fedora} && 0%{?fedora} <= 30 || 0%{?rhel} && 0%{?rhel} < 9 +%if 0%{?fedora} && 0%{?fedora} <= 30 || 0%{?rhel} && 0%{?rhel} <= 8 BuildRequires: go-md2man %else BuildRequires: golang-github-cpuguy83-md2man @@ -402,7 +414,7 @@ BuildArch: noarch Obsoletes: pki-base-python3 < %{version} Provides: pki-base-python3 = %{version} -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} > 8 %{?python_provide:%python_provide python3-pki} %endif @@ -440,7 +452,7 @@ Requires: jss >= 4.7.0 Requires: ldapjdk >= 4.22.0 Requires: pki-base = %{version}-%{release} -%if 0%{?rhel} && 0%{?rhel} < 9 +%if 0%{?rhel} && 0%{?rhel} <= 8 Requires: resteasy >= 3.0.26 %else Requires: resteasy-atom-provider >= 3.0.17-1 @@ -450,7 +462,7 @@ Requires: resteasy-core >= 3.0.17-1 Requires: resteasy-jackson2-provider >= 3.0.17-1 %endif -%if 0%{?fedora} && 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%if 0%{?fedora} >= 33 || 0%{?rhel} > 8 Requires: jaxb-impl >= 2.3.3 Requires: jakarta-activation >= 1.2.2 %endif @@ -861,7 +873,7 @@ java_version=`echo $java_version | sed -e 's/^1\.//' -e 's/\..*$//'` # assume tomcat app_server app_server=tomcat-8.5 -%if 0%{?rhel} && 0%{?rhel} < 9 +%if 0%{?rhel} && 0%{?rhel} <= 8 %{__mkdir_p} build cd build %endif @@ -896,13 +908,13 @@ cd build -DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \ -DBUILD_PKI_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \ -DTHEME=%{?with_theme:%{vendor_id}} \ -%if 0%{?rhel} && 0%{?rhel} < 9 +%if 0%{?rhel} && 0%{?rhel} <= 8 .. %else -B %{_vpath_builddir} %endif -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} > 8 cd %{_vpath_builddir} %endif @@ -919,7 +931,7 @@ cd %{_vpath_builddir} %install ################################################################################ -%if 0%{?rhel} && 0%{?rhel} < 9 +%if 0%{?rhel} && 0%{?rhel} <= 8 cd build %else cd %{_vpath_builddir} @@ -1187,9 +1199,8 @@ fi %{_sbindir}/pkidestroy %{_sbindir}/pki-server %{_sbindir}/pki-server-upgrade -%{python3_sitelib}/pki/server/ %{_sbindir}/pki-healthcheck -%{python3_sitelib}/pki/server/healthcheck/ +%{python3_sitelib}/pki/server/ %{python3_sitelib}/pkihealthcheck-*.egg-info/ %config(noreplace) %{_sysconfdir}/pki/healthcheck.conf @@ -1245,7 +1256,6 @@ fi ################################################################################ %{_javadir}/pki/pki-acme.jar -%dir %{_datadir}/pki/acme %{_datadir}/pki/acme/ # with acme @@ -1258,7 +1268,6 @@ fi %license base/ca/LICENSE %{_javadir}/pki/pki-ca.jar -%dir %{_datadir}/pki/ca %{_datadir}/pki/ca/ # with ca @@ -1271,7 +1280,6 @@ fi %license base/kra/LICENSE %{_javadir}/pki/pki-kra.jar -%dir %{_datadir}/pki/kra %{_datadir}/pki/kra/ # with kra @@ -1284,7 +1292,6 @@ fi %license base/ocsp/LICENSE %{_javadir}/pki/pki-ocsp.jar -%dir %{_datadir}/pki/ocsp %{_datadir}/pki/ocsp/ # with ocsp @@ -1297,7 +1304,6 @@ fi %license base/tks/LICENSE %{_javadir}/pki/pki-tks.jar -%dir %{_datadir}/pki/tks %{_datadir}/pki/tks/ # with tks @@ -1310,7 +1316,6 @@ fi %license base/tps/LICENSE %{_javadir}/pki/pki-tps.jar -%dir %{_datadir}/pki/tps %{_datadir}/pki/tps/ %{_mandir}/man5/pki-tps-connector.5.gz %{_mandir}/man5/pki-tps-profile.5.gz @@ -1389,134 +1394,135 @@ fi ################################################################################ %changelog -* Wed Apr 28 2021 Red Hat PKI Team - 10.10.5-8 +* Thu Apr 29 2021 Red Hat PKI Team 10.10.5-9 +- Disable non-core packages + +* Wed Apr 28 2021 Red Hat PKI Team 10.10.5-8 - Add DT_RPATH waiver -* Fri Apr 16 2021 Mohan Boddu - 10.10.5-7 +* Fri Apr 16 2021 Mohan Boddu 10.10.5-7 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 -* Fri Mar 12 2021 Dogtag PKI Team 10.10.5-6 - Drop i686 due to lack of md2man and multilib Java -* Fri Mar 12 2021 Dogtag PKI Team 10.10.5-5 - Fix renewal profile approval process Resolves: CVE-2021-20179 -* Thu Mar 11 2021 Dogtag PKI Team - 10.10.5-4 +* Thu Mar 11 2021 Dogtag PKI Team 10.10.5-4 - Use JDK 11 for ELN and RHEL 9 builds -* Wed Mar 10 2021 Dogtag PKI Team - 10.10.5-3 +* Wed Mar 10 2021 Dogtag PKI Team 10.10.5-3 - Drop dependency on esc for s390(x) architectures -* Wed Mar 10 2021 Dogtag PKI Team - 10.10.5-2 +* Wed Mar 10 2021 Dogtag PKI Team 10.10.5-2 - Use tomcat instead of pki-servlet-engine in ELN -* Thu Feb 25 2021 Alexander Scheel - 10.10.5-1 +* Thu Feb 25 2021 Alexander Scheel 10.10.5-1 - Update to latest stable release 10.10.5 Resolves: rh-bz#1929940 -* Wed Jan 27 2021 Fedora Release Engineering - 10.10.3-4 +* Wed Jan 27 2021 Fedora Release Engineering 10.10.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Tue Jan 19 2021 Alexander Scheel - 10.10.3-3 +* Tue Jan 19 2021 Alexander Scheel 10.10.3-3 - Sync spec between upstream and Fedora -* Tue Jan 19 2021 Alexander Scheel - 10.10.3-2 +* Tue Jan 19 2021 Alexander Scheel 10.10.3-2 - Remove dependency on jakarta-commons-httpclient -* Thu Jan 14 2021 Dogtag PKI Team - 10.10.3-1 +* Thu Jan 14 2021 Dogtag PKI Team 10.10.3-1 - Rebase to upstream stable v10.10.3-1 release -* Thu Nov 05 2020 Dogtag PKI Team - 10.10.0-2 +* Thu Nov 05 2020 Dogtag PKI Team 10.10.0-2 - Add missing pki-acme package - Add workaround for missing capture_output in Python 3.6 - Fix JSS initialization in pki-server -user-cert-add - Fix NPE in UGSubsystem.findUsersByKeyword() -* Wed Oct 28 2020 Dogtag PKI Team - 10.10.0-1 +* Wed Oct 28 2020 Dogtag PKI Team 10.10.0-1 - Rebase to upstream stable v10.10.0-1 release -* Thu Oct 22 2020 Dogtag PKI Team - 10.10.0-0.2 +* Thu Oct 22 2020 Dogtag PKI Team 10.10.0-0.2 - Rebase to upstream beta v10.10.0-b2 release -* Fri Sep 18 2020 Dogtag PKI Team - 10.9.4-3 +* Fri Sep 18 2020 Dogtag PKI Team 10.9.4-3 - Fix issue with JAXB JAR linking -- update .spec file -* Fri Sep 18 2020 Dogtag PKI Team - 10.9.4-2 +* Fri Sep 18 2020 Dogtag PKI Team 10.9.4-2 - Fix issue with JAXB JAR linking -* Fri Sep 11 2020 Dogtag PKI Team - 10.9.4-1 +* Fri Sep 11 2020 Dogtag PKI Team 10.9.4-1 - Rebase to stable upstream v10.9.4 release -* Tue Sep 08 2020 Dogtag PKI Team - 10.9.2-3 +* Tue Sep 08 2020 Dogtag PKI Team 10.9.2-3 - Fix Fedora 31/32 to Fedora 33/rawhide upgrade path Resolves: rh-bz#1871990 -* Tue Aug 18 2020 Dogtag PKI Team - 10.9.2-2 +* Tue Aug 18 2020 Dogtag PKI Team 10.9.2-2 - Fix permission issue during clone installation; reported by FreeIPA -* Tue Aug 18 2020 Dogtag PKI Team - 10.9.2-1 +* Tue Aug 18 2020 Dogtag PKI Team 10.9.2-1 - Second attempt at JDK11 Support -* Tue Aug 18 2020 Dogtag PKI Team - 10.9.1-3 +* Tue Aug 18 2020 Dogtag PKI Team 10.9.1-3 - Force JDK8 at runtime as well -* Tue Aug 18 2020 Dogtag PKI Team - 10.9.1-2 +* Tue Aug 18 2020 Dogtag PKI Team 10.9.1-2 - Rebuilt to fix packaging issues introduced upstream -* Mon Aug 17 2020 Dogtag PKI Team - 10.9.1-1 +* Mon Aug 17 2020 Dogtag PKI Team 10.9.1-1 - Rebuilt with v10.9.1 and patches to fix JDK11 build issues -* Sat Aug 01 2020 Fedora Release Engineering - 10.9.0-0.7 +* Sat Aug 01 2020 Fedora Release Engineering 10.9.0-0.7 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Tue Jul 28 2020 Fedora Release Engineering - 10.9.0-0.6 +* Tue Jul 28 2020 Fedora Release Engineering 10.9.0-0.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Mon Jul 20 2020 Dogtag PKI Team - 10.9.0-0.5 +* Mon Jul 20 2020 Dogtag PKI Team 10.9.0-0.5 - Rebuild -b2 with Java 11 changes -* Tue Jun 30 2020 Dogtag PKI Team - 10.9.0-0.4 +* Tue Jun 30 2020 Dogtag PKI Team 10.9.0-0.4 - Rebase to match upstream beta version v10.9.0-b2 - pki password fix for FIPS -* Wed Jun 10 2020 Dogtag PKI Team - 10.9.0-0.2 +* Wed Jun 10 2020 Dogtag PKI Team 10.9.0-0.2 - Rebase to match upstream alpha version 10.9.0-a2 -* Tue May 26 2020 Miro Hrončok - 10.8.3-3 +* Tue May 26 2020 Miro Hrončok 10.8.3-3 - Rebuilt for Python 3.9 -* Mon Apr 27 2020 Dinesh Prasanth M K - 10.8.3-2 +* Mon Apr 27 2020 Dinesh Prasanth M K 10.8.3-2 - Fix bz#1814242 / dogtag issue #3168: Fix EC admin certificate profile upgrade -* Thu Mar 05 2020 Dinesh Prasanth M K - 10.8.3-1 +* Thu Mar 05 2020 Dinesh Prasanth M K 10.8.3-1 - Rebase to latest upstream version - Spec cleanup to match with upstream spec -* Thu Jan 30 2020 Fedora Release Engineering - 10.7.3-6 +* Thu Jan 30 2020 Fedora Release Engineering 10.7.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Thu Oct 03 2019 Miro Hrončok - 10.7.3-5 +* Thu Oct 03 2019 Miro Hrončok 10.7.3-5 - Rebuilt for Python 3.8.0rc1 (#1748018) -* Mon Aug 19 2019 Miro Hrončok - 10.7.3-4 +* Mon Aug 19 2019 Miro Hrončok 10.7.3-4 - Rebuilt for Python 3.8 -* Wed Aug 14 2019 Dogtag PKI Team - 10.7.3-3 +* Wed Aug 14 2019 Dogtag PKI Team 10.7.3-3 - Rebuild with patches applied -* Wed Aug 14 2019 Dogtag PKI Team - 10.7.3-2 +* Wed Aug 14 2019 Dogtag PKI Team 10.7.3-2 - Fix URL redirection for KRA and OCSP web UI -* Thu Aug 08 2019 Dogtag PKI Team - 10.7.3-1 +* Thu Aug 08 2019 Dogtag PKI Team 10.7.3-1 - Rebased to PKI 10.7.3 -* Fri Jul 26 2019 Fedora Release Engineering - 10.7.0-2 +* Fri Jul 26 2019 Fedora Release Engineering 10.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Mon May 06 2019 Dogtag PKI Team - 10.7.0-1 +* Mon May 06 2019 Dogtag PKI Team 10.7.0-1 - Rebased to PKI 10.7.0 - -