gentoo resync : 14.05.2020

4 files changed, 39 insertions, 5 deletions

diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 3e48aa86645d..b207c3a8a428 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,6 +1,7 @@
+AUX kio-extras-19.12.3-CVE-2020-12755.patch 973 BLAKE2B 3d82cb6c5ed37067f518fb568fe2c4f35148056ef4fd1db0d47377bc7d8cb29bb48e4f5fb8683535469f9327b95ee2790ef4a30f494cb7e30a3eb346da0eba72 SHA512 776ea79e81c7b4c1b0da983261f751503dbdcf034e91e4f2a49dee5dfea0e3d557cae439efba4ac1f5e7b8ce161f17384dafd51e9aecde28e7404da9cd664187
 AUX kio-extras-19.12.3-kio_nfs.patch 6433 BLAKE2B 66358b2cd0953b8a46492a7f0f7c03b249a25de678c92a7450fdb23098d4c9e483a01690071e54ddf00dd4c982eb00429f3139cdf6624ea4f57b2491420b7a93 SHA512 9eb757d42412193c9ea96f608289a58505bfd385b641c2c0061316063587cda8ec7479e27e63fccac6d60bc2427b7a6cb55ac0e336e214d28d41c466c093431a
 DIST kio-extras-19.12.3.tar.xz 581020 BLAKE2B b4f9ca0812d535222c1a156ef2ce056df95dfab0786b108418fc98da860617c272ffaab044d0faf8559dee04d8bbc799da6eb004bea170c41a1b3bd30e91a40f SHA512 289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7
 DIST kio-extras-20.04.0.tar.xz 617252 BLAKE2B 7bc3d4ed936b7a97247022c66672829bcfd43b4dc80bcf225d52945f81a38e8ace928a881d7eccf9d50ea04d4b8a64518038a88d07048668f41443a54c5602a1 SHA512 2af83e7fa380ab28b68d0a59e3a25ac170424cfefaa319e5b43bc907752055b081d3f2c21337be2a3f9752a20c9ad79e995f070461fb68fc578e98a5d9124847
-EBUILD kio-extras-19.12.3.ebuild 2466 BLAKE2B 7228f838c2a8a00abf8d3022563edb00e5dea9c5eb8041f9ab3f45f9057d4e10acc9fd0c9173b3e32a19747f70832cb4639df2239d4c10ff1e0431a3218aad18 SHA512 a7d155a520ad1f1d0243118773d6125061640b6143fd6b5599a442220dd92e9fc30086154f9da4d20b7fa48642e69bb1385ccd605fdb70b0f10edf69528c5c91
-EBUILD kio-extras-20.04.0.ebuild 2594 BLAKE2B 320c1c89e87df570e84a0d56edcf2b66057e090a62188f71dcbd8df09e62a923ed684c1de1bb35accd0d0eaf242732573064bb24ee5049212ca55cf6bf0f7133 SHA512 1c478d7463b451001b6fd66afe1aacea922b75165f1b808ebb7c5b2a5af7a882853841c854f7e118339e9dc4f26e9c06d60de66d6701d70d14541c8254eaa58e
+EBUILD kio-extras-19.12.3-r1.ebuild 2521 BLAKE2B 03b472c343c8076640d490c3c11e0e8ec3179d9a64665b99f66384f67683f59398c933358bc94620034307b929b8ce4508a0048b9c45e8ded2c2bb28d2ba9566 SHA512 ec1974b95f0cd7327506b3fb4d95c4acc53024368365ff689e322f008a3b80b79b157e5d6f0d89911cf45c0dc4ce152e7ab4de1e089281ace381b8cf295a9253
+EBUILD kio-extras-20.04.0-r1.ebuild 2713 BLAKE2B 5ab8f32e25ed4a4bce36ea4d54006117142c7c6fe8b06805e54d929f345b042aefe2122d8fd7944d0dc0a1b22c7886a51a7e7bdd4b6710093b18df9331a45a5c SHA512 c5eff9a2b13a9e0e6db783f95e1981e53fa6e1ef68ec47de54181010bfe9d51c5163c5bcbdbd947d7edb8bb9d5aa7a4dc2cb0b25d309d80756333e86016f28a8
 MISC metadata.xml 747 BLAKE2B 8972b1b4e04ad771c76e465c066d261cf237c36b9a80ede31a70d7b6af2f91d8c99a108f18c13fafa6b6d5714d8fb2270f85f63706f355c1481a1fd84ecd1562 SHA512 3fd163a8b2861213b00eb84773aeaff95bb5abf40dd20228dc519ea78ef50cd6536c9d6c7d3ef607586765001e90925265e7cfbf763d13cb17c2becaf3a993e9
diff --git a/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch b/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch
new file mode 100644
index 000000000000..188eb28f1043
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch
@@ -0,0 +1,26 @@
+From d813cef3cecdec9af1532a40d677a203ff979145 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 9 May 2020 11:20:48 +0200
+Subject: Only store password in KWallet if the user asked for it
+
+---
+ fish/fish.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fish/fish.cpp b/fish/fish.cpp
+index a18ef34..ccd71d3 100644
+--- a/fish/fish.cpp
++++ b/fish/fish.cpp
+@@ -595,7 +595,9 @@ int fishProtocol::establishConnection(const QByteArray &buffer) {
+             infoMessage(i18n("Initiating protocol..."));
+             if (!connectionAuth.password.isEmpty()) {
+                 connectionAuth.password = connectionAuth.password.left(connectionAuth.password.length()-1);
+-                cacheAuthentication(connectionAuth);
++                if (connectionAuth.keepPassword) {
++                    cacheAuthentication(connectionAuth);
++                }
+             }
+             isLoggedIn = true;
+             return 0;
+-- 
+cgit v1.1
diff --git a/kde-apps/kio-extras/kio-extras-19.12.3.ebuild b/kde-apps/kio-extras/kio-extras-19.12.3-r1.ebuild
index 58e6a31cad8f..d8ef4f607de7 100644
--- a/kde-apps/kio-extras/kio-extras-19.12.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.12.3-r1.ebuild
@@ -66,7 +66,10 @@ RDEPEND="${DEPEND}
 # requires running kde environment
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${P}-kio_nfs.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-kio_nfs.patch"
+	"${FILESDIR}/${P}-CVE-2020-12755.patch" # bug 722152
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kio-extras/kio-extras-20.04.0.ebuild b/kde-apps/kio-extras/kio-extras-20.04.0-r1.ebuild
index f3bc9e5be920..5850b2c388fe 100644
--- a/kde-apps/kio-extras/kio-extras-20.04.0.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.04.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://cgit.kde.org/kio-extras.git"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 BDEPEND="
@@ -73,9 +73,10 @@ RDEPEND="${DEPEND}
 # requires running kde environment
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-CVE-2020-12755.patch" ) # bug 722152
+
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package activities KF5ActivitiesStats)
 		$(cmake_use_find_package man Gperf)
@@ -88,6 +89,9 @@ src_configure() {
 		$(cmake_use_find_package taglib Taglib)
 		$(cmake_use_find_package X X11)
 	)
+	use samba && mycmakeargs+=(
+		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
+	)
 
 	ecm_src_configure
 }