[SCM] kio packaging branch, master, updated. debian/5.28.0-1-14-g6a34213

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=dafef20

The following commit has been merged in the master branch:
commit dafef20f90fd97e2613ea035e610b8605a0a3374
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 4 17:39:29 2017 +0200

    Add new upstream patch: Fix-parsing-of-directories-listing-on-a-specific-ftp-serv.patch
---
 ...irectories-listing-on-a-specific-ftp-serv.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 60 insertions(+)

diff --git a/debian/patches/Fix-parsing-of-directories-listing-on-a-specific-ftp-serv.patch b/debian/patches/Fix-parsing-of-directories-listing-on-a-specific-ftp-serv.patch
new file mode 100644
index 0000000..03d5e59
--- /dev/null
+++ b/debian/patches/Fix-parsing-of-directories-listing-on-a-specific-ftp-serv.patch
@@ -0,0 +1,59 @@
+From: Marco Scarpetta <marcoscarpetta02 at gmail.com>
+Date: Wed, 1 Feb 2017 11:29:08 +0100
+Subject: Fix parsing of directories listing on a specific ftp server
+
+Directories listing on ftp servers like ftp://ftp-dee.poliba.it/ are now parsed correctly.
+
+BUG: 375610
+REVIEW: 129905
+FIXED-IN: 5.31
+---
+ src/ioslaves/ftp/ftp.cpp | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp
+index 2e129fcd..e41c7648 100644
+--- a/src/ioslaves/ftp/ftp.cpp
++++ b/src/ioslaves/ftp/ftp.cpp
+@@ -1669,24 +1669,35 @@ bool Ftp::ftpReadDir(FtpEntry &de)
+             }
+         }
+ 
++        // This is needed for ftp servers with a directory listing like this (#375610):
++        // drwxr-xr-x               folder        0 Mar 15 15:50 directory_name
++        if (strcmp(p_junk, "folder") == 0) {
++            p_date_1 = p_group;
++            p_date_2 = p_size;
++            p_size = p_owner;
++            p_group = nullptr;
++            p_owner = nullptr;
++        }
+         // Check whether the size we just read was really the size
+         // or a month (this happens when the server lists no group)
+         // Used to be the case on sunsite.uio.no, but not anymore
+         // This is needed for the Netware case, too.
+-        if (!isdigit(*p_size)) {
++        else if (!isdigit(*p_size)) {
+             p_date_1 = p_size;
++            p_date_2 = strtok(nullptr, " ");
+             p_size = p_group;
+             p_group = 0;
+             qCDebug(KIO_FTP) << "Size didn't have a digit -> size=" << p_size << " date_1=" << p_date_1;
+         } else {
+-            p_date_1 = strtok(NULL, " ");
++            p_date_1 = strtok(nullptr, " ");
++            p_date_2 = strtok(nullptr, " ");
+             qCDebug(KIO_FTP) << "Size has a digit -> ok. p_date_1=" << p_date_1;
+         }
+ 
+-        if (p_date_1 != 0 &&
+-                (p_date_2 = strtok(NULL, " ")) != 0 &&
+-                (p_date_3 = strtok(NULL, " ")) != 0 &&
+-                (p_name = strtok(NULL, "
")) != 0) {
++        if (p_date_1 != nullptr &&
++                p_date_2 != nullptr &&
++                (p_date_3 = strtok(nullptr, " ")) != nullptr &&
++                (p_name = strtok(nullptr, "
")) != nullptr) {
+             {
+                 QByteArray tmp(p_name);
+                 if (p_access[0] == 'l') {
diff --git a/debian/patches/series b/debian/patches/series
index e8963c3..6899040 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ ForwardingSlaveBase-fix-passing-of-Overwrite-flag-to-kio_.patch
 Fix-another-clear-porting-bug-in-ForwardingSlaveBase.patch
 kssl-Ensure-user-certificate-directory-has-been-created-b.patch
 Fix-memleak-in-KDynamicJobTracker-KWidgetJobTracker-needs.patch
+Fix-parsing-of-directories-listing-on-a-specific-ftp-serv.patch

-- 
kio packaging