rpms
/
ppp
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- removed duplicities from patches (ip-*.local.add)

This commit is contained in:
Jiri Skala 2010-03-05 12:29:55 +00:00
parent 50c10c8bd6
commit 063a5ddf4d
2 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
View File

@ -10,37 +10,3 @@ diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/pppd/pppd.
the address(es) supplied by the peer.
.TP
.B user \fIname
diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/scripts/ip-down.local.add.change_resolv_conf ppp-2.4.3/scripts/ip-down.local.add.change_resolv_conf
--- ppp-2.4.3.orig/scripts/ip-down.local.add.change_resolv_conf 1999-02-26 22:32:42.000000000 -0600
+++ ppp-2.4.3/scripts/ip-down.local.add.change_resolv_conf 2005-08-03 22:11:17.000000000 -0500
@@ -10,7 +10,7 @@
# Nick Walker (nickwalker@email.com)
#
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
if [ -f /etc/ppp/resolv.prev ]; then
cp -f /etc/ppp/resolv.prev /etc/resolv.conf
else
diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/scripts/ip-up.local.add.change_resolv_conf ppp-2.4.3/scripts/ip-up.local.add.change_resolv_conf
--- ppp-2.4.3.orig/scripts/ip-up.local.add.change_resolv_conf 1999-11-14 21:28:10.000000000 -0600
+++ ppp-2.4.3/scripts/ip-up.local.add.change_resolv_conf 2005-08-03 22:11:29.000000000 -0500
@@ -10,15 +10,15 @@
# Nick Walker (nickwalker@email.com)
#
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
rm -f /etc/ppp/resolv.prev
if [ -f /etc/resolv.conf ]; then
cp /etc/resolv.conf /etc/ppp/resolv.prev
grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
- cat /etc/ppp/resolv.conf >> /etc/resolv.conf
+ cat /var/run/ppp/resolv.conf >> /etc/resolv.conf
else
- cp /etc/ppp/resolv.conf /etc
+ cp /var/run/ppp/resolv.conf /etc
fi
fi

5
ppp.spec
View File

@ -1,7 +1,7 @@
Summary: The Point-to-Point Protocol daemon
Name: ppp
Version: 2.4.5
Release: 6%{?dist}
Release: 7%{?dist}
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
Group: System Environment/Daemons
URL: http://www.samba.org/ppp
@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
%doc PLUGINS
%changelog
* Fri Mar 05 2010 Jiri Skala <jskala@redhat.com> - 2.4.5-7
- removed duplicities from patches (ip-*.local.add)
* 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