From 32c8f7fc3cf9383e4109885f731c85f5c9f910dd Mon Sep 17 00:00:00 2001
From: Tomas Halman <thalman@redhat.com>
Date: Wed, 22 Sep 2021 12:25:13 +0200
Subject: [PATCH] Moving temporary files from /var/run to /run

Resolves: rhbz#1893472
---
 nslcd.service      |  2 +-
 nslcd.tmpfiles     |  4 ++--
 nss-pam-ldapd.spec | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/nslcd.service b/nslcd.service
index 61ae1fd..5672791 100644
--- a/nslcd.service
+++ b/nslcd.service
@@ -5,7 +5,7 @@ Documentation=man:nslcd(8) man:nslcd.conf(5)
 
 [Service]
 Type=forking
-PIDFile=/var/run/nslcd/nslcd.pid
+PIDFile=/run/nslcd/nslcd.pid
 ExecStart=/usr/sbin/nslcd
 RestartSec=10s
 Restart=on-failure
diff --git a/nslcd.tmpfiles b/nslcd.tmpfiles
index 9e48805..4953cf6 100644
--- a/nslcd.tmpfiles
+++ b/nslcd.tmpfiles
@@ -1,2 +1,2 @@
-# nslcd needs a directory in /var/run to store its pid file and socket
-d /var/run/nslcd 0775 nslcd root
+# nslcd needs a directory in /run to store its pid file and socket
+d /run/nslcd 0775 nslcd root
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index 57dd4c8..45262eb 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -5,7 +5,7 @@
 
 Name:           nss-pam-ldapd
 Version:        0.9.10
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        An nsswitch module which uses directory servers
 License:        LGPLv2+
 URL:            http://arthurdejong.org/nss-pam-ldapd/
@@ -53,7 +53,9 @@ autoreconf -f -i
 %build
 %configure --libdir=%{nssdir} \
            --disable-utils \
-           --with-pam-seclib-dir=%{pamdir}
+           --with-pam-seclib-dir=%{pamdir} \
+           --with-nslcd-pidfile=/run/nslcd/nslcd.pid \
+           --with-nslcd-socket=/run/nslcd/socket
 %make_build
 
 %check
@@ -70,7 +72,7 @@ ln -s libnss_ldap.so.2 $RPM_BUILD_ROOT/%{nssdir}/libnss_ldap.so
 sed -i -e 's,^uid.*,uid nslcd,g' -e 's,^gid.*,gid ldap,g' \
 $RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf
 touch -r nslcd.conf $RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf
-mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/nslcd
+mkdir -p -m 0755 $RPM_BUILD_ROOT/run/nslcd
 mkdir -p -m 0755 $RPM_BUILD_ROOT/%{_tmpfilesdir}
 install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
 
@@ -83,7 +85,7 @@ install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
 %attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/nslcd.conf
 %attr(0644,root,root) %config(noreplace) %{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/nslcd.service
-%attr(0775,nslcd,root) /var/run/nslcd
+%attr(0775,nslcd,root) /run/nslcd
 
 %pre
 getent group  ldap  > /dev/null || \
@@ -105,6 +107,9 @@ getent passwd nslcd > /dev/null || \
 %systemd_postun_with_restart nslcd.service
 
 %changelog
+* Wed Sep 22 2021 Moving temporary files from /var/run to /run
+- Resolves: rhbz#1893472
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild