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

[Mike Gilbert]

commit:     b528f97e26fe1d046152e38cbd199355d380cc98
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 16:53:28 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 17:18:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b528f97e

sys-apps/systemd: simplify systemd-user pam config

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/files/systemd-user.pam | 5 +++++
 sys-apps/systemd/systemd-9999.ebuild    | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sys-apps/systemd/files/systemd-user.pam 
b/sys-apps/systemd/files/systemd-user.pam
new file mode 100644
index 00000000000..38ae3211f8d
--- /dev/null
+++ b/sys-apps/systemd/files/systemd-user.pam
@@ -0,0 +1,5 @@
+account include system-auth
+
+session required pam_loginuid.so
+session include system-auth
+session optional pam_systemd.so

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 3f2168e521b..41b2a1b5b70 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -223,7 +223,6 @@ src_prepare() {
                        "${FILESDIR}/gentoo-generator-path-r2.patch"
                        
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
                        "${FILESDIR}/gentoo-journald-audit.patch"
-                       "${FILESDIR}/gentoo-pam-r1.patch"
                )
        fi
 
@@ -380,6 +379,10 @@ multilib_src_install_all() {
        # Symlink /etc/sysctl.conf for easy migration.
        dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
 
+       if use pam; then
+               newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+       fi
+
        if use hwdb; then
                rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
        fi