diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | 0001-Xsession-Don-t-start-ssh-agent-by-default.patch (renamed from 0002-Xsession-Don-t-start-ssh-agent-by-default.patch) | 0 | ||||
| -rw-r--r-- | 0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch | 216 | ||||
| -rw-r--r-- | PKGBUILD | 16 |
4 files changed, 10 insertions, 231 deletions
@@ -1,6 +1,6 @@ pkgbase = gdm-plymouth pkgdesc = Display manager and login screen with plymouth support - pkgver = 40.0 + pkgver = 40.1 pkgrel = 1 url = https://wiki.gnome.org/Projects/GDM arch = x86_64 @@ -20,12 +20,10 @@ pkgbase = gdm-plymouth depends = xorg-server depends = xorg-xhost depends = libxdmcp - source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=3246bf1af8589899621649df523e6840e4858cda - source = 0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch - source = 0002-Xsession-Don-t-start-ssh-agent-by-default.patch + source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=7fafdbcac9b970492e9ea23df42111d90986f3f3 + source = 0001-Xsession-Don-t-start-ssh-agent-by-default.patch source = default.pa sha256sums = SKIP - sha256sums = f32555703d4f3b6babbe49ddd2c82295238623050b63826c95a959d5caec37f8 sha256sums = aa751223e8664f65fe2cae032dc93bb94338a41cfca4c6b66a0fca0c788c4313 sha256sums = e88410bcec9e2c7a22a319be0b771d1f8d536863a7fc618b6352a09d61327dcb @@ -62,4 +60,3 @@ pkgname = libgdm-plymouth depends = dconf provides = libgdm conflicts = libgdm - diff --git a/0002-Xsession-Don-t-start-ssh-agent-by-default.patch b/0001-Xsession-Don-t-start-ssh-agent-by-default.patch index 568eb2c56828..568eb2c56828 100644 --- a/0002-Xsession-Don-t-start-ssh-agent-by-default.patch +++ b/0001-Xsession-Don-t-start-ssh-agent-by-default.patch diff --git a/0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch b/0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch deleted file mode 100644 index 9f4cce14fc54..000000000000 --- a/0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch +++ /dev/null @@ -1,216 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Tue, 27 Oct 2020 18:59:14 +0000 -Subject: [PATCH] pam-arch: Update to match pambase 20200721.1-2 - -Update the PAM files for Arch Linux. This has been applied downstream -since Aug 2020. - -https://bugs.archlinux.org/task/67485 ---- - data/meson.build | 1 - - data/pam-arch/gdm-autologin.pam | 22 +++++++++-------- - data/pam-arch/gdm-fingerprint.pam | 31 +++++++++++++++--------- - data/pam-arch/gdm-launch-environment.pam | 24 ++++++++++-------- - data/pam-arch/gdm-password.pam | 17 +++++++------ - data/pam-arch/gdm-pin.pam | 13 ---------- - data/pam-arch/gdm-smartcard.pam | 31 +++++++++++++++--------- - 7 files changed, 75 insertions(+), 64 deletions(-) - delete mode 100644 data/pam-arch/gdm-pin.pam - -diff --git a/data/meson.build b/data/meson.build -index 23e2d7f9..7c5222ea 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -134,7 +134,6 @@ pam_data_files_map = { - 'gdm-fingerprint', - 'gdm-smartcard', - 'gdm-password', -- 'gdm-pin', - ], - 'none': [], - # We should no longer have 'autodetect' at this point -diff --git a/data/pam-arch/gdm-autologin.pam b/data/pam-arch/gdm-autologin.pam -index 99b14209..30bdf529 100644 ---- a/data/pam-arch/gdm-autologin.pam -+++ b/data/pam-arch/gdm-autologin.pam -@@ -1,13 +1,15 @@ --auth requisite pam_nologin.so --auth required pam_env.so --auth optional pam_gdm.so --auth optional pam_gnome_keyring.so --auth optional pam_permit.so -+#%PAM-1.0 - --account include system-local-login -+auth required pam_shells.so -+auth requisite pam_nologin.so -+auth optional pam_permit.so -+auth required pam_env.so -+auth [success=ok default=1] pam_gdm.so -+auth optional pam_gnome_keyring.so - --password include system-local-login -+account include system-local-login - --session optional pam_keyinit.so force revoke --session include system-local-login --session optional pam_gnome_keyring.so auto_start -+password required pam_deny.so -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start -diff --git a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam -index a4808617..cc660d9a 100644 ---- a/data/pam-arch/gdm-fingerprint.pam -+++ b/data/pam-arch/gdm-fingerprint.pam -@@ -1,14 +1,23 @@ --auth required pam_tally.so onerr=succeed file=/var/log/faillog --auth required pam_shells.so --auth requisite pam_nologin.so --auth required pam_env.so --auth required pam_fprintd.so --auth optional pam_permit.so -+#%PAM-1.0 - --account include system-local-login -+auth required pam_shells.so -+auth requisite pam_nologin.so -+auth required pam_faillock.so preauth -+# Optionally use requisite above if you do not want to prompt for the fingerprint -+# on locked accounts. -+auth [success=1 default=ignore] pam_fprintd.so -+auth [default=die] pam_faillock.so authfail -+auth optional pam_permit.so -+auth required pam_env.so -+auth required pam_faillock.so authsucc -+# If you drop the above call to pam_faillock.so the lock will be done also -+# on non-consecutive authentication failures. -+auth [success=ok default=1] pam_gdm.so -+auth optional pam_gnome_keyring.so - --password required pam_fprintd.so --password optional pam_permit.so -+account include system-local-login - --session optional pam_keyinit.so force revoke --session include system-local-login -+password required pam_deny.so -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start -diff --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam -index d59c9cb9..20d1810a 100644 ---- a/data/pam-arch/gdm-launch-environment.pam -+++ b/data/pam-arch/gdm-launch-environment.pam -@@ -1,13 +1,17 @@ --auth required pam_env.so --auth required pam_succeed_if.so audit quiet_success user = gdm --auth optional pam_permit.so -+#%PAM-1.0 - --account required pam_succeed_if.so audit quiet_success user = gdm --account optional pam_permit.so -+auth required pam_succeed_if.so audit quiet_success user in gdm:gnome-initial-setup -+auth optional pam_permit.so -+auth required pam_env.so - --password required pam_deny.so -+account required pam_succeed_if.so audit quiet_success user in gdm:gnome-initial-setup -+account optional pam_permit.so - --session optional pam_keyinit.so force revoke --session required pam_succeed_if.so audit quiet_success user = gdm --session required pam_systemd.so --session optional pam_permit.so -+password required pam_deny.so -+ -+session optional pam_loginuid.so -+session optional pam_keyinit.so force revoke -+session required pam_succeed_if.so audit quiet_success user in gdm:gnome-initial-setup -+session optional pam_permit.so -+-session optional pam_systemd.so -+session required pam_env.so user_readenv=1 -diff --git a/data/pam-arch/gdm-password.pam b/data/pam-arch/gdm-password.pam -index 8d34794e..137242a6 100644 ---- a/data/pam-arch/gdm-password.pam -+++ b/data/pam-arch/gdm-password.pam -@@ -1,11 +1,12 @@ --auth include system-local-login --auth optional pam_gnome_keyring.so -+#%PAM-1.0 - --account include system-local-login -+auth include system-local-login -+auth optional pam_gnome_keyring.so - --password include system-local-login --password optional pam_gnome_keyring.so use_authtok -+account include system-local-login - --session optional pam_keyinit.so force revoke --session include system-local-login --session optional pam_gnome_keyring.so auto_start -+password include system-local-login -+password optional pam_gnome_keyring.so use_authtok -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start -diff --git a/data/pam-arch/gdm-pin.pam b/data/pam-arch/gdm-pin.pam -deleted file mode 100644 -index 135e205e..00000000 ---- a/data/pam-arch/gdm-pin.pam -+++ /dev/null -@@ -1,13 +0,0 @@ --auth requisite pam_pin.so --auth include system-local-login --auth optional pam_gnome_keyring.so -- --account include system-local-login -- --password include system-local-login --password optional pam_pin.so --password optional pam_gnome_keyring.so use_authtok -- --session optional pam_keyinit.so force revoke --session include system-local-login --session optional pam_gnome_keyring.so auto_start -diff --git a/data/pam-arch/gdm-smartcard.pam b/data/pam-arch/gdm-smartcard.pam -index ec6f75d5..e6ec1299 100644 ---- a/data/pam-arch/gdm-smartcard.pam -+++ b/data/pam-arch/gdm-smartcard.pam -@@ -1,14 +1,23 @@ --auth required pam_tally.so onerr=succeed file=/var/log/faillog --auth required pam_shells.so --auth requisite pam_nologin.so --auth required pam_env.so --auth required pam_pkcs11.so wait_for_card card_only --auth optional pam_permit.so -+#%PAM-1.0 - --account include system-local-login -+auth required pam_shells.so -+auth requisite pam_nologin.so -+auth required pam_faillock.so preauth -+# Optionally use requisite above if you do not want to prompt for the smartcard -+# on locked accounts. -+auth [success=1 default=ignore] pam_pkcs11.so wait_for_card card_only -+auth [default=die] pam_faillock.so authfail -+auth optional pam_permit.so -+auth required pam_env.so -+auth required pam_faillock.so authsucc -+# If you drop the above call to pam_faillock.so the lock will be done also -+# on non-consecutive authentication failures. -+auth [success=ok default=1] pam_gdm.so -+auth optional pam_gnome_keyring.so - --password required pam_pkcs11.so --password optional pam_permit.so -+account include system-local-login - --session optional pam_keyinit.so force revoke --session include system-local-login -+password required pam_deny.so -+ -+session include system-local-login -+session optional pam_gnome_keyring.so auto_start @@ -7,7 +7,7 @@ _pkgbase=gdm pkgbase=gdm-plymouth pkgname=(gdm-plymouth libgdm-plymouth) -pkgver=40.0 +pkgver=40.1 pkgrel=1 pkgdesc="Display manager and login screen with plymouth support" url="https://wiki.gnome.org/Projects/GDM" @@ -16,13 +16,11 @@ license=(GPL) depends=(plymouth gnome-shell gnome-session upower systemd xorg-xrdb xorg-server xorg-xhost libxdmcp) makedepends=(yelp-tools gobject-introspection git docbook-xsl meson) checkdepends=(check) -_commit=3246bf1af8589899621649df523e6840e4858cda # tags/40.0^0 +_commit=7fafdbcac9b970492e9ea23df42111d90986f3f3 # tags/40.1^0 source=("git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit" - 0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch - 0002-Xsession-Don-t-start-ssh-agent-by-default.patch + 0001-Xsession-Don-t-start-ssh-agent-by-default.patch default.pa) sha256sums=('SKIP' - 'f32555703d4f3b6babbe49ddd2c82295238623050b63826c95a959d5caec37f8' 'aa751223e8664f65fe2cae032dc93bb94338a41cfca4c6b66a0fca0c788c4313' 'e88410bcec9e2c7a22a319be0b771d1f8d536863a7fc618b6352a09d61327dcb') @@ -36,11 +34,11 @@ prepare() { # https://bugs.archlinux.org/task/67485 - git apply -3 ../0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch + git cherry-pick -n 8528a503ad70669a5f0c03d0a92ba19326983b82 # Don't start ssh-agent by default - git apply -3 ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch + git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch } build() { @@ -70,7 +68,7 @@ package_gdm-plymouth() { groups=(gnome) install=gdm.install - DESTDIR="$pkgdir" meson install -C build + meson install -C build --destdir "$pkgdir" install -d "$pkgdir/var/lib" install -d "$pkgdir/var/lib/gdm" -o120 -g120 -m1770 @@ -81,7 +79,7 @@ package_gdm-plymouth() { install -d "$pkgdir/var/lib/gdm/.local/share/applications" -o120 -g120 # https://src.fedoraproject.org/rpms/gdm/blob/master/f/default.pa-for-gdm - install -Dt "$pkgdir/var/lib/gdm/.config/pulse" -o120 -g120 -m644 default.pa + install -t "$pkgdir/var/lib/gdm/.config/pulse" -o120 -g120 -m644 default.pa install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/gdm.conf" <<END g gdm 120 - |