From 50c10c8bd6e687d2733aa012c852eada2fca7b59 Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Fri, 12 Feb 2010 15:53:59 +0000
Subject: [PATCH] - fixes #560014 - SELinux is preventing /usr/sbin/pppd "read
 write" access     on pppd2.tdb

---
 ppp-2.4.5-var_run_ppp.patch | 30 ++++++++++++++++++++++++++++++
 ppp.spec                    |  7 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 ppp-2.4.5-var_run_ppp.patch

diff --git a/ppp-2.4.5-var_run_ppp.patch b/ppp-2.4.5-var_run_ppp.patch
new file mode 100644
index 0000000..2c49927
--- /dev/null
+++ b/ppp-2.4.5-var_run_ppp.patch
@@ -0,0 +1,30 @@
+diff -up ppp-2.4.5/pppd/pathnames.h.var_run_ppp ppp-2.4.5/pppd/pathnames.h
+--- ppp-2.4.5/pppd/pathnames.h.var_run_ppp	2010-02-12 16:36:14.479362718 +0100
++++ ppp-2.4.5/pppd/pathnames.h	2010-02-12 16:38:24.995330994 +0100
+@@ -7,9 +7,13 @@
+ #ifdef HAVE_PATHS_H
+ #include <paths.h>
+ 
++#define _SUBPATH_PPP       "ppp/"
+ #else /* HAVE_PATHS_H */
+ #ifndef _PATH_VARRUN
+ #define _PATH_VARRUN 	"/etc/ppp/"
++#define _SUBPATH_PPP
++#else
++#define _SUBPATH_PPP       "ppp/"
+ #endif
+ #define _PATH_DEVNULL	"/dev/null"
+ #endif /* HAVE_PATHS_H */
+@@ -46,10 +50,10 @@
+ #endif /* IPX_CHANGE */
+ 
+ #ifdef __STDC__
+-#define _PATH_PPPDB	_ROOT_PATH _PATH_VARRUN "pppd2.tdb"
++#define _PATH_PPPDB	_ROOT_PATH _PATH_VARRUN _SUBPATH_PPP "pppd2.tdb"
+ #else /* __STDC__ */
+ #ifdef HAVE_PATHS_H
+-#define _PATH_PPPDB	"/var/run/pppd2.tdb"
++#define _PATH_PPPDB	"/var/run/ppp/pppd2.tdb"
+ #else
+ #define _PATH_PPPDB	"/etc/ppp/pppd2.tdb"
+ #endif
diff --git a/ppp.spec b/ppp.spec
index be1b0eb..c0ad2d1 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,7 +1,7 @@
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
 Version: 2.4.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -25,6 +25,7 @@ Patch21: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
 Patch22: ppp-2.4.4-cbcp.patch
 Patch23: ppp-2.4.2-dontwriteetc.patch
 Patch24: ppp-2.4.4-fd_leak.patch
+Patch25: ppp-2.4.5-var_run_ppp.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel, libpcap-devel
@@ -65,6 +66,7 @@ This package contains the header files for building plugins for ppp.
 %patch22 -p1 -b .cbcp
 %patch23 -p1 -b .dontwriteetc
 %patch24 -p1 -b .fd_leak
+%patch25 -p1 -b .var_run_ppp
 
 rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
@@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Fri Feb 12 2010 Jiri Skala <jskala@redhat.com> - 2.4.5-6
+- fixes #560014 - SELinux is preventing /usr/sbin/pppd "read write" access on pppd2.tdb
+
 * Thu Feb 04 2010 Jiri Skala <jskala@redhat.com> - 2.4.5-5
 - one line correction in fd_leak patch