[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

[Mike Gilbert]

commit:     38ec013fbbf4b11185706d21fd079881f628f272
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  3 15:48:10 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Nov  3 15:48:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ec013f

sys-apps/systemd: include system-auth in PAM config

Closes: https://bugs.gentoo.org/751199
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/files/gentoo-pam.patch | 33 +++++++++++++++++++++++++++++++++
 sys-apps/systemd/systemd-246.6.ebuild   |  1 +
 sys-apps/systemd/systemd-9999.ebuild    |  1 +
 3 files changed, 35 insertions(+)

diff --git a/sys-apps/systemd/files/gentoo-pam.patch b/sys-apps/systemd/files/gentoo-pam.patch
new file mode 100644
index 00000000000..4d022b508ba
--- /dev/null
+++ b/sys-apps/systemd/files/gentoo-pam.patch
@@ -0,0 +1,33 @@
+From b744751e2ced66c2ec191e8bd490cb9bdffc630a Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@g.o>
+Date: Tue, 3 Nov 2020 10:42:51 -0500
+Subject: [PATCH] pam: include system-auth for systemd --user
+
+---
+ src/login/systemd-user.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
+index f6313f79fe..bcf84b4c64 100644
+--- a/src/login/systemd-user.m4
++++ b/src/login/systemd-user.m4
+@@ -5,7 +5,7 @@
+ m4_ifdef(`ENABLE_HOMED',
+ -account sufficient pam_systemd_home.so
+ )m4_dnl
+-account sufficient pam_unix.so
++account include system-auth
+ account required pam_permit.so
+ 
+ m4_ifdef(`HAVE_SELINUX',
+@@ -13,6 +13,7 @@ session required pam_selinux.so close
+ session required pam_selinux.so nottys open
+ )m4_dnl
+ session required pam_loginuid.so
++session include system-auth
+ session optional pam_keyinit.so force revoke
+ m4_ifdef(`ENABLE_HOMED',
+ -session optional pam_systemd_home.so
+-- 
+2.29.0
+

diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild
index 3cca3239a60..4c0c3699148 100644
--- a/sys-apps/systemd/systemd-246.6.ebuild
+++ b/sys-apps/systemd/systemd-246.6.ebuild
@@ -210,6 +210,7 @@ src_prepare() {
 			"${FILESDIR}/gentoo-generator-path-r2.patch"
 			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
 			"${FILESDIR}/gentoo-journald-audit.patch"
+			"${FILESDIR}/gentoo-pam.patch"
 		)
 	fi
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 3cca3239a60..4c0c3699148 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -210,6 +210,7 @@ src_prepare() {
 			"${FILESDIR}/gentoo-generator-path-r2.patch"
 			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
 			"${FILESDIR}/gentoo-journald-audit.patch"
+			"${FILESDIR}/gentoo-pam.patch"
 		)
 	fi