rpms/kdenetwork/F-9 kdenetwork-4.0.5-kppp-resolvconf.patch, NONE, 1.1 kdenetwork.spec, 1.146, 1.147

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8045

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.0.5-kppp-resolvconf.patch 
Log Message:
#449793: KPPP is unable to add DNS entries to /etc/resolv.conf


kdenetwork-4.0.5-kppp-resolvconf.patch:

--- NEW FILE kdenetwork-4.0.5-kppp-resolvconf.patch ---
diff -ur kdenetwork-orig/kppp/connect.cpp kdenetwork-4.0.5/kppp/connect.cpp
--- kdenetwork-orig/kppp/connect.cpp	2008-01-05 00:59:27.000000000 +0100
+++ kdenetwork-4.0.5/kppp/connect.cpp	2008-06-04 15:43:19.000000000 +0200
@@ -1491,7 +1491,7 @@
   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 @@
       }
       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/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kdenetwork.spec	1 Jun 2008 19:53:17 -0000	1.146
+++ kdenetwork.spec	4 Jun 2008 13:47:24 -0000	1.147
@@ -6,7 +6,7 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License:   GPLv2
 Group:     Applications/Internet
@@ -14,6 +14,9 @@
 Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# #449793: KPPP is unable to add DNS entries to /etc/resolv.conf
+Patch1:   kdenetwork-4.0.5-kppp-resolvconf.patch
+
 # upstream patches
 Patch102: kdenetwork-4.1.0-kopete-jabber-ssl.patch
 
@@ -86,6 +89,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .kppp-resolvconf
 %patch102 -p1 -b .kopete-jabber-ssl
 
 %build
@@ -162,7 +166,10 @@
 
 
 %changelog
-* Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-1
+* Wed Jun  4 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-2
+- fix #449793: KPPP is unable to add DNS entries to /etc/resolv.conf
+
+* Sun Jun 01 2008 Than Ngo <than at redhat.com> - 4.0.5-1
 - 4.0.5
 
 * Sat May 31 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.4-4