rpms/ppp/devel ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch, 1.1, 1.2 ppp.spec, 1.58, 1.59

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/ppp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23230

Modified Files:
	ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch ppp.spec 
Log Message:
* Fri Mar 05 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-7
- removed duplicities from patches (ip-*.local.add)


ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch:
 pppd.8 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch	24 Jul 2006 18:09:32 -0000	1.1
+++ ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch	5 Mar 2010 12:29:55 -0000	1.2
@@ -10,37 +10,3 @@ diff -urNp --exclude-from=/mdomsch2/excl
  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 at 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 at 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
- 


Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ppp.spec	12 Feb 2010 15:53:59 -0000	1.58
+++ ppp.spec	5 Mar 2010 12:29:55 -0000	1.59
@@ -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 at redhat.com> - 2.4.5-7
+- removed duplicities from patches (ip-*.local.add)
+
 * Fri Feb 12 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-6
 - fixes #560014 - SELinux is preventing /usr/sbin/pppd "read write" access on pppd2.tdb