|
 |
ac7d03 |
From c8a4e5d946d8261748d632361a016950ab42f4ba Mon Sep 17 00:00:00 2001
|
|
|
ac7d03 |
From: Jan Cholasta <jcholast@redhat.com>
|
|
|
ac7d03 |
Date: Tue, 25 Apr 2017 12:35:34 +0000
|
|
|
ac7d03 |
Subject: [PATCH] spec file: bump krb5 Requires for certauth fixes
|
|
|
ac7d03 |
|
|
|
ac7d03 |
Bump krb5-* Requires to the version which includes the final version of
|
|
|
ac7d03 |
certauth support.
|
|
|
ac7d03 |
|
|
|
ac7d03 |
https://pagure.io/freeipa/issue/4905
|
|
|
ac7d03 |
|
|
|
ac7d03 |
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
|
|
|
ac7d03 |
---
|
|
|
ac7d03 |
freeipa.spec.in | 12 ++++++++----
|
|
|
ac7d03 |
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
ac7d03 |
|
|
|
ac7d03 |
diff --git a/freeipa.spec.in b/freeipa.spec.in
|
|
|
ac7d03 |
index 978ebb184f7d051b303940560f44c7a094b071a1..3b7410b6bda3afc877d928b4df21529ae2faf0aa 100644
|
|
|
ac7d03 |
--- a/freeipa.spec.in
|
|
|
ac7d03 |
+++ b/freeipa.spec.in
|
|
|
ac7d03 |
@@ -36,11 +36,15 @@
|
|
|
ac7d03 |
|
|
|
ac7d03 |
%global alt_name ipa
|
|
|
ac7d03 |
%if 0%{?rhel}
|
|
|
ac7d03 |
+# 1.15.1-7: certauth (http://krbdev.mit.edu/rt/Ticket/Display.html?id=8561)
|
|
|
ac7d03 |
+%global krb5_version 1.15.1-4
|
|
|
ac7d03 |
# Require 4.6.0-4 which brings RC4 for FIPS + trust fixes to priv. separation
|
|
|
ac7d03 |
%global samba_version 4.6.0-4
|
|
|
ac7d03 |
%global selinux_policy_version 3.12.1-153
|
|
|
ac7d03 |
%global slapi_nis_version 0.56.0-4
|
|
|
ac7d03 |
%else
|
|
|
ac7d03 |
+# 1.15.1-7: certauth (http://krbdev.mit.edu/rt/Ticket/Display.html?id=8561)
|
|
|
ac7d03 |
+%global krb5_version 1.15.1-7
|
|
|
ac7d03 |
# Require 4.6.0-4 which brings RC4 for FIPS + trust fixes to priv. separation
|
|
|
ac7d03 |
%global samba_version 2:4.6.0-4
|
|
|
ac7d03 |
%global selinux_policy_version 3.13.1-158.4
|
|
|
ac7d03 |
@@ -82,8 +86,7 @@ BuildRequires: openldap-devel
|
|
|
ac7d03 |
%if 0%{?fedora} > 25
|
|
|
ac7d03 |
BuildRequires: krb5-kdb-version = 6.1
|
|
|
ac7d03 |
%endif
|
|
|
ac7d03 |
-# 1.15.1-3: certauth (http://krbdev.mit.edu/rt/Ticket/Display.html?id=8561)
|
|
|
ac7d03 |
-BuildRequires: krb5-devel >= 1.15.1-3
|
|
|
ac7d03 |
+BuildRequires: krb5-devel >= %{krb5_version}
|
|
|
ac7d03 |
# 1.27.4: xmlrpc_curl_xportparms.gssapi_delegation
|
|
|
ac7d03 |
BuildRequires: xmlrpc-c-devel >= 1.27.4
|
|
|
ac7d03 |
BuildRequires: popt-devel
|
|
|
ac7d03 |
@@ -263,8 +266,9 @@ Requires: 389-ds-base >= 1.3.5.14
|
|
|
ac7d03 |
Requires: openldap-clients > 2.4.35-4
|
|
|
ac7d03 |
Requires: nss >= 3.14.3-12.0
|
|
|
ac7d03 |
Requires: nss-tools >= 3.14.3-12.0
|
|
|
ac7d03 |
+Requires(post): krb5-server >= %{krb5_version}
|
|
|
ac7d03 |
Requires(post): krb5-server >= %{krb5_base_version}, krb5-server < %{krb5_base_version}.100
|
|
|
ac7d03 |
-Requires: krb5-pkinit-openssl
|
|
|
ac7d03 |
+Requires: krb5-pkinit-openssl >= %{krb5_version}
|
|
|
ac7d03 |
Requires: cyrus-sasl-gssapi%{?_isa}
|
|
|
ac7d03 |
Requires: ntp
|
|
|
ac7d03 |
Requires: httpd >= 2.4.6-31
|
|
|
ac7d03 |
@@ -481,7 +485,7 @@ Requires: python2-ipaclient = %{version}-%{release}
|
|
|
ac7d03 |
Requires: python-ldap
|
|
|
ac7d03 |
Requires: cyrus-sasl-gssapi%{?_isa}
|
|
|
ac7d03 |
Requires: ntp
|
|
|
ac7d03 |
-Requires: krb5-workstation
|
|
|
ac7d03 |
+Requires: krb5-workstation >= %{krb5_version}
|
|
|
ac7d03 |
Requires: authconfig
|
|
|
ac7d03 |
Requires: curl
|
|
|
ac7d03 |
# NIS domain name config: /usr/lib/systemd/system/*-domainname.service
|
|
|
ac7d03 |
--
|
|
|
ac7d03 |
2.12.2
|
|
|
ac7d03 |
|