[kdepimlibs] kio_imap APPEND omits message size without flags (kde#289084)

[Rex Dieter]

commit b406ef6d0081b9077f81bb725b87337b8a8ba5dc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Dec 16 09:50:38 2011 -0600

    kio_imap APPEND omits message size without flags (kde#289084)

 ...mlibs-4.7.4-kio_imap_append_without_flags.patch |   34 ++++++++++++++++++++
 kdepimlibs.spec                                    |   15 ++++++--
 2 files changed, 45 insertions(+), 4 deletions(-)
---
diff --git a/kdepimlibs-4.7.4-kio_imap_append_without_flags.patch b/kdepimlibs-4.7.4-kio_imap_append_without_flags.patch
new file mode 100644
index 0000000..d991992
--- /dev/null
+++ b/kdepimlibs-4.7.4-kio_imap_append_without_flags.patch
@@ -0,0 +1,34 @@
+From 33fd4a60e8695d93813216a2c5c632de16fd2040 Mon Sep 17 00:00:00 2001
+From: Luke Dashjr <luke-jr+git at utopios.org>
+Date: Thu, 15 Dec 2011 18:00:36 -0500
+Subject: [PATCH] kio_imap: fix APPEND without flags
+
+d961033b4a5c02edbda8901a2c90349f859f6c00 accidentally changed the order of
+precedence, making the message size (required) conditional on whether there
+were any flags being set on the new message. This restores the original
+precedence (while merging it with the new fast-concat rules), which should
+make it IMAP4.1 compliant again.
+---
+ kioslave/imap4/imapcommand.cpp |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/kioslave/imap4/imapcommand.cpp b/kioslave/imap4/imapcommand.cpp
+index 43daccd..18405a5 100644
+--- a/kioslave/imap4/imapcommand.cpp
++++ b/kioslave/imap4/imapcommand.cpp
+@@ -231,7 +231,11 @@ CommandPtr
+ imapCommand::clientAppend (const QString & box, const QString & flags,
+                            ulong size)
+ {
+-  QString tmp = QString(flags.isEmpty() ? QString("") : QString(('(' + flags + ") ")) + '{' + QString::number(size) + '}'); 
++  QString tmp = QString(
++    ((flags.isEmpty()) ?
++      QString("") :
++      QString(('(' + flags + ") "))) +
++    QString('{' + QString::number(size) + '}'));
+   return CommandPtr( new imapCommand ("APPEND",
+                           "\"" + KIMAP::encodeImapFolderName (box) + "\" " + tmp));
+ }
+-- 
+1.7.3.4
+
diff --git a/kdepimlibs.spec b/kdepimlibs.spec
index c7d4372..05207ff 100644
--- a/kdepimlibs.spec
+++ b/kdepimlibs.spec
@@ -7,7 +7,7 @@
 Name: kdepimlibs
 Summary: KDE PIM Libraries
 Version: 4.7.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -16,9 +16,12 @@ URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
+## upstreamable patches
+# kio_imap APPEND omits message size without flags
+# https://bugs.kde.org/289084
+Patch51: kdepimlibs-4.7.4-kio_imap_append_without_flags.patch
 # https://bugs.kde.org/249992
-Patch100: kdepimlibs-4.7.3-dovecot_kde249992.patch
+Patch52: kdepimlibs-4.7.3-dovecot_kde249992.patch
 
 %if ! 0%{?akonadi_subpkg}
 Obsoletes: %{name}-akonadi < %{version}-%{release}
@@ -86,7 +89,8 @@ format for easy browsing.
 %prep
 %setup -q
 
-%patch100 -p1 -b .dovecot_kde249992
+%patch51 -p1 -b .kio_imap_append_without_flag
+%patch52 -p1 -b .dovecot_kde249992
 
 
 %build
@@ -212,6 +216,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 16 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.90-2
+- kio_imap APPEND omits message size without flags (kde#289084)
+
 * Sat Dec 03 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.90-1
 - 4.7.90