diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0001-Xsession-Don-t-start-ssh-agent-by-default.patch | 4 | ||||
-rw-r--r-- | 0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch | 4 | ||||
-rw-r--r-- | 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch | 3 | ||||
-rw-r--r-- | 0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch | 6 | ||||
-rw-r--r-- | PKGBUILD | 24 |
6 files changed, 28 insertions, 25 deletions
@@ -1,9 +1,8 @@ pkgbase = gdm-plymouth pkgdesc = Display manager and login screen with plymouth support pkgver = 3.36.3 - pkgrel = 2 + pkgrel = 3 url = https://wiki.gnome.org/Projects/GDM - install = gdm.install arch = x86_64 license = GPL checkdepends = check @@ -24,12 +23,13 @@ pkgbase = gdm-plymouth source = 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch source = 0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch sha256sums = SKIP - sha256sums = 6f386e5e7ca09adaa6f9309c40dd32c6ff85990ce4a7bb9da70cc2a3de1f320b - sha256sums = 88129b13ba9196d93d1c434ae8e3c48d2eee3e28fb2594b2c1c5f4385f05b15d - sha256sums = 2e27b0d16311f4e139ee77a8ad752517a715a4f85312810a7c401bba85576b70 - sha256sums = a999d49759fbe8b9a09598cc2a744b86c220486ae202e2bc351d170741142062 + sha256sums = 5a32db412fc5256e16691e8f2db0b460bafbbb2be8eb9b9bcc71b5cd49688f9e + sha256sums = e879a982467a62c4c1557067dbdef6b56a774273df1368a60c4b036015111cdd + sha256sums = 4648e7b920ccb14d8a87634c3c98d51ff13163ae2fc9fc4a3c2e9ec876515469 + sha256sums = ba98385cf1de00560f77d75a241b1895567c6b8d4babf230d10ae7fd19739fda pkgname = gdm-plymouth + install = gdm.install groups = gnome depends = plymouth depends = gnome-shell diff --git a/0001-Xsession-Don-t-start-ssh-agent-by-default.patch b/0001-Xsession-Don-t-start-ssh-agent-by-default.patch index 5e87a7e85d37..54c6efa3e6a0 100644 --- a/0001-Xsession-Don-t-start-ssh-agent-by-default.patch +++ b/0001-Xsession-Don-t-start-ssh-agent-by-default.patch @@ -1,5 +1,4 @@ -From 328a315c21ec71e563d00699f0a79186b229270a Mon Sep 17 00:00:00 2001 -Message-Id: <328a315c21ec71e563d00699f0a79186b229270a.1541542184.git.jan.steffens@gmail.com> +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Sat, 20 Jun 2015 17:22:38 +0200 Subject: [PATCH] Xsession: Don't start ssh-agent by default @@ -27,3 +26,4 @@ index 9d79558c..ff6d9de0 100755 echo "$0: Setup done, will execute: $command" eval exec $command + diff --git a/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch b/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch index e23dff2a5198..0d9814e740f8 100644 --- a/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch +++ b/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch @@ -1,4 +1,4 @@ -From a9c2cb0ae478caf40cc24001fbf6cfbbcc19196e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Tue, 10 Sep 2019 20:37:08 +0000 Subject: [PATCH] pam-arch: Don't check greeter account for expiry @@ -24,3 +24,5 @@ index 618a7d3a..89521472 100644 +account optional pam_permit.so password required pam_deny.so + + diff --git a/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch b/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch index 18f253da0b8f..e87b1ffc0e43 100644 --- a/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch +++ b/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch @@ -1,4 +1,4 @@ -From 3b6ca2e211b9874e61e9a6950c52b52f2a79dca3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Tue, 10 Sep 2019 20:41:10 +0000 Subject: [PATCH] pam-arch: Restrict greeter service to the gdm user @@ -26,3 +26,4 @@ index 89521472..d59c9cb9 100644 +session required pam_succeed_if.so audit quiet_success user = gdm session required pam_systemd.so session optional pam_permit.so + diff --git a/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch b/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch index b138042086a7..d7601f2f07dc 100644 --- a/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch +++ b/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch @@ -95,12 +95,12 @@ index d59c9cb9..2ff5ae56 100644 -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=gdm ++auth required pam_succeed_if.so audit quiet_success user = gdm +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=gdm ++account required pam_succeed_if.so audit quiet_success user = gdm +account optional pam_permit.so -session optional pam_keyinit.so force revoke @@ -111,7 +111,7 @@ index d59c9cb9..2ff5ae56 100644 + +session optional pam_loginuid.so +session optional pam_keyinit.so force revoke -+session required pam_succeed_if.so audit quiet_success user=gdm ++session required pam_succeed_if.so audit quiet_success user = gdm +session optional pam_permit.so +-session optional pam_systemd.so +session required pam_env.so user_readenv=1 @@ -8,7 +8,7 @@ _pkgbase=gdm pkgbase=gdm-plymouth pkgname=(gdm-plymouth libgdm-plymouth) pkgver=3.36.3 -pkgrel=2 +pkgrel=3 pkgdesc="Display manager and login screen with plymouth support" url="https://wiki.gnome.org/Projects/GDM" arch=(x86_64) @@ -18,16 +18,15 @@ makedepends=(yelp-tools gobject-introspection git docbook-xsl) checkdepends=(check) _commit=24a4c0afe337a7a381397c87a39e3a666c0ae6cc # tags/3.36.3^0 source=("git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit" - '0001-Xsession-Don-t-start-ssh-agent-by-default.patch' - '0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch' - '0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch' - '0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch') + 0001-Xsession-Don-t-start-ssh-agent-by-default.patch + 0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch + 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch + 0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch) sha256sums=('SKIP' - '6f386e5e7ca09adaa6f9309c40dd32c6ff85990ce4a7bb9da70cc2a3de1f320b' - '88129b13ba9196d93d1c434ae8e3c48d2eee3e28fb2594b2c1c5f4385f05b15d' - '2e27b0d16311f4e139ee77a8ad752517a715a4f85312810a7c401bba85576b70' - 'a999d49759fbe8b9a09598cc2a744b86c220486ae202e2bc351d170741142062') -install=gdm.install + '5a32db412fc5256e16691e8f2db0b460bafbbb2be8eb9b9bcc71b5cd49688f9e' + 'e879a982467a62c4c1557067dbdef6b56a774273df1368a60c4b036015111cdd' + '4648e7b920ccb14d8a87634c3c98d51ff13163ae2fc9fc4a3c2e9ec876515469' + 'ba98385cf1de00560f77d75a241b1895567c6b8d4babf230d10ae7fd19739fda') pkgver() { cd gdm @@ -39,10 +38,10 @@ prepare() { cd gdm patch -Np1 -i ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch -# https://bugs.archlinux.org/task/63706 + # https://bugs.archlinux.org/task/63706 patch -Np1 -i ../0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch patch -Np1 -i ../0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch - + # https://bugs.archlinux.org/task/67485 patch -Np1 -i ../0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch @@ -85,6 +84,7 @@ package_gdm-plymouth() { etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf etc/gdm/Xsession etc/gdm/PostSession/Default etc/gdm/PreSession/Default) groups=(gnome) + install=gdm.install DESTDIR="$pkgdir" make -C build install |