rpms/ppp/F-13 ppp-2.4.5-ppp_resolv.patch,NONE,1.1 ppp.spec,1.60,1.61

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/ppp/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1669

Modified Files:
	ppp.spec 
Added Files:
	ppp-2.4.5-ppp_resolv.patch 
Log Message:
* Tue Jul 13 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-9
- fixes #613717 - Missing line in example script ip-up.local.add


ppp-2.4.5-ppp_resolv.patch:
 ip-up.local.add |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE ppp-2.4.5-ppp_resolv.patch ---
diff -up ppp-2.4.5/scripts/ip-up.local.add.ppp_resolv ppp-2.4.5/scripts/ip-up.local.add
--- ppp-2.4.5/scripts/ip-up.local.add.ppp_resolv	2010-07-13 10:29:23.227943994 +0200
+++ ppp-2.4.5/scripts/ip-up.local.add	2010-07-13 10:32:27.729695487 +0200
@@ -18,6 +18,9 @@ if [ -n "$USEPEERDNS" -a -f /var/run/ppp
 		rscf=/var/run/ppp/resolv.new
 		grep domain /var/run/ppp/resolv.prev > $rscf
 		grep search /var/run/ppp/resolv.prev >> $rscf
+		if [ -f /var/run/ppp/resolv.conf ]; then
+			cat /var/run/ppp/resolv.conf >> $rscf
+		fi
 		change_resolv_conf $rscf
 		rm -f $rscf
 	else


Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-13/ppp.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- ppp.spec	13 Apr 2010 06:39:10 -0000	1.60
+++ ppp.spec	13 Jul 2010 12:12:27 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
 Version: 2.4.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -27,6 +27,7 @@ Patch23: ppp-2.4.2-dontwriteetc.patch
 Patch24: ppp-2.4.4-fd_leak.patch
 Patch25: ppp-2.4.5-var_run_ppp.patch
 Patch26: ppp-2.4.5-manpg.patch
+Patch27: ppp-2.4.5-ppp_resolv.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel, libpcap-devel
@@ -69,10 +70,12 @@ This package contains the header files f
 %patch24 -p1 -b .fd_leak
 %patch25 -p1 -b .var_run_ppp
 %patch26 -p1 -b .manpg
+%patch27 -p1 -b .ppp_resolv
 
 rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
 rm -f scripts/*.usepeerdns-var_run_ppp_resolv
+rm -f scripts/*.ppp_resolv
 find . -type f -name "*.sample" | xargs rm -f 
 
 %build
@@ -134,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Tue Jul 13 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-9
+- fixes #613717 - Missing line in example script ip-up.local.add
+
 * Wed Apr 13 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-8
 - increased release number to keep upgrade path