Backport fix for potential mail loss bug, from packagers ml

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 6352a3594120d68632f45736901b5d689147890a..c0aab8fbe82b55f1edc77039a07591dfa66c303e 100644 (file)
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.47 2011/09/07 20:13:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.48 2011/09/27 23:35:50 dilfridge Exp $
+
+*kdepim-runtime-4.7.1-r1 (27 Sep 2011)
+
+  27 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-runtime-4.7.1-r1.ebuild, +files/kdepim-runtime-4.7.1-emptyids.patch:
+  Backport fix for potential mail loss bug, from packagers ml
 
 *kdepim-runtime-4.7.1 (07 Sep 2011)
 

diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index 5638bf5fbda63b7441e957ad11918fe3a7b2988a..b2d8353191af1e0f0356d44f5ce5a1a7b14fc549 100644 (file)
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX kdepim-runtime-4.4.10-enablefinal-1.patch 466 RMD160 fcae6d97bfba91cdec2048919dfaf57bd402a12e SHA1 e1a303f6aa2571a5be8772882f56fdb4d61c50e9 SHA256 f148773485cc411c93f063d48783d0e05af5f9d6fca4b8d6f211c2875665ffe9
 AUX kdepim-runtime-4.4.10-enablefinal-2.patch 738 RMD160 7b6568a912e800baa790e38a1a50b45aac848295 SHA1 ac9d85a87e37969b70c4ed039a83916dd97a6469 SHA256 f4816dabb601946a9e1ffbadddd11e433ce64233cef79daa59db420428f24120
+AUX kdepim-runtime-4.7.1-emptyids.patch 1569 RMD160 594984248bc54bcdf274bd4b133dc52fa94a4e00 SHA1 68b78e8427d61dd29e37590c2e92a170353401e5 SHA256 d0402328564c9aa2997065a9c0b8c5af094b9ebdf92ac2d8a4e84075bc106544
 DIST kdepim-runtime-4.4.11.1.tar.bz2 619924 RMD160 dbc1120ab3f70c0073f6e9f389edba89bf80bee6 SHA1 e3105eb99ab0de47c617f8491774b2e3ee4cdd4a SHA256 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6
 DIST kdepim-runtime-4.6.1.tar.bz2 2138207 RMD160 260bc10287004deb1951d53678d9954c7c62f5da SHA1 e416ffd0142c720a779b4eb2e4a841ca751efdce SHA256 bd523fe7e2134179dad3f0f9a2a0ad8ab27d46ba0770a45b58b50ca8afac6bc5
 DIST kdepim-runtime-4.7.0.tar.bz2 1200018 RMD160 9920ea2345b6c43a2e4bb638675b2b5d95a6f987 SHA1 00286df86a64eecee64e6cf9199b69d87f62135e SHA256 4f6878ad3950ce2933ebb446d8f5e4d82f18b83533866bbaf648791da1404d85
@@ -10,23 +11,24 @@ DIST kdepim-runtime-4.7.1.tar.bz2 1205626 RMD160 6bf0dce4da23214b063f9e8855099dd
 EBUILD kdepim-runtime-4.4.11.1.ebuild 1037 RMD160 3f477dff6f2c1445aec076a133f69fadec49fa48 SHA1 1b10394e4c7aa64685ff336009f96d5c9b2572db SHA256 9929fa890c680b6ce3f0d8e7082c02b9ff3adcca43deeba739b9aab03cabc8be
 EBUILD kdepim-runtime-4.6.1.ebuild 1002 RMD160 e71604985c859df222fca5d6dd7095ee304fccb0 SHA1 24b3f87038a92132363a9a4deb5a1b5853647e35 SHA256 96ef33084ab7ca384a0e66b88ba8a1d3f1692a15fe1b80d01942649f252f46fe
 EBUILD kdepim-runtime-4.7.0.ebuild 869 RMD160 b2cfcd3d9d947ac66a60792ed0b68efb8f740db7 SHA1 163bfe60ff84d4359cc3016a566cb2bce4c2bb5b SHA256 7a1ff4aa7f95a14764569a3c928e3aa26b99c4a5e5e0dd2faaa7485fd5f48919
+EBUILD kdepim-runtime-4.7.1-r1.ebuild 922 RMD160 a6c85d080454fd3d9f0a3748b0e3ac5128875a65 SHA1 8f745242d391d6605fea81144f34bb026861cdc3 SHA256 c387a9087d6dfce505032a9a6677ba16c986e1a7af81b53b1ea4fc19c89e429e
 EBUILD kdepim-runtime-4.7.1.ebuild 869 RMD160 f30e0906d8ad7109dc75d731002e5af4527028e9 SHA1 f7d972a3233155fbafdc6e1a3776a39ccf06a28c SHA256 6f83fcd44378ede8e59cdac5643dcbb2ced1c8a6e4c7ff19c5b5d22a480309b4
-MISC ChangeLog 6772 RMD160 28f6124d819dc25ad1f39ccb402c8e17f66f07b1 SHA1 f84b54cfa4b48329501ca642ece369cfe639a0b1 SHA256 e06256388d0f6c0d252d9184db36be03c9757e7b1a1a2bca9183fdda5875dadc
+MISC ChangeLog 7014 RMD160 ee6db3d1c0749c9033853ee4301de8599db057cf SHA1 89c59a740f7e48b8029362fee8fafde5555f39bd SHA256 c9c3ace7b39492d1b531ac096496ffffb989b758d64c7abb919d1f724071eeab
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOZ9IbAAoJEOf+E+/4L5LmagcP/AnyasSbqx1G3FFEB4JTQ0cg
-4XkOnfoWogyKbTGVzwtz/jc7BMBwQmJhfHJjpDHs/HuJG3FXF1rJ5TVHpTpWtZZM
-erRQ7O27xmEL37USzF1gyraUz/oayniE29lAOVkwFXSABpkW06dlNF4K5dT07KF5
-oyrLDHMjp4pXPwSLnR7QnD1p5/TIAToWMYSmXTe7C5S0NWcvuQzvx2gwmh2bm6nH
-lvMSuaKZVV0Tjp1ywxmSQXf+BVaa/dfS3/6NxTnotCD59/K9udolcCxxLL/g8hBD
-MIESbZyRg8q7Qj8uLWAfWRkILv5SuxTs/lISdfWOaXqgBBFazgfYkBe6uMNwPRh9
-v6rkaUqyU4n/SOMl68ZZnpQTEX3OFPbOhKKfFSAmfxgYhvrZ8ZlCqb4xnNIcJsPo
-jlVU7Aw0J7bfHzPFRV7hXo2jCHdhcFMdHTk/7Bx5VCdP6CTwKZQSMHTNaIsf1UUs
-mYEQEvB4X8NwnKYW+wa4uJZCisuP7JKh6DLseO3qEi01qDNG73R/L3jxWMQl8eDM
-XVBSnmRRC5ScQCGtZc0PL9WEnSt0A+NkBP5DCDolHytF2B5/XGVweXOq8yxxxbbo
-o5EuBvd/vVxrCMb3Osg5Qwst1NKFNVoP7CyeRAJNgL65tDR1HSs03lanif8xRRMa
-aK0EQRIu6+NwzZd/BKuF
-=G+hP
+iQIcBAEBCgAGBQJOgl4WAAoJEEb+UGWnxTyHyrIQAK6LM9Z2LMxgHQs7s5Ut3kf6
+BH+WDgZbjuZSYshzRDdf3gP1r6kah2cMF5MPil/X4FT3+RIvntknR3vZzvNjBOkl
+m03zIU++hASdmRrsymG62jnwtpdC71iqb6I7tUBxp133tW4Yeaw8HPq0q814sfMH
+B+80dnMPVgLBn5ZF7upUiYI6/0ICz9nVzgoRMTUHETwXYU79LKEx/AmsjpFkyNLi
+fol4HDkauzaplvnhuWJBfMXti/sZO0cDV2ueldROgHCQj3J4t8WD64y88PmKvxmo
+M32SYGSuTPXiEH+h3M7BONt2IFkjfxsGDOUy/3mM/HOnC1USduKVY4Wf0i7D8cIB
+upmGSI4ZpQ91YTk9gBUotUSIiNvWpjggtf7atrq7X8hJ7M6Ff3vOlhxwR/N3mWva
+wg32oq3RPFMUep/wSsAG00oSu+nf6aqeUUwkMajUnZWUwqCsG/THanqzJC+eCn0i
+H32yVR6Onmfgx8mcN90pnnA1QYrTRBRGiw/ZYsyRvh4LnADKiUPT7HguBGZaO5ED
+r2Qs7uf4VZGGKTnNk1NQ3EujEFaDTkevSRW8Mg/F2COZPS5++CRsxSwuxJewdMKd
+q+ipSwfPPLA6jd0Xk1iW7JHV8Z/aM5Kl3KYIbs/yhHswZoS00BQ+V5if09XmA6dp
+PLDmrPLbljlA5mqSUvqS
+=Y+GR
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.1-emptyids.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.1-emptyids.patch
new file mode 100644 (file)
index 0000000..2a8397d
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.1-emptyids.patch
@@ -0,0 +1,36 @@
+From ccd67f3e65c9ffe32858ca521aa1e56a42b026af Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Tue, 20 Sep 2011 10:12:40 +0200
+Subject: [PATCH] Ignore items with empty remote ids here.
+
+Items with empty remote id are those not yet stored by the resource,
+ie. we still have pending change replays for those. So, if we do a sync
+during that period (which could happen since the introduction of the
+file system watcher), we would remove a random one of those (only one
+since the map would only contain one without a remote id). This mostly
+affects the POP3 usage pattern.
+(cherry picked from commit f814b46a799ea8418ae17cf77d44da473124d12d)
+---
+ resources/maildir/retrieveitemsjob.cpp |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/resources/maildir/retrieveitemsjob.cpp b/resources/maildir/retrieveitemsjob.cpp
+index 7253f7e..f0273ef 100644
+--- a/resources/maildir/retrieveitemsjob.cpp
++++ b/resources/maildir/retrieveitemsjob.cpp
+@@ -57,8 +57,10 @@ void RetrieveItemsJob::localListDone ( KJob* job )
+ 
+   const Akonadi::Item::List items = qobject_cast<Akonadi::ItemFetchJob*>( job )->items();
+   m_localItems.reserve( items.size() );
+-  foreach ( const Akonadi::Item &item, items )
+-    m_localItems.insert( item.remoteId(), item );
++  foreach ( const Akonadi::Item &item, items ) {
++    if ( !item.remoteId().isEmpty() )
++      m_localItems.insert( item.remoteId(), item );
++  }
+ 
+   const QStringList entryList = m_maildir.entryList();
+   qint64 previousMtime = m_collection.remoteRevision().toLongLong();
+-- 
+1.7.1
+

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.7.1-r1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.7.1-r1.ebuild
new file mode 100644 (file)
index 0000000..d5a8607
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.7.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.7.1-r1.ebuild,v 1.1 2011/09/27 23:35:50 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim-runtime"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+DEPEND="
+       app-misc/strigi
+       >=app-office/akonadi-server-1.3.60
+       dev-libs/boost
+       dev-libs/libxml2:2
+       dev-libs/libxslt
+       >=dev-libs/shared-desktop-ontologies-0.6.51
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
+       x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+       $(add_kdebase_dep kdepim-icons)
+"
+
+add_blocker kdemaildir '<4.3.0'
+add_blocker akonadi '<4.3.90'
+
+PATCHES=( "${FILESDIR}/${P}-emptyids.patch" )