gentoo resync : 22.01.2021

4 files changed, 87 insertions, 2 deletions

diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index ce6cfcaefa16..4e4d3a2304b6 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,7 @@
+AUX kwallet-pam-5.20.5-socket-listening-error.patch 1444 BLAKE2B 6013b4229b4047b35b6d7550fc8fab1b30027bd31500bba2ef7dbb7e5b53d3d7a390feb4d81ff29646c76e3b53bd9032dd53e441409ed7406cc4630d8a6f93b2 SHA512 61bb0b7a344d9213d4dfb4258dc8e8a92ee94be7117daa9cbb54a02cfa1d1a746e57ec83107d375274f062e94759bdc59371064c712172c77740585a07684608
 DIST kwallet-pam-5.19.5.tar.xz 19932 BLAKE2B 28d8419f500c163ba15a79cc994af70b723dff24fa8c32e899bd856766290f20d09e3ee98e164d55596d1b97137e92096f9c2c3cf2386bb700aa0b7bcfed1c39 SHA512 3fe30f979f6ee838b073b7afdb406068f90529fbbac3513d65145f6a46ab8ba0b61ba11a3e9192c60b1ddd50e9af448c1298725fc01dca483b40a8030053095d
 DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03
 EBUILD kwallet-pam-5.19.5.ebuild 731 BLAKE2B d950afa45dbb80cbf33a5fba88d382962b9a0c6c53bd65ff445ffbcd5b062578e7909768d8102a6faae954b38853d2dbcf16e0379e80f1408399cc0f3ce2697c SHA512 87942ac14c168a76d23669b2b2ece8f828684a07125fc9a29d8b10367586d2e5039abf192cc30f3cb311e4cdbb7e3a0404b0c2d2986b3680b82d922b87fb0e1e
-EBUILD kwallet-pam-5.20.5.ebuild 734 BLAKE2B 4bab6725ed37edb60c80d10420713772110d767edb882fc665b221cfd90ed6b98d3666e5bc97118f5a92cb759fefdc4ec3af4a5e57bd9e2c1282b7c5df8dba76 SHA512 8466eba6e8a5c65cbd9fe64edb8bfa16c071c10a38ccd66251e12b27c5d2958b6f4b58208636d9ea57d73c5d52af9a738a5eaaeeecf7048f69f126b0005ec8c1
+EBUILD kwallet-pam-5.20.5-r1.ebuild 808 BLAKE2B 082e5a473cb19979ef46a500e9f634010ce06d34489157cf51202e7bf7f80390d7faf255a13cdabaf3747d61eeedc80fd5d096dae8836e777e6f29dbbb1f40ef SHA512 30a06f54018546969015a2d01a819c1f3ecff730f8fca7756b63653f1002421dbeab8d6d3f7825df9cbc27138145f532bf34c40e6e7591b56131f51d7e0cfb58
+EBUILD kwallet-pam-5.20.5.ebuild 733 BLAKE2B 070df3301404668769858bd4cabfef892f0e6736974a54a40711eceb8f988a38018e0706c5f65b7da11f761b5d595c1c5d7136be7d3ad1c897a844a440c07f48 SHA512 a15de896036694caaba645f90686c0edebbacc2de78cfee712820d936f0b6e3c2f6ea7226c4bcd6dca18cbfae732e2320a916fcf733fa721d2b62bc44b290c64
 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
new file mode 100644
index 000000000000..790a644003d8
--- /dev/null
+++ b/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch
@@ -0,0 +1,44 @@
+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.20.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
new file mode 100644
index 000000000000..2dd76daad167
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
+
+DESCRIPTION="PAM module to not enter KWallet password again after login"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	sys-libs/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+PATCHES=( "${FILESDIR}/${P}-socket-listening-error.patch" ) # bug 717606
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5.ebuild
index b2183fe5aa93..f4515304f6ac 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.20.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="