From 05cc0230f356282e857bd405a7867e8d76f62209 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Thu, 30 Jul 2020 08:23:26 -0500 Subject: [PATCH] Conditional fixes for ELN to set krb5-kdb version appropriately Signed-off-by: Merlin Mathesius --- freeipa.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/freeipa.spec b/freeipa.spec index b24c0ed..c3b4b0d 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -63,7 +63,6 @@ %global package_name ipa %global alt_name freeipa %global krb5_version 1.16.1 -%global krb5_kdb_version 7.0 # 0.7.16: https://github.com/drkjam/netaddr/issues/71 %global python_netaddr_version 0.7.16 # Require 4.7.0 which brings Python 3 bindings @@ -84,7 +83,6 @@ %global alt_name ipa # Fix for CVE-2018-20217 %global krb5_version 1.18 -%global krb5_kdb_version 8.0 # 0.7.16: https://github.com/drkjam/netaddr/issues/71 %global python_netaddr_version 0.7.16 # Require 4.7.0 which brings Python 3 bindings @@ -94,13 +92,6 @@ %global selinux_policy_version 3.14.5-40 %global slapi_nis_version 0.56.5 -# krb5 can only provide one KDB at a time -%if 0%{?fedora} >= 32 -%global krb5_kdb_version 8.0 -%else -%global krb5_kdb_version 7.0 -%endif - # fix for segfault in python3-ldap, https://pagure.io/freeipa/issue/7324 %global python_ldap_version 3.1.0-1 # Fix for create suffix @@ -122,6 +113,13 @@ # Fedora %endif +# krb5 can only provide one KDB at a time +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 +%global krb5_kdb_version 8.0 +%else +%global krb5_kdb_version 7.0 +%endif + # 10.7.3 supports LWCA key replication using AES # https://pagure.io/freeipa/issue/8020 %global pki_version 10.7.3-1 @@ -158,7 +156,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Identity, Policy and Audit system License: GPLv3+ @@ -1494,6 +1492,9 @@ fi %endif %changelog +* Thu Jul 30 2020 Merlin Mathesius - 4.8.7-3 +- Conditional fixes for ELN to set krb5-kdb version appropriately + * Mon Jul 27 2020 Fedora Release Engineering - 4.8.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild