[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.7.2-1-10-gea9539e

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 5aeedf446d81bde0dff5ddccb7af4b43f2a76cae
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Dec 17 19:59:21 2011 +0100

    Add kio_imap_append.diff.
---
 debian/changelog                    |    2 ++
 debian/patches/kio_imap_append.diff |   32 ++++++++++++++++++++++++++++++++
 debian/patches/series               |    1 +
 3 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8493eda..b5854fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kdepimlibs (4:4.7.4-0r1) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Bump shared-desktop-ontologies build depend to 0.8.
   * Confirm symbols files on more achitectures with the 4.7.2 build logs.
+  * Add kio_imap_append.diff, it fixes the arguments for the IMAP APPEND
+    command (Closes: #651654).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 05 Dec 2011 01:01:48 +0100
 
diff --git a/debian/patches/kio_imap_append.diff b/debian/patches/kio_imap_append.diff
new file mode 100644
index 0000000..f32b52d
--- /dev/null
+++ b/debian/patches/kio_imap_append.diff
@@ -0,0 +1,32 @@
+commit ddc273ca863aacc65742bf6193826809a2d3265e
+Author: Allen Winter <winter at kde.org>
+Date:   Sat Dec 17 12:38:49 2011 -0500
+
+    In clientAppend(), be careful how the arguments for the APPEND command
+    are constructed so as not to break things.
+    
+    Found by Luke Dashjr <luke-jr+git at utopios.org>
+    with help from Andreas. Thanks guys.
+    Please test this.
+    
+    BUG: 289084
+    FIXED-IN: 4.8.0
+
+diff --git a/kioslave/imap4/imapcommand.cpp b/kioslave/imap4/imapcommand.cpp
+index 43daccd..88d95df 100644
+--- a/kioslave/imap4/imapcommand.cpp
++++ b/kioslave/imap4/imapcommand.cpp
+@@ -231,7 +231,12 @@ CommandPtr
+ imapCommand::clientAppend (const QString & box, const QString & flags,
+                            ulong size)
+ {
+-  QString tmp = QString(flags.isEmpty() ? QString("") : QString(('(' + flags + ") ")) + '{' + QString::number(size) + '}'); 
++  QString tmp;
++  if ( !flags.isEmpty() ) {
++    tmp = '(' + flags + ") ";
++  }
++  tmp += '{' + QString::number( size ) + '}';
++
+   return CommandPtr( new imapCommand ("APPEND",
+                           "\"" + KIMAP::encodeImapFolderName (box) + "\" " + tmp));
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 333e353..30f6e5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 03_hide_akonadi_progressbar.diff
+kio_imap_append.diff

-- 
KDE PIM Libraries module packaging