From 6236d03ae7eb0bd61b0e0b86fab2a790b8769c1b Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Thu, 25 Nov 2010 16:21:53 +0000
Subject: [PATCH] Support /var/run on tmpfs

- Add /etc/tmpfiles.d/pptp.conf to create /var/run/pptp at boot time for
  systems with /var/run on tmpfs (#656672)
---
 pptp-tmpfs.conf |  1 +
 pptp.spec       | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pptp-tmpfs.conf

diff --git a/pptp-tmpfs.conf b/pptp-tmpfs.conf
new file mode 100644
index 0000000..c71938d
--- /dev/null
+++ b/pptp-tmpfs.conf
@@ -0,0 +1 @@
+d	/var/run/pptp	0750
diff --git a/pptp.spec b/pptp.spec
index e890896..d9ee1bd 100644
--- a/pptp.spec
+++ b/pptp.spec
@@ -1,11 +1,12 @@
 Name:		pptp
 Version:	1.7.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Point-to-Point Tunneling Protocol (PPTP) Client
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://pptpclient.sourceforge.net/
 Source0:	http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz
+Source1:	pptp-tmpfs.conf
 Patch0:		pptp-1.7.2-compat.patch
 Patch1:		pptp-1.7.2-ip-path.patch
 Patch2:		pptp-1.7.2-pptpsetup.patch
@@ -75,6 +76,11 @@ tunnels.
 %{__make} DESTDIR=%{buildroot} install
 %{__install} -d -m 750 %{buildroot}%{_localstatedir}/run/pptp
 
+# Make sure /var/run/pptp exists at boot time for systems
+# with /var/run on tmpfs (#656672)
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
+%{__install} -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/pptp.conf
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -82,6 +88,7 @@ tunnels.
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
 %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
+%{_sysconfdir}/tmpfiles.d/pptp.conf
 %{_sbindir}/pptp
 %{_mandir}/man8/pptp.8*
 %dir %attr(750,root,root) %{_localstatedir}/run/pptp/
@@ -95,6 +102,10 @@ tunnels.
 %{_mandir}/man8/pptpsetup.8*
 
 %changelog
+* Thu Nov 25 2010 Paul Howarth <paul@city-fan.org> 1.7.2-10
+- Add /etc/tmpfiles.d/pptp.conf to create /var/run/pptp at boot time for
+  systems with /var/run on tmpfs (#656672)
+
 * Wed Jun 16 2010 Paul Howarth <paul@city-fan.org> 1.7.2-9
 - Add some fixes from CVS:
   - Fix waitpid usage