gentoo resync : 15.06.2021

4 files changed, 6 insertions, 53 deletions

diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 4482ac578bda..ce0adafcb2b8 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,6 +1,5 @@
-AUX kwallet-pam-5.20.5-socket-listening-error.patch 1444 BLAKE2B 6013b4229b4047b35b6d7550fc8fab1b30027bd31500bba2ef7dbb7e5b53d3d7a390feb4d81ff29646c76e3b53bd9032dd53e441409ed7406cc4630d8a6f93b2 SHA512 61bb0b7a344d9213d4dfb4258dc8e8a92ee94be7117daa9cbb54a02cfa1d1a746e57ec83107d375274f062e94759bdc59371064c712172c77740585a07684608
-DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03
 DIST kwallet-pam-5.21.5.tar.xz 19916 BLAKE2B ee0efa7448f7f7d599e83d9a923909fe0de965aa48a8e505b984a5cb54d16c20b3f2f57efb83cd887545e23c3aa9ac4a70c14e9173fff263190c8de5c2c9449f SHA512 4dab0ac4500c6ec01fef71e2197e59afb39c318dfe1e5727832fed2137b5d961bb1aad9c52d356346794ac1dd9e9451f507032aab29028806d9c04c3c566738d
-EBUILD kwallet-pam-5.20.5-r1.ebuild 805 BLAKE2B 955e48072ef94dc72e564c5d22a0a53ceac2f6e652497342b7ab9224551cd15b92a37d4a3a7909ff5039ec70e904b5a3a72860f8c24ba483c99a38e9d5b1afad SHA512 e7a5dcb9fa5a7392849c7602c5cb2ad730e12b62a98dc6b04556047db047af9c3b02827c681b487ff6fcd44dbbdb5c8603e4902338f6dc90dd9631f006be84b5
-EBUILD kwallet-pam-5.21.5.ebuild 734 BLAKE2B a526f6380a350610992b1b88f1114f4f81ad8b919fa785c421a9c849457b9eaeaabc463c687bc41afbdc8d5a95d98099fe485868ce42e210ae2220fa953453a9 SHA512 762a7bd7e8778a7070b9f8f151cd3f277f18b35528b51be9b6b7f9558fd2b38dfa40c55b3bc56cefd6e00fb6398f0c68498214bab40bda8ecc6ba1f9a0518874
+DIST kwallet-pam-5.22.0.tar.xz 20164 BLAKE2B 084c1040a6a88f4bd2a736a9ce78db6bf5d8ebc96ce15df84ff43e3295dd3794b92708ac1bbaddb73f5b0dc1585c54319bdab677476f9d2f15241b920077e9c5 SHA512 4f82b59c28879df3113c8d67171a50cb4c76728413c242749e5cce92d896f2139436263d07672fc4f2e98d457a7755a9901ddd3257a6c21ac088d24fec0b2026
+EBUILD kwallet-pam-5.21.5.ebuild 731 BLAKE2B d7380ef4185c0d9cc3a0ffdf5e36848292e083c2b20821a27ba50d9f46fd0ff2c2a03f4139d28a47a614c5f753c915c23fc47cf0d592a5330dc2bc1fb6b83d1c SHA512 ba1b94ad19d2cc0724ab7a72c04bf18307577e29d3ce8b0effc561f5323b6a9159360c39cfe121b4a3ce2e0c89514c40e097c504e9500b6776761e40b1efc422
+EBUILD kwallet-pam-5.22.0.ebuild 734 BLAKE2B a526f6380a350610992b1b88f1114f4f81ad8b919fa785c421a9c849457b9eaeaabc463c687bc41afbdc8d5a95d98099fe485868ce42e210ae2220fa953453a9 SHA512 762a7bd7e8778a7070b9f8f151cd3f277f18b35528b51be9b6b7f9558fd2b38dfa40c55b3bc56cefd6e00fb6398f0c68498214bab40bda8ecc6ba1f9a0518874
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch
deleted file mode 100644
index 790a644003d8..000000000000
--- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 06cd94634feb70dfa7e2f8695b97317cb2ebe44c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefano=20Alo=C3=A9?= <stefano.aloe2@gmail.com>
-Date: Sun, 17 Jan 2021 23:16:57 +0100
-Subject: [PATCH] Avoid socket listening error
-
-Closing all file descriptor above 3 is causing problem to socket() and listen(). Setting FD_CLOEXEC on them solves the problem and should have exactly the same behavior.
-
-BUG: 400929
-(cherry picked from commit 8f899902e6a3be8ad4948eb1ebdf679186aa20a7)
----
- pam_kwallet.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pam_kwallet.c b/pam_kwallet.c
-index 2585a68..a099872 100644
---- a/pam_kwallet.c
-+++ b/pam_kwallet.c
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <signal.h>
- #include <unistd.h>
-+#include <fcntl.h>
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-@@ -355,12 +356,13 @@ static int drop_privileges(struct passwd *userInfo)
- static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], char *fullSocket)
- {
-     //In the child pam_syslog does not work, using syslog directly
-+
-     //keep stderr open so socket doesn't returns us that fd
-     int x = 3;
--    //Close fd that are not of interest of kwallet
-+    //Set FD_CLOEXEC on fd that are not of interest of kwallet
-     for (; x < 64; ++x) {
-         if (x != toWalletPipe[0]) {
--            close (x);
-+            fcntl(x, F_SETFD, FD_CLOEXEC);
-         }
-     }
- 
--- 
-GitLab
-
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
index 852aef5a0d46..b656915b89be 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.22.0.ebuild
index bcabb32f43a0..852aef5a0d46 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.22.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -23,8 +23,6 @@ RDEPEND="${DEPEND}
 	net-misc/socat
 "
 
-PATCHES=( "${FILESDIR}/${P}-socket-listening-error.patch" ) # bug 717606
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"