[arch-commits] Commit in gdm/repos/extra-x86_64 (7 files)
Jan Steffens
heftig at archlinux.org
Tue Sep 10 21:18:35 UTC 2019
Date: Tuesday, September 10, 2019 @ 21:18:34
Author: heftig
Revision: 362178
archrelease: copy trunk to extra-x86_64
Added:
gdm/repos/extra-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 362177, gdm/trunk/0001-Xsession-Don-t-start-ssh-agent-by-default.patch)
gdm/repos/extra-x86_64/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch
(from rev 362177, gdm/trunk/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch)
gdm/repos/extra-x86_64/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
(from rev 362177, gdm/trunk/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch)
gdm/repos/extra-x86_64/PKGBUILD
(from rev 362177, gdm/trunk/PKGBUILD)
gdm/repos/extra-x86_64/gdm.install
(from rev 362177, gdm/trunk/gdm.install)
Deleted:
gdm/repos/extra-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
gdm/repos/extra-x86_64/PKGBUILD
--------------------------------------------------------------+
0001-Xsession-Don-t-start-ssh-agent-by-default.patch | 63 +--
0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch | 30 +
0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch | 31 +
PKGBUILD | 183 +++++-----
gdm.install | 11
5 files changed, 197 insertions(+), 121 deletions(-)
Deleted: 0001-Xsession-Don-t-start-ssh-agent-by-default.patch
===================================================================
--- 0001-Xsession-Don-t-start-ssh-agent-by-default.patch 2019-09-10 21:17:01 UTC (rev 362177)
+++ 0001-Xsession-Don-t-start-ssh-agent-by-default.patch 2019-09-10 21:18:34 UTC (rev 362178)
@@ -1,32 +0,0 @@
-From 328a315c21ec71e563d00699f0a79186b229270a Mon Sep 17 00:00:00 2001
-Message-Id: <328a315c21ec71e563d00699f0a79186b229270a.1541542184.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sat, 20 Jun 2015 17:22:38 +0200
-Subject: [PATCH] Xsession: Don't start ssh-agent by default
-
----
- data/Xsession.in | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/data/Xsession.in b/data/Xsession.in
-index 9d79558c..ff6d9de0 100755
---- a/data/Xsession.in
-+++ b/data/Xsession.in
-@@ -175,14 +175,6 @@ if [ "x$command" = "xdefault" ] ; then
- fi
- fi
-
--# add ssh-agent if found
--sshagent="`gdmwhich ssh-agent`"
--if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-- command="$sshagent -- $command"
--elif [ -z "$sshagent" ] ; then
-- echo "$0: ssh-agent not found!"
--fi
--
- echo "$0: Setup done, will execute: $command"
-
- eval exec $command
---
-2.19.1
-
Copied: gdm/repos/extra-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch (from rev 362177, gdm/trunk/0001-Xsession-Don-t-start-ssh-agent-by-default.patch)
===================================================================
--- 0001-Xsession-Don-t-start-ssh-agent-by-default.patch (rev 0)
+++ 0001-Xsession-Don-t-start-ssh-agent-by-default.patch 2019-09-10 21:18:34 UTC (rev 362178)
@@ -0,0 +1,31 @@
+From 58cdf43d7b053a7370e6779d06835c239598f59a Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sat, 20 Jun 2015 17:22:38 +0200
+Subject: [PATCH 1/3] Xsession: Don't start ssh-agent by default
+
+---
+ data/Xsession.in | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/data/Xsession.in b/data/Xsession.in
+index 9d79558c..ff6d9de0 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -175,14 +175,6 @@ if [ "x$command" = "xdefault" ] ; then
+ fi
+ fi
+
+-# add ssh-agent if found
+-sshagent="`gdmwhich ssh-agent`"
+-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+- command="$sshagent -- $command"
+-elif [ -z "$sshagent" ] ; then
+- echo "$0: ssh-agent not found!"
+-fi
+-
+ echo "$0: Setup done, will execute: $command"
+
+ eval exec $command
+--
+2.23.0
+
Copied: gdm/repos/extra-x86_64/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch (from rev 362177, gdm/trunk/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch)
===================================================================
--- 0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch (rev 0)
+++ 0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch 2019-09-10 21:18:34 UTC (rev 362178)
@@ -0,0 +1,30 @@
+From a9c2cb0ae478caf40cc24001fbf6cfbbcc19196e Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 10 Sep 2019 20:37:08 +0000
+Subject: [PATCH 2/3] pam-arch: Don't check greeter account for expiry
+
+systemd-sysusers now creates expired accounts, which broke the greeter
+on new installations.
+
+Doesn't actually fully fix the problem as the user at .service still fails
+to launch.
+---
+ data/pam-arch/gdm-launch-environment.pam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam
+index 618a7d3a..89521472 100644
+--- a/data/pam-arch/gdm-launch-environment.pam
++++ b/data/pam-arch/gdm-launch-environment.pam
+@@ -1,7 +1,7 @@
+ auth required pam_env.so
+ auth optional pam_permit.so
+
+-account include system-local-login
++account optional pam_permit.so
+
+ password required pam_deny.so
+
+--
+2.23.0
+
Copied: gdm/repos/extra-x86_64/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch (from rev 362177, gdm/trunk/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch)
===================================================================
--- 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch (rev 0)
+++ 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch 2019-09-10 21:18:34 UTC (rev 362178)
@@ -0,0 +1,31 @@
+From 3b6ca2e211b9874e61e9a6950c52b52f2a79dca3 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 10 Sep 2019 20:41:10 +0000
+Subject: [PATCH 3/3] pam-arch: Restrict greeter service to the gdm user
+
+Copied from pam-exherbo.
+---
+ data/pam-arch/gdm-launch-environment.pam | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam
+index 89521472..d59c9cb9 100644
+--- a/data/pam-arch/gdm-launch-environment.pam
++++ b/data/pam-arch/gdm-launch-environment.pam
+@@ -1,10 +1,13 @@
+ auth required pam_env.so
++auth required pam_succeed_if.so audit quiet_success user = gdm
+ auth optional pam_permit.so
+
++account required pam_succeed_if.so audit quiet_success user = gdm
+ account optional pam_permit.so
+
+ password required pam_deny.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
+--
+2.23.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-09-10 21:17:01 UTC (rev 362177)
+++ PKGBUILD 2019-09-10 21:18:34 UTC (rev 362178)
@@ -1,89 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gdm
-pkgname=(gdm libgdm)
-pkgver=3.32.0+2+g820f90f5
-pkgrel=1
-pkgdesc="Display manager and login screen"
-url="https://wiki.gnome.org/Projects/GDM"
-arch=(x86_64)
-license=(GPL)
-depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost)
-makedepends=(yelp-tools gobject-introspection git docbook-xsl)
-checkdepends=(check)
-_commit=820f90f5a78b81b2e4610da14627266c2135c8b0 # master
-source=("git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit"
- 0001-Xsession-Don-t-start-ssh-agent-by-default.patch)
-sha256sums=('SKIP'
- '3412f7da0205409f08a126a1d166b644fe0f1d0444f7cdebdce8e59cea2d672c')
-
-pkgver() {
- cd gdm
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- mkdir build
- cd gdm
- patch -Np1 -i ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd build
- ../gdm/configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib \
- with_dbus_sys=/usr/share/dbus-1/system.d \
- --disable-schemas-compile \
- --disable-static \
- --enable-gdm-xsession \
- --enable-ipv6 \
- --with-default-pam-config=arch \
- --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
- --without-plymouth \
- --without-tcp-wrappers
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- make -C build check
-}
-
-package_gdm() {
- depends+=(libgdm)
- optdepends=('fprintd: fingerprint authentication')
- backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
- 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)
-
- DESTDIR="$pkgdir" make -C build install
-
- chown -Rc 120:120 "$pkgdir/var/lib/gdm"
-
- # Unused or created at start
- rm -r "$pkgdir"/var/{cache,log,run}
-
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/gdm.conf" <<END
-g gdm 120 -
-u gdm 120 "Gnome Display Manager" /var/lib/gdm
-END
-
-### Split libgdm
- mkdir -p libgdm/{lib,share}
- mv -t libgdm "$pkgdir"/usr/include
- mv -t libgdm/lib "$pkgdir"/usr/lib/{girepository-1.0,libgdm*,pkgconfig}
- mv -t libgdm/share "$pkgdir"/usr/share/{gir-1.0,glib-2.0}
-}
-
-package_libgdm() {
- pkgdesc="GDM support library"
- depends=(systemd glib2 dconf)
- mv libgdm "$pkgdir/usr"
-}
Copied: gdm/repos/extra-x86_64/PKGBUILD (from rev 362177, gdm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-09-10 21:18:34 UTC (rev 362178)
@@ -0,0 +1,94 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gdm
+pkgname=(gdm libgdm)
+pkgver=3.32.0+2+g820f90f5
+pkgrel=2
+pkgdesc="Display manager and login screen"
+url="https://wiki.gnome.org/Projects/GDM"
+arch=(x86_64)
+license=(GPL)
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost)
+makedepends=(yelp-tools gobject-introspection git docbook-xsl)
+checkdepends=(check)
+_commit=820f90f5a78b81b2e4610da14627266c2135c8b0 # gnome-3-32
+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)
+sha256sums=('SKIP'
+ '098ffb1cdc0232f014e5fe5fb8d268b752afc54d6ee661664036879acd075b22'
+ '2e2b12d4609004a010245de51a8c017b164e84f249cd19706d020cb599d2d7e7'
+ '3fa02eb7bbbe1586eae4ae98221a284251ca2869dc731c80b753e7effc443379')
+
+pkgver() {
+ cd gdm
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ mkdir build
+ cd gdm
+ patch -Np1 -i ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
+
+ # 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
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd build
+ ../gdm/configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ with_dbus_sys=/usr/share/dbus-1/system.d \
+ --disable-schemas-compile \
+ --disable-static \
+ --enable-gdm-xsession \
+ --enable-ipv6 \
+ --with-default-pam-config=arch \
+ --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
+ --without-plymouth \
+ --without-tcp-wrappers
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ make -C build check
+}
+
+package_gdm() {
+ depends+=(libgdm)
+ optdepends=('fprintd: fingerprint authentication')
+ backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
+ 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
+
+ chown -Rc 120:120 "$pkgdir/var/lib/gdm"
+
+ # Unused or created at start
+ rm -r "$pkgdir"/var/{cache,log,run}
+
+### Split libgdm
+ mkdir -p libgdm/{lib,share}
+ mv -t libgdm "$pkgdir"/usr/include
+ mv -t libgdm/lib "$pkgdir"/usr/lib/{girepository-1.0,libgdm*,pkgconfig}
+ mv -t libgdm/share "$pkgdir"/usr/share/{gir-1.0,glib-2.0}
+}
+
+package_libgdm() {
+ pkgdesc="GDM support library"
+ depends=(systemd glib2 dconf)
+ mv libgdm "$pkgdir/usr"
+}
Copied: gdm/repos/extra-x86_64/gdm.install (from rev 362177, gdm/trunk/gdm.install)
===================================================================
--- gdm.install (rev 0)
+++ gdm.install 2019-09-10 21:18:34 UTC (rev 362178)
@@ -0,0 +1,11 @@
+post_install() {
+ # Can't use sysusers as the greeter session cannot launch with an expired 'gdm' account
+ # https://bugs.archlinux.org/task/63706
+ if ! getent passwd gdm >/dev/null; then
+ groupadd -r -g 120 gdm
+ useradd -r -c "Gnome Display Manager" -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+ passwd -ql gdm
+ fi
+}
+
+# vim:set ft=sh sw=2 et:
More information about the arch-commits
mailing list