Remove unused patch.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 20 insertions, 98 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 104ff8a1bc11..71db2e3bc094 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.224 2013/12/12 03:36:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.225 2013/12/14 22:01:50 johu Exp $
+
+  14 Dec 2013; Johannes Huber <johu@gentoo.org>
+  -files/kdeplasma-addons-4.10.3-cve-2013-2120.patch:
+  Remove unused patch.
 
   12 Dec 2013; Agostino Sarubbo <ago@gentoo.org>
   -kdeplasma-addons-4.10.5.ebuild:
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 8aae555b7c96..5f2252b41cf5 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX kdeplasma-addons-4.10.3-cve-2013-2120.patch 2356 SHA256 2cceedef39e0902ccbaece46cf0a6b1fb550f6c91f8928a1260c4373e4d11cea SHA512 5b1a7f36db6acd02c7dcbf52ff918b80809000fb4e4f9f68deafd3676be27c00161eb670d327b514ff98c8fd9ab54dd88d432fb39a583fe2ff21d419f70d0ea0 WHIRLPOOL eca31d2346a40255f9e57cd012db9dbf33cca87ee454d75b7e2503af55adca89f67da072d911a649d841fdefbb9f5972889dedc94c1abb8f6532e9f6c69ae602
 DIST kdeplasma-addons-4.11.2.tar.xz 1804300 SHA256 14d94080a0a74516890957c8f73f6f59768bd396e50c5edbd04ca1f0117fc3b7 SHA512 c2ffea0b9051f9000a0aaa8907c1b129a0a5e007a6327547c0e0eb3be44c2a8ff544b87003edb19bad15cbfbeb2e20e27943fc678a50c18230bb215318ac08f6 WHIRLPOOL e1d79971b24457570eed69b4b7289e26fa7af2f63554ef9500502ad26ffc822588e88106417bb41de4d38aa1dbf08c018f0ad90644233ced9f7f98e3f93c4948
 DIST kdeplasma-addons-4.11.4.tar.xz 1805172 SHA256 cca58326f4cc93255366f0aa2b75c1c13b04001d82bfa797ba921e5c4a51befd SHA512 47898fd92b6099d619ae6e83b77a2c03283a10ac0aa9ff7252490556e4b3c3926c9a4d93d4439fb06afceeafb319dec5e4417a12c6be287e222e7a01bf85c0ef WHIRLPOOL 0a8928dbc58fad713d9c5ae8b15bfa0a16da0a630ab46f2c57b9329e0d83886a1eb0de4a04a47b9ba445aa06bfb3fa0a1094980c393779335d993cf9efa04b80
 EBUILD kdeplasma-addons-4.11.2-r1.ebuild 1829 SHA256 99d3bf19072f4baaaffe2f8b24ba5792b7048706d7919c8f171d5d2856866c3c SHA512 cd4ae9b029e6b1f0d85e2337242c852c0db76a65394c86a5f6d4ec0ef91721121cf9e42441c4aa90358d42b15ae4a446cac4c3ed21331a7ad86502b8a697a1b9 WHIRLPOOL 36f91fe2803c02be0a7d4ae58e153f58fda000efc4774fd09a8bec2ef68e442e2d42d3cab98b324b1a9a699dd4b44104281a453a375b48dc34c85303947d7202
 EBUILD kdeplasma-addons-4.11.4.ebuild 1832 SHA256 08fdb7e07e84b25fbeefa22f1b66edb2228d2cb40be8f38fc01c01b7f606238b SHA512 21684bcb08b2c9b0889b127af5a00030168f911fabba4e7c695fe79bbc8042b18f715e5a27d5704da5e9ca661fb6825049f4e9272166e3883d3cfda4c1d22f69 WHIRLPOOL 5d5d1644efec4010ba2cd13ff675f8ddbf1035659aebc817efefef832c9df54b893f54735ed159b19ed3da6199a632dfdffbd6409d5caae99ddc55492b58fea1
-MISC ChangeLog 31173 SHA256 445adb142640d0791d7319bf8b35ac30837d36e01713af33e47a425dd77111f5 SHA512 182d74f2351100844296c57dd95c8f246138720f945c74c8c76b460bc4f1e0c6508e98e53e8ddc41b68ae88ec0bebc9b5e5ddc9649c81262c5fe005faf96a972 WHIRLPOOL e0781bf0a3d033cf80c781b363c3085f6a795158da0ba2fd9e6a96546ffff331a2c387e1b5fb4567fcdb5132944f4dee9646605c8914b2abc5390ff0c39d8887
+MISC ChangeLog 31300 SHA256 5b1e32959e2c473d69e54131adb82342de00784cfa319bd3da11daec23752651 SHA512 8478c22cfa41a6fd97566b9601631f2967f628d877ca4ce1563d0787684d1fc9bb933107349aca6d815f52e6aec6515452182be211ee6b06e74d0f97f705ea34 WHIRLPOOL d1df6f4af6103ece208026876f8d9d731949ae2ad81a2d7ef6b3e5898096f61cac782b6aee7f6d04cac88cef67eed05027ae704c45f99735b5cb5a15ea7a4c06
 MISC metadata.xml 902 SHA256 8ad805248edd55aa85c63be7f913d767f2472dde758f5dc0afcd660c50324678 SHA512 1ed8fc2a73986e2673c146267e2c7dc7048e8865a2d4bec44f7882ff4ea38e1bfa47197e98ac212f00cd637aeca1546bdbfb117cb232bdc7e640c0c4ef733ba3 WHIRLPOOL f2b980d92f1ee250ab59472db049033280fcde1ab0c069119cf5679c9c5db898bfd9d38031e36ce295d296b1b74ec541bd2d83a88b73bf4aed7e6c056710bdb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSqS6qAAoJELp701BxlEWfCl8P/RJTn4GI4mLmQcXUnh7FbBIU
-U1ZqrH97sYsB9Kl3N6CtJf8+0c4N+/fv5r4hZS2E5jBaRw/y5p3I4n+Ok9rLYS4s
-9brsEy921dFCUbhkbYcL+MB+0RcO/FQBRoEFA2qwur0UwxCisSfBYxJWb/iQkEDH
-LzpIEt6ECmnxYdF5QTqUvD7MPY8+VCytBhj8OxSD6kvZt/wqCY++YmXoWGR4Wm/y
-y+rcurbtRuIZfqsLQ8zPbglLHA3P056j/T6j89pqTB0yocOlylC77KPhnbHHO8sW
-6iB8H25dCvAW9xz5/GSIes5Q6k7563nLYsPhJRqwJn7XNwhhRg5TyNpRkhqn9pqR
-rVDDlBNyrXNNQkse7rJszovjCD3WQ4xh2nCWlxCUspNOfvt07J+3f0TG6MCBClbM
-LUopwyBWU4ZchJvCMEvUnDrUUxPHJj+ZWfhWEsnQjejiR2Kujru63ZbmPuCn/gB/
-BkwmP4RWy4q0+RGaxe5h5b76UA2U4fO4PrNtSNprtjnS66FVofJiuixFl8g4MMsU
-pefCSV1Wrux4I8oTNk4HkOKnnNxO+8x+nqRKw+xxvQSi0VbM/hNff0MLNVrSla/e
-2OcA8bnCioSZauvA0jUUSQhXTA/aVgSH0BL+o1/b/mglvLLq1ByAe8pnLKiW/t+C
-twlh4kJFQ6yx55lpeH6F
-=zjEH
+iQIcBAEBCAAGBQJSrNVPAAoJEGVpnaTzz9K9qoUP/0VXhXSIzaDRwPLOfD4d/uB3
+SphxdIMTFgyfuLvaNOFwrxfOmAH8ukP50f9zsMAtLRfJZ8IWlPsf1ZLJH7oCKXco
+864WS1mV+cddqndKZ0MUgFnAXH1+SGJW9vHywqLZLOYUx8+L8VL53QV0N699Xozi
+d8aPtW2KFSg7wGxOgIzuTsY9Htn1e+qdr0vsutWvr8eaupg4jYbmWd3K3KXVs4SN
+ovU6HT2WOMhygCTSbqpOezjPm5dMlsH83jtsPBA+Oq9BO+Y3Ukzj+Y/vMIMcfRAM
+2cjBNePJhk9zfITwzw93xKNGVIIFHCP/3D05nKEp4l3El3R1QqZGk62KFSwT3aIC
+RSXDqZi+g2kdVCURHUTWs+NpSUFDzRFVgF2xC6crTTSi4n4JiG+lfMVtq/wdze1a
+H8CPRhUppx3kVsu/pXEgVk5EHdsfAz5L0aacJEXk0qHy4/kWnNNrnmqj5iCWmRGV
+pNLZhp791w81JAeUYO+Hfn8wIibzGWvVYYkGJlJdjA83k4D7w9JCyCsqs+XYNJJU
+mxNKU/o0U9LUT478BfbZyvWFxed3a6x5sQOo+k7SepK4IHPd4mEnvKmaqvri0MfH
+t0mr6kSl1a3KJZXbCeaazW8L0T+ooW8452xS8EFA+ARofUtJNJESgi4iMzk0zPxh
+95Jdre33/FflcdOxp1mI
+=mXWw
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch
deleted file mode 100644
index 88d78794a5ea..000000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From d84015218bf78b707650cf5426ae1a469d37c29d Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Mon, 3 Jun 2013 19:16:32 +0200
-Subject: [PATCH] use KRandom, avoid modulo bias
-
----
- applets/paste/pastemacroexpander.cpp | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/applets/paste/pastemacroexpander.cpp b/applets/paste/pastemacroexpander.cpp
-index ea6163f..d0a8b49 100644
---- a/applets/paste/pastemacroexpander.cpp
-+++ b/applets/paste/pastemacroexpander.cpp
-@@ -27,6 +27,7 @@
- #include <KDebug>
- #include <KLocale>
- #include <KMessageBox>
-+#include <KRandom>
- 
- class PasteMacroExpanderSingleton
- {
-@@ -142,35 +143,49 @@ QString PasteMacroExpander::password(const QString& args)
-             << "01234567890"
-             << "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~";
- 
--    int charCount;
-+    int charCount = 8;
-     QString chars;
-     QString result;
- 
-     if (a.count() > 0) {
--        charCount = qMax(a[0].trimmed().toInt(), 1);
--    } else {
--        charCount = 8;
-+        charCount = qMax(a[0].trimmed().toInt(), 8);
-     }
-+
-     if (a.count() < 2) {
-         chars = characterSets.join("");
-     }
-+
-     if (a.count() > 1) {
-         chars += (a[1].trimmed() == "true") ? characterSets[0] : "";
-     }
-+
-     if (a.count() > 2) {
-         chars += (a[2].trimmed() == "true") ? characterSets[1] : "";
-     }
-+
-     if (a.count() > 3) {
-         chars += (a[3].trimmed() == "true") ? characterSets[2] : "";
-     }
-+
-     if (a.count() > 4) {
-         chars += (a[4].trimmed() == "true") ? characterSets[3] : "";
-     }
- 
--    QDateTime now = QDateTime::currentDateTime();
--    qsrand(now.toTime_t() / now.time().msec());
-+    const int setSize = chars.count();
-+    const int top = (RAND_MAX / setSize) * setSize;
-+    kDebug() << "topping out at " << setSize << RAND_MAX << top;
-     for (int i = 0; i < charCount; ++i) {
--        result += chars[qrand() % chars.count()];
-+        // to prevent modulo bias, discard random numbers at the
-+        // 'top end' of INT_MAX
-+        int rand = -1;
-+        do {
-+            if (rand > 0) {
-+                kDebug() << "Ha!" << rand;
-+            }
-+            rand = KRandom::random();
-+        } while (rand >= top);
-+
-+        result += chars[rand % setSize];
-     }
-     //kDebug() << result;
-     return result;
--- 
-1.8.2.1
-