gentoo resync : 08.01.2021

4 files changed, 36 insertions, 5 deletions

diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index c9883277d942..4834ccad1b2f 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,6 @@
+AUX kio-extras-20.12.1-dont-log-pwd.patch 1025 BLAKE2B 6e9bba606904dc0ed2b1d6a457e0df79952e37931877f406e5e6730be0ed09d95060837472784b4b192e0bdb7d73c1716bde0bb4b1a7e4a88916216b26064cba SHA512 7e87d8f8785d5bdacc0f90ce6e495b89d6f7d36b48cadf28c797c040545a129abb4c3aa9a84cd8aaeee58b573eb0ec64145cb9ff3f3f82858c16c098c29b59d3
 DIST kio-extras-20.08.3.tar.xz 630900 BLAKE2B 85d10431df29f62744c92dd6a3fe29442170e2cc18b9a0bd91a6726eccee9d63d6fec89e1f2eddddf3f2fa046c486e543d65bb4777b85c6c23bb14d142077c0a SHA512 c9336b2a348ced91c4edc36628afd2698891d9b52cd9ca6819e13e00a93745bf112eb98ed7d85940a41ae046f538d192d3bc7d8164d8fd65eb8464490d9471f2
-DIST kio-extras-20.12.0.tar.xz 633272 BLAKE2B bef0e30e42a0d64ee43d668495a6ca09530d71356dd9e9d2ffb808dd4c12c954bbb6ebbeb2ba59d9d28c05bc5daa23d8bb758e200bda78012ae310d570efd46e SHA512 ab0303e222d5a7a63c2e42dce549ef3f9349996e9bc791e74902b331a4562043dc3b94d6a5af4a924400d951b26172431bffd8bcac69eee618085d60295f5843
-EBUILD kio-extras-20.08.3.ebuild 2635 BLAKE2B 63126d8efb9686012104f6e837cf3449eb1a8f03edd7edee21ee35635a2d53b0e1060efe1e54ffd307ef940f5425297efc524a533a009e7e7ba1964a852e0e30 SHA512 7d4a8883140434b455bba4a22ff74ef1f916c05fe87a1b930d638d02bc6404b786e50a965335b8ff70756be6eabdef2e4d17da28cebed378aa85d11f62d476cb
-EBUILD kio-extras-20.12.0.ebuild 2604 BLAKE2B f3f126d117e463c449f3ff43b16b7a511dc0c2f3e31235217dbf15db6da8802d16d0036d6a0b99175ea02532271e0382de0c28c077d1dbea6457be44e8da0cfd SHA512 97afbc92abb0a923c6118cce8e4131c43345e56ca9db8332069c0553b627fb344b334b4a29300cd5d88318838846fdbea6f703ec651d5614961c2484579ae7ef
+DIST kio-extras-20.12.1.tar.xz 633356 BLAKE2B a58ad0cf492e2e3f3a2869b91ba7f6b0b3aadba8cad3c556d58b785df28e3f85655b8b0dca75330b67e948c2bc1f18d33c11c8379349058cc4d602b28801e2c8 SHA512 fb0f3a495ffdbe0107554d6574e6fcb2dd51119f5d61e7e39aa528f7868a917fd10bef0cdc8d8c8451826a8218b6541860aaf62e03f72b44a707885966980bd0
+EBUILD kio-extras-20.08.3-r1.ebuild 2655 BLAKE2B 7e2da0fd425f63a2bf64f8e65796cb6c6b72c5f859396a977a465a23068f9ae2cde1f3007893c40e79f5015101755df38faf70ac1b7b66e9500a5f52835991c7 SHA512 3fd3216b16695f9f281d8d08eff565642de39f0913cae2e70b4cace062c4e821a3dc3d3e1a307719967722a4d06f71e90dbea0ede45e41efd530fbad5883f207
+EBUILD kio-extras-20.12.1.ebuild 2675 BLAKE2B c9391be03b8b64b205d01dfa735874c3eab3a530126ce77d307a3bdfdf7e682bb0d30c01ed2bd97e8a5f501f8d1d553c6dc2647f3fad3c2e69f9767ea926c8c2 SHA512 c308833843ccb53c8acb6d0e46a0dc1a0dd2cdbc46b66c92b5a1b9556f3baf244d74bc3ef4e0b809fdfa65b7f2aff20a50245f1b52d4b6dffe1003a8ecc76f17
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/files/kio-extras-20.12.1-dont-log-pwd.patch b/kde-apps/kio-extras/files/kio-extras-20.12.1-dont-log-pwd.patch
new file mode 100644
index 000000000000..ecc7af90e67a
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-20.12.1-dont-log-pwd.patch
@@ -0,0 +1,26 @@
+From 6c099045f6f67069ad7b5f4deb6873cf5f34a4f4 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 7 Jan 2021 14:45:34 +0100
+Subject: [PATCH] don't log passwords
+
+obviously not useful but dangerous
+---
+ smb/smbauthenticator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/smb/smbauthenticator.cpp b/smb/smbauthenticator.cpp
+index 4386e823..d4bf7032 100644
+--- a/smb/smbauthenticator.cpp
++++ b/smb/smbauthenticator.cpp
+@@ -94,7 +94,7 @@ void SMBAuthenticator::auth(const char *server, const char *share, char *workgro
+     //   https://bugzilla.samba.org/show_bug.cgi?id=14326
+ 
+     if (m_frontend.checkCachedAuthentication(info)) {
+-        qCDebug(KIO_SMB_LOG) << "got password through cache" << info.username << info.password;
++        qCDebug(KIO_SMB_LOG) << "got password through cache" << info.username;
+     } else if (!m_defaultUser.isEmpty()) {
+         // user defined a default username/password in kcontrol; try this
+         info.username = m_defaultUser;
+-- 
+GitLab
+
diff --git a/kde-apps/kio-extras/kio-extras-20.08.3.ebuild b/kde-apps/kio-extras/kio-extras-20.08.3-r1.ebuild
index a1c479c1e9c7..58bbfff301cf 100644
--- a/kde-apps/kio-extras/kio-extras-20.08.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,6 +57,7 @@ DEPEND="
 	phonon? ( >=media-libs/phonon-4.11.0 )
 	samba? (
 		net-fs/samba[client]
+		net-libs/kdsoap:=
 		net-libs/kdsoap-ws-discovery-client
 	)
 	sftp? ( net-libs/libssh:=[sftp] )
diff --git a/kde-apps/kio-extras/kio-extras-20.12.0.ebuild b/kde-apps/kio-extras/kio-extras-20.12.1.ebuild
index c918f91cf463..f92fb975c21a 100644
--- a/kde-apps/kio-extras/kio-extras-20.12.0.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,7 @@ DEPEND="
 	phonon? ( >=media-libs/phonon-4.11.0 )
 	samba? (
 		net-fs/samba[client]
+		net-libs/kdsoap:=
 		net-libs/kdsoap-ws-discovery-client
 	)
 	sftp? ( net-libs/libssh:=[sftp] )
@@ -72,6 +73,8 @@ RDEPEND="${DEPEND}
 # requires running kde environment
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-dont-log-pwd.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)