- fixes #560014 - SELinux is preventing /usr/sbin/pppd "read write" access
on pppd2.tdb
This commit is contained in:
parent
a14d8ec249
commit
b99f5253d1
30
ppp-2.4.5-var_run_ppp.patch
Normal file
30
ppp-2.4.5-var_run_ppp.patch
Normal file
@ -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
|
7
ppp.spec
7
ppp.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: The PPP (Point-to-Point Protocol) daemon.
|
Summary: The PPP (Point-to-Point Protocol) daemon.
|
||||||
Name: ppp
|
Name: ppp
|
||||||
Version: 2.4.5
|
Version: 2.4.5
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
|
Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
|
||||||
@ -24,6 +24,7 @@ Patch21: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
|
|||||||
Patch22: ppp-2.4.4-cbcp.patch
|
Patch22: ppp-2.4.4-cbcp.patch
|
||||||
Patch23: ppp-2.4.2-dontwriteetc.patch
|
Patch23: ppp-2.4.2-dontwriteetc.patch
|
||||||
Patch24: ppp-2.4.4-fd_leak.patch
|
Patch24: ppp-2.4.4-fd_leak.patch
|
||||||
|
Patch25: ppp-2.4.5-var_run_ppp.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-root
|
BuildRoot: %{_tmppath}/%{name}-root
|
||||||
BuildPrereq: pam-devel, libpcap-devel
|
BuildPrereq: pam-devel, libpcap-devel
|
||||||
@ -64,6 +65,7 @@ This package contains the header files for building plugins for ppp.
|
|||||||
%patch22 -p1 -b .cbcp
|
%patch22 -p1 -b .cbcp
|
||||||
%patch23 -p1 -b .dontwriteetc
|
%patch23 -p1 -b .dontwriteetc
|
||||||
%patch24 -p1 -b .fd_leak
|
%patch24 -p1 -b .fd_leak
|
||||||
|
%patch25 -p1 -b .var_run_ppp
|
||||||
|
|
||||||
rm -f scripts/*.local
|
rm -f scripts/*.local
|
||||||
rm -f scripts/*.change_resolv_conf
|
rm -f scripts/*.change_resolv_conf
|
||||||
@ -128,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc PLUGINS
|
%doc PLUGINS
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 12 2010 Jiri Skala <jskala@redhat.com> 2.4.5-5
|
||||||
|
- 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-4
|
* Thu Feb 04 2010 Jiri Skala <jskala@redhat.com> 2.4.5-4
|
||||||
- fixed one line in fd_leak patch
|
- fixed one line in fd_leak patch
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user