rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Nix /usr/share/krb5.conf.d to reduce complexity

Browse Source
This commit is contained in:
Robbie Harwood (frozencemetery) 2015-09-23 15:11:53 +00:00
parent 65ce267be1
commit a9af3c8817
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
krb5.conf
View File

@ -1,5 +1,4 @@
includedir /etc/krb5.conf.d/ includedir /etc/krb5.conf.d/
includedir /usr/share/krb5.conf.d/
[logging] [logging]
default = FILE:/var/log/krb5libs.log default = FILE:/var/log/krb5libs.log

9
krb5.spec
View File

@ -43,7 +43,7 @@
Summary: The Kerberos network authentication system Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.13.2 Version: 1.13.2
Release: 9%{?dist} Release: 10%{?dist}
# - Maybe we should explode from the now-available-to-everybody tarball instead? # - 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 # 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 # - 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 mkdir -p $RPM_BUILD_ROOT/etc
install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/krb5.conf 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 # 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. # location is not relative to sysconfdir, but is hard-coded in g_initialize.c.
mkdir -m 755 -p $RPM_BUILD_ROOT/etc/gss 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. # These are hard-coded, not-dependent-on-the-configure-script paths.
%dir /etc/gss %dir /etc/gss
%dir /etc/gss/mech.d %dir /etc/gss/mech.d
%dir /usr/share/krb5.conf.d
%verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf %verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf
/%{_mandir}/man5/.k5identity.5* /%{_mandir}/man5/.k5identity.5*
/%{_mandir}/man5/.k5login.5* /%{_mandir}/man5/.k5login.5*
@ -978,6 +974,9 @@ exit 0
%changelog %changelog
* Wed Sep 23 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-10
- Nix /usr/share/krb5.conf.d to reduce complexity
* Wed Sep 23 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-9 * Wed Sep 23 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-9
- Depend on crypto-policies which provides /etc/krb5.conf.d (#1225792) - Depend on crypto-policies which provides /etc/krb5.conf.d (#1225792)