Add upstream fix for super-annoying bug 370039 (double form post)

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

4 files changed, 40 insertions, 24 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c9c11933f621..83f0594de2f7 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.760 2011/06/02 21:57:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.761 2011/06/04 18:01:13 dilfridge Exp $
+
+*kdelibs-4.6.3-r2 (04 Jun 2011)
+
+  04 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdelibs-4.6.3-r1.ebuild, +kdelibs-4.6.3-r2.ebuild,
+  +files/kdelibs-4.6.3-doublepost.patch:
+  Add upstream fix for super-annoying bug 370039 (double form post)
 
   02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdelibs-4.4.5-r4.ebuild, -files/kdelibs-4.4.5-cve20111168.patch,
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index e47d345bfc41..0bc724c17e47 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
@@ -20,28 +17,12 @@ AUX kdelibs-4.5.90-mimetypes.patch 1629 RMD160 46289674dd977b2b2289ba935d88c1b0c
 AUX kdelibs-4.6.0-kateacc.patch 1639 RMD160 239e2fb92dc2efa1e66b669a6e6cf29f9937127a SHA1 aa21f3eaf1c75ba50ceca3dafde252672bb71935 SHA256 dc6c0617c76acc0fff15d82b0a44826022c69d1d7af5abf554c17be8eb49c9dd
 AUX kdelibs-4.6.2-armlinking.patch 1129 RMD160 48174cfa4af1a871f4d05a880beded4a16b0408e SHA1 6fa4163e94990ed574caf3b9f0026b18b30c86df SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6
 AUX kdelibs-4.6.2-nonepomuk.patch 736 RMD160 3f6ab4acd649d47f045e2445544df3b84e7a700e SHA1 1f5af0271c6a5135bf0bc0acbd6f11abf256c81b SHA256 f27ec69f92e197bff33ecd6f25e3e47303e7599cdc28302477bca52ebe94b2a4
+AUX kdelibs-4.6.3-doublepost.patch 1212 RMD160 eca05c22984e2e39ed3ecd59bb313a070d249f89 SHA1 c8ef05943e71a28c4604217d31fc6ca83e48476c SHA256 54f2cfbce01f4c82679b2d44c4e064edba799721adcc67073c2d632ebe43c3a8
 AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 RMD160 d1570291799f3b87963da05ddaa949ad19b67814 SHA1 8536664b5d46f2dfd32828a4a0523f280ebe6bdf SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb
 AUX kdelibs-4.6.3-use_QWeakPointer.patch 3884 RMD160 c23d4f6a2eea9a16e89720a5b3a4562097ee0366 SHA1 10fbbac1cb70e6032d918302824e6ceff98e9ff5 SHA256 dabf4e8e8b451783f0f3b474141ffae7557d28dbfe9276a5e148ff0e0117c6b6
 DIST kdelibs-4.6.2.tar.bz2 12917847 RMD160 3a6f2a95f12d15c2ebfe2c5fb1e8f1fb3f51277f SHA1 b4794a9a69492ce4725abd9eb5d00d3a50e46603 SHA256 61d8d73d56f2e0198e590d1c6f5615dea9aa955fa69676265852744a1133b561
 DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9c28 SHA1 c7fb089c9d52a6b1d9188b9e788753373a3288e4 SHA256 b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38
 EBUILD kdelibs-4.6.2-r3.ebuild 10917 RMD160 bf1783e5787acde4da71174ddc01e61e1bcfac5c SHA1 c050f83c525724274f4a42c02994f1cb638802af SHA256 4db884aa71cba30a4d25a83796906a6ac70b56bbaad8129dae6c544eb842b2a3
-EBUILD kdelibs-4.6.3-r1.ebuild 10320 RMD160 f415595575dd9b8602c8238483418d54b82c6dd5 SHA1 5154d476070a3cc6697ab0340ed64d6fdbdb6878 SHA256 e400d750ed39462b09a31b1614d502b817415425807e5d7fa156f5223fe788a5
-MISC ChangeLog 127170 RMD160 9e99b8256ffd493c8e4db1efe4390735239d7173 SHA1 ec25d55cfb34011245fc44436ad45520dc15b4d3 SHA256 00d1e7e170a7ea9f1f25ca741a208e1f392fcffbe18b641508cb3161385357ff
+EBUILD kdelibs-4.6.3-r2.ebuild 10364 RMD160 5df70150e24276ee2c8ea469161a14c069528621 SHA1 c85aff6dd6a141325b8fa2fa11374f9c7ded3f17 SHA256 1de48117bd2c26b8ad36fddb174f67bad91e7efe595078df2972531b6c79ad0d
+MISC ChangeLog 127424 RMD160 074ff00c292cdf5aa70f10623aa43849f32955c1 SHA1 ed375ef50df1a3c32a444d15db6a26fd34bb0f78 SHA256 0db88fa5839e59dc45b519a365866362af5ccca10ef81c4cf73517c3e25c647b
 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN6AeQAAoJENwGBM22xffeoVYQAKUpHpl/X8lA8QHsDHhlYX9I
-xSEEnkwOkoyEFlpt13WvdZG4ybjvjQT/xBqK0/ZNlVqlIh1NrkjH2L+L8nzJwSC8
-qDCyazOmyU9ep/nLenD0n/lBZiPTWMeoyd732CNuTaBHe8hgfk0seOC+fiN1mEMG
-hWPD87TfbppE+yqX8STjze9PQIEzyY8aeWNjyMSLdrhJR4aNYyxcXEi5dWUsg1TU
-V5SbSSKThMABKJE3Ff/FYHPXTbV7VGoo+DHhFq/oEnYoLscK64/ffdKGuGvYsiXH
-EX0NBdXO37RsqNHJllnq4vtuBMqYNAjIdgFvNgdmJ5RkCX/3gsPs3aUmnd9b3ZPY
-qxjQkRSnwLRdJmwBQQ3w8GCRbqEU+4b++LN11UM+aoirCzeyiYu/YZQQlYIVFoTA
-fiflBpNCWRuFoDFBIOkUDi2BcvMdPvcheI0dFnAYfu3mlie+AghicGKtThWebP6r
-y7yopTbbBMvNr1S0lPmJv+YtB7eJP0DLdQ0Lt2GJeAbYHNHmzBL0e7jdqxh0prg9
-sYEBHPdd3WcFYTBkddPAm8yq55SCMXXBDVq9hPSa8PBZWoYaJp7D8goOvV1F4xnX
-p0VncIrqovhs7XRi36MogCAgSgHB1dEkMs9Ozr13AzvuQiZ1fN1LkE5YrcTo0BgD
-fqcpzlHIUaZiIgXYPXjx
-=AA8t
------END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch
new file mode 100644
index 000000000000..2672d65db138
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch
@@ -0,0 +1,27 @@
+commit 92db24adfa941003db1d885df01157056617f30b
+Author: Maks Orlovich <maksim@kde.org>
+Date:   Sun May 8 14:39:03 2011 -0400
+
+    Fix the job-on-hold reuse logic, which caused the double-POST problem)
+    
+    adawit, could you please at least READ what you're backporting if you are
+    going to be this aggressive? Or better yet, please don't backport anything
+    that's not fixing a critical bug or is trivial, as per:
+    http://techbase.kde.org/Policies/Minor_Point_Release_Policy
+    
+    CCMAIL: adawit@kde.org
+    BUG: 272466
+
+diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
+index 55da053..9f5607e 100644
+--- a/kio/kio/scheduler.cpp
++++ b/kio/kio/scheduler.cpp
+@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
+         bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET);
+ 
+         if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) {
+-            canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL);
++            canJobReuse = (canJobReuse || cmd == CMD_SPECIAL);
+             if (canJobReuse) {
+                 KIO::MetaData outgoing = tJob->outgoingMetaData();
+                 const QString resume = outgoing.value("resume");
diff --git a/kde-base/kdelibs/kdelibs-4.6.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild
index 7ea4c36084a2..fd3f0527d6f1 100644
--- a/kde-base/kdelibs/kdelibs-4.6.3-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r1.ebuild,v 1.3 2011/05/10 19:48:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild,v 1.1 2011/06/04 18:01:13 dilfridge Exp $
 
 EAPI=4
 
@@ -135,6 +135,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
 	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
 	"${FILESDIR}/${PN}-4.6.3-use_QWeakPointer.patch"
+	"${FILESDIR}/${PN}-4.6.3-doublepost.patch"
 )
 
 pkg_pretend() {