[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.4.5-1-8-gabb5350

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 43deb53d60fd667a88eec021909f6a3ff0ea317b
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Nov 28 19:17:29 2010 +0200

    Fix POP3 mailcheck aborting because of internal memory errors.
    
    The bug was a cause of POP3 mails not getting deleted from POP3 servers.
    (Closes: #600907)
---
 debian/changelog                                   |    3 ++
 .../04_backport_fix_abnormal_pop3_aborting.diff    |   34 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a359ac..afd8a76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 kdepimlibs (4:4.4.5-2) UNRELEASED; urgency=low
 
   * Point debian/control Vcs fields to the new Git repository.
+  * Fix POP3 mailcheck aborting because of internal memory errors. The bug was
+    a cause of POP3 mails not getting deleted from POP3 servers.
+    (Closes: #600907)
 
  -- Modestas Vainius <modax at debian.org>  Mon, 26 Jul 2010 23:24:37 +0300
 
diff --git a/debian/patches/04_backport_fix_abnormal_pop3_aborting.diff b/debian/patches/04_backport_fix_abnormal_pop3_aborting.diff
new file mode 100644
index 0000000..dd07890
--- /dev/null
+++ b/debian/patches/04_backport_fix_abnormal_pop3_aborting.diff
@@ -0,0 +1,34 @@
+From: Thomas McGuire <mcguire at kde.org>
+Subject: Fix POP3 mailcheck aborting because of internal memory errors.
+Bug: https://bugs.kde.org/show_bug.cgi?id=230072
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=600907
+Origin: backport, http://websvn.kde.org/?revision=1156867&view=revision
+Last-Update: 2010-11-28
+
+We were using memcpy() with overlapping memory regions, which does not
+work. Now, use memmove().
+
+Thanks to Sven-Ola Tuecke <sven-ola at gmx dot de> for finding and
+fixing this problem!
+
+The bug was a cause of POP3 mails not getting deleted from POP3 servers.
+--- a/kioslave/pop3/pop3.cpp
++++ b/kioslave/pop3/pop3.cpp
+@@ -145,7 +145,7 @@ ssize_t POP3Protocol::myRead(void *data,
+     memcpy(data, readBuffer, copyLen);
+     readBufferLen -= copyLen;
+     if (readBufferLen)
+-      memcpy(readBuffer, &readBuffer[copyLen], readBufferLen);
++      memmove(readBuffer, &readBuffer[copyLen], readBufferLen);
+     return copyLen;
+   }
+   waitForResponse(600);
+@@ -164,7 +164,7 @@ ssize_t POP3Protocol::myReadLine(char *d
+       data[copyLen] = '\0';
+       readBufferLen -= copyLen;
+       if (readBufferLen)
+-        memcpy(readBuffer, &readBuffer[copyLen], readBufferLen);
++        memmove(readBuffer, &readBuffer[copyLen], readBufferLen);
+       return copyLen;
+     }
+     waitForResponse(600);
diff --git a/debian/patches/series b/debian/patches/series
index 62f6b62..fc0206f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_hurd_support.diff
 02_increase_fail_timeout.diff
 03_hide_akonadi_progressbar.diff
+04_backport_fix_abnormal_pop3_aborting.diff

-- 
KDE PIM Libraries module packaging