From a9af3c8817d73f522efaffa7f3ab7efbbce0c0ee Mon Sep 17 00:00:00 2001 From: "Robbie Harwood (frozencemetery)" Date: Wed, 23 Sep 2015 15:11:53 +0000 Subject: Nix /usr/share/krb5.conf.d to reduce complexity --- krb5.conf | 1 - krb5.spec | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/krb5.conf b/krb5.conf index 864a487..a255d02 100644 --- a/krb5.conf +++ b/krb5.conf @@ -1,5 +1,4 @@ includedir /etc/krb5.conf.d/ -includedir /usr/share/krb5.conf.d/ [logging] default = FILE:/var/log/krb5libs.log diff --git a/krb5.spec b/krb5.spec index b0d37f5..3aaa781 100644 --- a/krb5.spec +++ b/krb5.spec @@ -43,7 +43,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.13.2 -Release: 9%{?dist} +Release: 10%{?dist} # - Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar # - The sources below are stored in a lookaside cache. Upload with @@ -491,9 +491,6 @@ mkdir -p $RPM_BUILD_ROOT%{_var}/kerberos/krb5/user mkdir -p $RPM_BUILD_ROOT/etc install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/krb5.conf -# krb5.conf has default include on this directory. -mkdir -p $RPM_BUILD_ROOT/usr/share/krb5.conf.d - # Parent of configuration file for list of loadable GSS mechs ("mechs"). This # location is not relative to sysconfdir, but is hard-coded in g_initialize.c. mkdir -m 755 -p $RPM_BUILD_ROOT/etc/gss @@ -881,7 +878,6 @@ exit 0 # These are hard-coded, not-dependent-on-the-configure-script paths. %dir /etc/gss %dir /etc/gss/mech.d -%dir /usr/share/krb5.conf.d %verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf /%{_mandir}/man5/.k5identity.5* /%{_mandir}/man5/.k5login.5* @@ -978,6 +974,9 @@ exit 0 %changelog +* Wed Sep 23 2015 Robbie Harwood - 1.13.2-10 +- Nix /usr/share/krb5.conf.d to reduce complexity + * Wed Sep 23 2015 Robbie Harwood - 1.13.2-9 - Depend on crypto-policies which provides /etc/krb5.conf.d (#1225792) -- cgit