summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-03-19 23:39:51 +0200
committerMart Raudsepp <leio@gentoo.org>2019-03-20 00:39:20 +0200
commit003b0f462810dfbeee0edda88243d19983dc3333 (patch)
treeefa3e6584d1a0ef204e3d26a4ff27ad0e54b5685 /gnome-base/gdm/files
parentdev-vcs/cvs-fast-export: bump up to 1.47 (diff)
downloadgentoo-003b0f462810dfbeee0edda88243d19983dc3333.tar.gz
gentoo-003b0f462810dfbeee0edda88243d19983dc3333.tar.bz2
gentoo-003b0f462810dfbeee0edda88243d19983dc3333.zip
gnome-base/gdm: add elogind support
Include a patch from 3.32 that removes long gone legacy argument to pam_systemd.so, as to make it uniform with the added elogind support (and not add that legacy arg there too) and be able to reuse the pam-elogind.patch bits for 3.32 without changes, just dropping the argument patch. The elogind support is achieved without configure.ac patches by making use of the standard PKG_CHECK_MODULES builtin AC_ARG_VAR provided variable override support and passing elogind values there as a drop-in replacement. So we don't need an eautoreconf and maintaing an autotools patch until upstream moves to meson. Initial VT is put back to 7 for elogind for the time being until there is more clarity what will happen with startDM.sh and how things interact with agetty out of the box (potential keyboard stealing, etc). Closes: https://bugs.gentoo.org/645348 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'gnome-base/gdm/files')
-rw-r--r--gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch29
-rw-r--r--gnome-base/gdm/files/pam-elogind.patch24
2 files changed, 53 insertions, 0 deletions
diff --git a/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch b/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch
new file mode 100644
index 000000000000..8d82a284bf50
--- /dev/null
+++ b/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch
@@ -0,0 +1,29 @@
+From a26ed5502622c22daa175861fa9d651a32131cf5 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Sat, 16 Feb 2019 08:47:45 +0100
+Subject: [PATCH 1/2] pam-exherbo: drop legacy pam_systemd argument
+
+kill-session-processes=1 is long gone
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+(cherry picked from commit 13e6666b1e1000d757ac5621a83105110f55e3e3)
+---
+ data/pam-exherbo/gdm-launch-environment.pam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam
+index 8c13b3bc..51a8e003 100644
+--- a/data/pam-exherbo/gdm-launch-environment.pam
++++ b/data/pam-exherbo/gdm-launch-environment.pam
+@@ -8,7 +8,7 @@ auth required pam_permit.so
+
+ password required pam_deny.so
+
+--session optional pam_systemd.so kill-session-processes=1
++-session optional pam_systemd.so
+ session optional pam_keyinit.so force revoke
+ session required pam_succeed_if.so audit quiet_success user = gdm
+ session required pam_permit.so
+--
+2.17.0
+
diff --git a/gnome-base/gdm/files/pam-elogind.patch b/gnome-base/gdm/files/pam-elogind.patch
new file mode 100644
index 000000000000..e17bed395b54
--- /dev/null
+++ b/gnome-base/gdm/files/pam-elogind.patch
@@ -0,0 +1,24 @@
+From 96e605d6bd832a89f022872492a9c9cb1eb62f66 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 19 Mar 2019 23:13:29 +0200
+Subject: [PATCH 2/2] pam-exherbo: Support elogind
+
+---
+ data/pam-exherbo/gdm-launch-environment.pam | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam
+index 51a8e003..c697a528 100644
+--- a/data/pam-exherbo/gdm-launch-environment.pam
++++ b/data/pam-exherbo/gdm-launch-environment.pam
+@@ -8,6 +8,7 @@ auth required pam_permit.so
+
+ password required pam_deny.so
+
++-session optional pam_elogind.so
+ -session optional pam_systemd.so
+ session optional pam_keyinit.so force revoke
+ session required pam_succeed_if.so audit quiet_success user = gdm
+--
+2.17.0
+