From 018e011cb6bc0d40684afa88760a0ecbcab6ee52 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Mon, 20 Sep 2021 15:43:05 -0400
Subject: [PATCH] Move default socket to the rundir

Resolves: #1853293
Signed-off-by: Simo Sorce <simo@redhat.com>
---
 gssproxy.sock.compat.conf |  1 +
 gssproxy.spec             | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 gssproxy.sock.compat.conf

diff --git a/gssproxy.sock.compat.conf b/gssproxy.sock.compat.conf
new file mode 100644
index 0000000..f10b810
--- /dev/null
+++ b/gssproxy.sock.compat.conf
@@ -0,0 +1 @@
+L   /var/lib/gssproxy/default.sock  -   -   -   /run/gssproxy.default.sock
diff --git a/gssproxy.spec b/gssproxy.spec
index 60f86bb..781ca9b 100644
--- a/gssproxy.spec
+++ b/gssproxy.spec
@@ -1,17 +1,19 @@
 Name:		gssproxy
 
 Version:	0.8.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	GSSAPI Proxy
 
 License:	MIT
 URL:		https://github.com/gssapi/gssproxy
 Source0:	https://github.com/gssapi/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:	rwtab
+Source2:        gssproxy.sock.compat.conf
 
 %global servicename gssproxy
 %global pubconfpath %{_sysconfdir}/gssproxy
 %global gpstatedir %{_localstatedir}/lib/gssproxy
+%global gpsockpath %{_rundir}/gssproxy.default.sock
 
 ### Patches ###
 
@@ -61,6 +63,7 @@ A proxy for GSSAPI credential handling
 autoreconf -f -i
 %configure \
     --with-pubconf-path=%{pubconfpath} \
+    --with-socket-name=%{gpsockpath} \
     --with-initscript=systemd \
     --disable-static \
     --disable-rpath \
@@ -80,7 +83,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/gss/mech.d
 install -m644 examples/mech %{buildroot}%{_sysconfdir}/gss/mech.d/gssproxy.conf
 mkdir -p %{buildroot}%{gpstatedir}/rcache
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d
+mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d/gssproxy
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
+ln -s %{gpsockpath} %{buildroot}%{gpstatedir}/default.sock
 
 %files
 %license COPYING
@@ -99,6 +105,13 @@ install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d/gssproxy
 %{_mandir}/man8/gssproxy.8*
 %{_mandir}/man8/gssproxy-mech.8*
 %config(noreplace) %{_sysconfdir}/rwtab.d/gssproxy
+%{gpstatedir}/default.sock
+%{_tmpfilesdir}/%{name}.conf
+
+%pre
+if [ -S %{gpstatedir}/default.sock ]; then
+    rm -f %{gpstatedir}/default.sock
+fi
 
 %post
 %systemd_post gssproxy.service
@@ -110,6 +123,10 @@ install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d/gssproxy
 %systemd_postun_with_restart gssproxy.service
 
 %changelog
+* Mon Sep 20 2021 Simo Sorce <simo@redhat.com> - 0.8.4-5
+- Move default socket to the rundir
+- Resolves: #1853293
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
@@ -120,7 +137,7 @@ install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d/gssproxy
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Wed Jan 13 2020 Robbie Harwood <rharwood@redhat.com> - 0.8.4-1
+* Wed Jan 13 2021 Robbie Harwood <rharwood@redhat.com> - 0.8.4-1
 - New upstream release (0.8.4)
 
 * Thu Oct 29 2020 Robbie Harwood <rharwood@redhat.com> - 0.8.3-6