From 6e9113b89caed1af13c6e9397ed8d3db94e4a9e5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 14 2020 06:08:29 +0000
Subject: import gssproxy-0.8.0-17.el8


---

diff --git a/SOURCES/Document-config-file-non-merging.patch b/SOURCES/Document-config-file-non-merging.patch
new file mode 100644
index 0000000..5fa05a4
--- /dev/null
+++ b/SOURCES/Document-config-file-non-merging.patch
@@ -0,0 +1,30 @@
+From ceeb1ff9226d21ff166d6737bab34b91fa6660fa Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Wed, 10 Jun 2020 15:50:36 -0400
+Subject: [PATCH] Document config file non-merging
+
+Merges: #4
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+Reviewed-by: Simo Sorce <simo@redhat.com>
+(cherry picked from commit a05b876badd52ba99d95c981f5f8b0e50de28c63)
+(cherry picked from commit 2592d32c5c6d39f30dc0bfdb78b5c292ed0af2ae)
+---
+ man/gssproxy.conf.5.xml | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/man/gssproxy.conf.5.xml b/man/gssproxy.conf.5.xml
+index 53cae3d..c8dd504 100644
+--- a/man/gssproxy.conf.5.xml
++++ b/man/gssproxy.conf.5.xml
+@@ -37,7 +37,10 @@
+             of the form "##-foo.conf" (that is, start with two numbers
+             followed by a dash, and end in ".conf").  Files not conforming to
+             this will be ignored unless specifically requested through command
+-            line parameters.
++            line parameters.  Within a single file, any duplicate values or
++            sections will be merged.  Across multiple files, duplicates will
++            generate a warning, and the first value encountered will take
++            precedence (i.e., there is no merging).
+         </para>
+     </refsect1>
+ 
diff --git a/SPECS/gssproxy.spec b/SPECS/gssproxy.spec
index 577c2e5..c8a0dc4 100644
--- a/SPECS/gssproxy.spec
+++ b/SPECS/gssproxy.spec
@@ -1,7 +1,7 @@
 Name:		gssproxy
 
 Version:	0.8.0
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	GSSAPI Proxy
 
 Group:		System Environment/Libraries
@@ -28,6 +28,7 @@ Patch11: Change-the-way-we-handle-encrypted-buffers.patch
 Patch12: Avoid-uninitialized-free-when-allocating-buffers.patch
 Patch13: Make-syslog-of-call-status-configurable.patch
 Patch14: Delay-gssproxy-start-until-after-network.target.patch
+Patch15: Document-config-file-non-merging.patch
 
 ### Dependencies ###
 Requires: krb5-libs >= 1.12.0
@@ -122,6 +123,10 @@ mkdir -p %{buildroot}%{gpstatedir}/rcache
 %systemd_postun_with_restart gssproxy.service
 
 %changelog
+* Tue Oct 13 2020 Robbie Harwood <rharwood@redhat.com> - 0.8.0-17
+- Document config file non-merging
+- Resolves: #1838222
+
 * Mon Apr 06 2020 Robbie Harwood <rharwood@redhat.com> - 0.8.0-16
 - Delay gssproxy start until after network.target
 - Resolves: #1780876