[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.4.5-2-17-g7902a6e

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit a16f1950bd02ae72bb46e3915e45424fa097967b
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Dec 17 16:22:55 2010 +0100

    Remove 04_backport_fix_abnormal_pop3_aborting.diff, no longer needed.
---
 debian/changelog                                   |    3 ++
 .../04_backport_fix_abnormal_pop3_aborting.diff    |   34 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ada3ff..6739126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ kdepimlibs (4:4.5.86-0r1) UNRELEASED; urgency=low
   * Bump build dependency on libakonadi-dev to version 1.3.80.
   * Add build dependencies on shared-desktop-ontologies and libsoprano-dev.
 
+  [ José Manuel Santamaría Lema ]
+  * Remove 04_backport_fix_abnormal_pop3_aborting.diff, no longer needed.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Aug 2010 10:41:56 +0300
 
 kdepimlibs (4:4.4.5-2) unstable; urgency=low
diff --git a/debian/patches/04_backport_fix_abnormal_pop3_aborting.diff b/debian/patches/04_backport_fix_abnormal_pop3_aborting.diff
deleted file mode 100644
index dd07890..0000000
--- a/debian/patches/04_backport_fix_abnormal_pop3_aborting.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-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 0aafd21..333e353 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 03_hide_akonadi_progressbar.diff
-04_backport_fix_abnormal_pop3_aborting.diff

-- 
KDE PIM Libraries module packaging