From 9cf7cfa8e90309dfb5ef2ac371b112a5abb977c9e03a9392185e92cdd96ac991 Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Tue, 1 May 2018 03:19:15 +0000
Subject: [PATCH] Accepting request 601071 from home:luizluca:branches:network

- Added support for /etc/krb5.conf.d/ for configuration snippets

/etc/krb5.conf.d/ existance is now mandatory

OBS-URL: https://build.opensuse.org/request/show/601071
OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=204
---
 krb5-mini.changes    | 5 +++++
 krb5-mini.spec       | 5 +++--
 krb5.changes         | 5 +++++
 krb5.spec            | 5 +++--
 vendor-files.tar.bz2 | 4 ++--
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/krb5-mini.changes b/krb5-mini.changes
index 0bbbdb1..60d040a 100644
--- a/krb5-mini.changes
+++ b/krb5-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 25 21:56:35 UTC 2018 - luizluca@gmail.com
+
+- Added support for /etc/krb5.conf.d/ for configuration snippets
+
 -------------------------------------------------------------------
 Thu Nov 23 13:38:33 UTC 2017 - rbrown@suse.com
 
diff --git a/krb5-mini.spec b/krb5-mini.spec
index e58f5bd..cd7650c 100644
--- a/krb5-mini.spec
+++ b/krb5-mini.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package krb5-mini
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -166,7 +166,7 @@ install -m 644 src/util/ac_check_krb5.m4 %{buildroot}%{_datadir}/aclocal/
 # install sample config files
 # I'll probably do something about this later on
 mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir}/lib/kerberos/krb5kdc
-mkdir -p %{buildroot}%{_sysconfdir}
+mkdir -p %{buildroot}%{_sysconfdir}/krb5.conf.d
 mkdir -p %{buildroot}/etc/profile.d/
 mkdir -p %{buildroot}/var/log/krb5
 mkdir -p %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/
@@ -323,6 +323,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %dir /usr/lib/mit/bin
 %doc %{krb5docdir}/README
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf
+%dir %{_sysconfdir}/krb5.conf.d
 %attr(0644,root,root) %config /etc/profile.d/krb5*
 %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kdc.conf
diff --git a/krb5.changes b/krb5.changes
index 9e10091..249ac9d 100644
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 25 21:54:39 UTC 2018 - luizluca@gmail.com
+
+- Added support for /etc/krb5.conf.d/ for configuration snippets
+ 
 -------------------------------------------------------------------
 Thu Nov 23 13:38:38 UTC 2017 - rbrown@suse.com
 
diff --git a/krb5.spec b/krb5.spec
index b60024f..5757685 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package krb5
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -233,7 +233,7 @@ install -m 644 src/util/ac_check_krb5.m4 %{buildroot}%{_datadir}/aclocal/
 # install sample config files
 # I'll probably do something about this later on
 mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir}/lib/kerberos/krb5kdc
-mkdir -p %{buildroot}%{_sysconfdir}
+mkdir -p %{buildroot}%{_sysconfdir}/krb5.conf.d
 mkdir -p %{buildroot}/etc/profile.d/
 mkdir -p %{buildroot}/var/log/krb5
 mkdir -p %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/
@@ -385,6 +385,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %attr(0700,root,root) %dir /var/log/krb5
 %doc %{krb5docdir}/README
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf
+%dir %{_sysconfdir}/krb5.conf.d
 %attr(0644,root,root) %config /etc/profile.d/krb5*
 %{_libdir}/libgssapi_krb5.*
 %{_libdir}/libgssrpc.so.*
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index a8e2562..e86afd7 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41e114dd3133a2de2a0d2591b9a1fb6f4aa22348fdd57122647966f547bf6d2f
-size 155986
+oid sha256:95b4f11ad9c88869e57d6632babb8e7de78f2b85ba10f42fc5cd208b98d6ed5d
+size 183363