From c52ae77dcdc618e0fa3346249e3b10fa48bb1aab Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Feb 08 2012 16:21:27 +0000
Subject: change all /var/run/ to /run/


---

diff --git a/cyrus-sasl-2.1.20-saslauthd.conf-path.patch b/cyrus-sasl-2.1.20-saslauthd.conf-path.patch
index 168a21b..8e025d2 100644
--- a/cyrus-sasl-2.1.20-saslauthd.conf-path.patch
+++ b/cyrus-sasl-2.1.20-saslauthd.conf-path.patch
@@ -1,6 +1,19 @@
---- cyrus-sasl-2.1.20/saslauthd/saslauthd.mdoc	2005-05-06 16:05:44.000000000 -0400
-+++ cyrus-sasl-2.1.20/saslauthd/saslauthd.mdoc	2005-05-06 16:05:39.000000000 -0400
-@@ -216,7 +216,7 @@
+diff -up cyrus-sasl-2.1.25/saslauthd/saslauthd.8.path cyrus-sasl-2.1.25/saslauthd/saslauthd.8
+--- cyrus-sasl-2.1.25/saslauthd/saslauthd.8.path	2012-02-08 17:02:25.143783451 +0100
++++ cyrus-sasl-2.1.25/saslauthd/saslauthd.8	2012-02-08 17:04:31.775795190 +0100
+@@ -177,7 +177,7 @@ NNOOTTEESS
+      anyway.)
+ 
+ FFIILLEESS
+-     /var/run/saslauthd/mux  The default communications socket.
++     /run/saslauthd/mux  The default communications socket.
+ 
+      /usr/local/etc/saslauthd.conf
+                              The default configuration file for ldap support.
+diff -up cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc.path cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc
+--- cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc.path	2009-12-03 20:07:03.000000000 +0100
++++ cyrus-sasl-2.1.25/saslauthd/saslauthd.mdoc	2012-02-08 17:01:39.400986561 +0100
+@@ -216,7 +216,7 @@ instead.
  .Em (All platforms that support OpenLDAP 2.0 or higher)
  .Pp
  Authenticate against an ldap server.  The ldap configuration parameters are
@@ -9,9 +22,14 @@
  changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
  distribution for the list of available parameters.
  .It Li sia
-@@ -249,7 +249,7 @@
- .Bl -tag -width "/var/run/saslauthd/mux"
- .It Pa /var/run/saslauthd/mux
+@@ -246,10 +246,10 @@ these ticket files can cause serious per
+ servers. (Kerberos
+ was never intended to be used in this manner, anyway.)
+ .Sh FILES
+-.Bl -tag -width "/var/run/saslauthd/mux"
+-.It Pa /var/run/saslauthd/mux
++.Bl -tag -width "/run/saslauthd/mux"
++.It Pa /run/saslauthd/mux
  The default communications socket.
 -.It Pa /usr/local/etc/saslauthd.conf
 +.It Pa /etc/saslauthd.conf
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 06630d2..93fdaa7 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -261,7 +261,7 @@ echo "$LDFLAGS"
         --with-gss_impl=mit \
         --with-rc4 \
         --with-dblib=berkeley \
-        --with-saslauthd=/var/run/saslauthd --without-pwcheck \
+        --with-saslauthd=/run/saslauthd --without-pwcheck \
 %if ! %{bootstrap_cyrus_sasl}
         --with-ldap \
 %endif
@@ -311,7 +311,7 @@ install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/
 install -m644 -p saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
 
 # Create the saslauthd listening directory.
-install -m755 -d $RPM_BUILD_ROOT/var/run/saslauthd
+install -m755 -d $RPM_BUILD_ROOT/run/saslauthd
 
 # Install the init script for saslauthd and the init script's config file.
 install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig
@@ -382,7 +382,7 @@ exit 0
 %config(noreplace) /etc/sysconfig/saslauthd
 %{_unitdir}/saslauthd.service
 /etc/tmpfiles.d/saslauthd.conf
-%ghost /var/run/saslauthd
+%dir /run/saslauthd
 
 %files lib
 %defattr(-,root,root)