rpms/kdenetwork/devel kdenetwork-4.3.3-resolv-conf-path.patch, NONE, 1.1 kdenetwork.spec, 1.214, 1.215

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27505

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.3.3-resolv-conf-path.patch 
Log Message:
* Wed Nov 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.75-0.2.svn1048496
- KPPP fix to read resolv.conf from /var/run/ppp (#540433)


kdenetwork-4.3.3-resolv-conf-path.patch:
 connect.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdenetwork-4.3.3-resolv-conf-path.patch ---
diff -up kdenetwork-4.3.3/kppp/connect.cpp.resolv-conf-path kdenetwork-4.3.3/kppp/connect.cpp
--- kdenetwork-4.3.3/kppp/connect.cpp.resolv-conf-path	2008-01-05 00:59:27.000000000 +0100
+++ kdenetwork-4.3.3/kppp/connect.cpp	2009-11-23 14:42:15.629662654 +0100
@@ -1491,7 +1491,7 @@ void addpeerdns() {
   int fd, fd2;
 
   if((fd = Requester::rq->openResolv(O_WRONLY|O_APPEND)) >= 0) {
-    if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) {
+    if((fd2 = open("/var/run/ppp/resolv.conf", O_RDONLY)) >= 0) {
       char c;
       int i = 0;
       while(i++ < 100 && read(fd2, &c, 1) == 1) {
@@ -1502,7 +1502,7 @@ void addpeerdns() {
       }
       close(fd2);
     } else
-      fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n");
+      fprintf(stderr, "failed to read from /var/run/ppp/resolv.conf\n");
     close(fd);
   }
   add_domain(gpppdata.domain());


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- kdenetwork.spec	25 Nov 2009 01:51:53 -0000	1.214
+++ kdenetwork.spec	25 Nov 2009 13:52:39 -0000	1.215
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.75
-Release: 0.1.%{alphatag}%{?dist}
+Release: 0.2.%{alphatag}%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,6 +14,8 @@ Source1: krdc-icons.tar.bz2
 
 ## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
+# rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf
+Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -99,6 +101,7 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -a 1 -n kdenetwork-%{version}%{?alphatag}
 %patch1 -p1 -b .icon
+%patch2 -p1 -b .resolv-conf-path
 
 
 %build
@@ -190,6 +193,9 @@ fi
 
 
 %changelog
+* Wed Nov 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.75-0.2.svn1048496
+- KPPP fix to read resolv.conf from /var/run/ppp (#540433)
+
 * Mon Nov 23 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
 - Update to 4.3.75 snapshot