rpms/kdenetwork/F-11 kdenetwork-4.2.3-filesharing-crash.patch, NONE, 1.1 kdenetwork.spec, 1.183, 1.184

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7016

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.2.3-filesharing-crash.patch 
Log Message:
apply upstream patch to fix crash in filesharing


kdenetwork-4.2.3-filesharing-crash.patch:

--- NEW FILE kdenetwork-4.2.3-filesharing-crash.patch ---
--- kdenetwork/filesharing/advanced/nfs/nfsfile.cpp	2009/01/06 17:13:38	906699
+++ kdenetwork/filesharing/advanced/nfs/nfsfile.cpp	2009/05/05 00:50:30	963627
@@ -71,7 +71,7 @@
      return 0L;
 
   QString testPath = path.trimmed();
-  if ( testPath[testPath.length()-1] != '/' )
+  if ( !testPath.endsWith('/') )
        testPath += '/';
 
   for (NFSEntry* entry = _entries.first(); entry; entry = _entries.next())
@@ -129,7 +129,7 @@
       completeLine = currentLine;
 
     // is the line continued in the next line ?
-    if ( completeLine[completeLine.length()-1] == '\\' )
+    if ( completeLine.endsWith('\\') )
     {
       continuedLine = true;
       // remove the ending backslash
@@ -144,7 +144,7 @@
     }
 
     // comments
-    if ('#' == completeLine[0]) {
+    if (completeLine.startsWith('#') ) {
       _lines.append(new NFSComment(completeLine));
       continue;
     }
@@ -153,7 +153,7 @@
     QString hosts;
 
     // Handle quotation marks
-    if ( completeLine[0] == '"' ) {
+    if ( completeLine.startsWith('"') ) {
       int i = completeLine.indexOf('"',1);
       if (i == -1) {
         kError() << "NFSFile: Parse error: Missing quotation mark: "
@@ -177,7 +177,7 @@
     }
 
     // normalize path
-    if ( path[path.length()-1] != '/' )
+    if ( !path.endsWith('/') )
             path += '/';
 
     kDebug(5009) << "KNFSShare: Found path: '" << path << "'";


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- kdenetwork.spec	3 May 2009 22:02:45 -0000	1.183
+++ kdenetwork.spec	5 May 2009 08:41:27 -0000	1.184
@@ -10,11 +10,15 @@ URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0: kdenetwork-4.2.0-handle-enc-message.patch
 Patch1: kdenetwork-4.2.0-libv4l.patch
+
+# 4.2 upstream patches
+Patch100: kdenetwork-4.2.3-filesharing-crash.patch
+
 # build Kopete against the system libgadu (backported from 4.3)
 # http://websvn.kde.org/?view=rev&revision=909144
 # http://websvn.kde.org/?view=rev&revision=909145
-Patch100: kdenetwork-4.1.96-system-libgadu.patch
-Patch104: kdenetwork-4.2.0-kopete-view-history.patch
+Patch200: kdenetwork-4.1.96-system-libgadu.patch
+Patch201: kdenetwork-4.2.0-kopete-view-history.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,9 +95,12 @@ Requires: kdelibs4-devel
 %setup -q
 %patch0 -p1 -b .handle-enc-message
 %patch1 -p1 -b .libv4l
-%patch100 -p0 -b .system-libgadu
+# 4.2 upstream patches
+%patch100 -p1 -b .filesharing-crash
+# 4.3 upstream patches
+%patch200 -p0 -b .system-libgadu
 rm -rf kopete/protocols/gadu/libgadu/
-%patch104 -p1 -b .kopete-view-history
+%patch201 -p1 -b .kopete-view-history
 
 
 %build