Date: Thursday, October 20, 2022 @ 21:13:12
Author: heftig
Revision: 458471
archrelease: copy trunk to testing-x86_64
Added:
gdm/repos/testing-x86_64/
gdm/repos/testing-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 458470,
gdm/trunk/0001-Xsession-Don-t-start-ssh-agent-by-default.patch)
gdm/repos/testing-x86_64/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
(from rev 458470,
gdm/trunk/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch)
gdm/repos/testing-x86_64/PKGBUILD
(from rev 458470, gdm/trunk/PKGBUILD)
gdm/repos/testing-x86_64/gdm.install
(from rev 458470, gdm/trunk/gdm.install)
--------------------------------------------------------+
0001-Xsession-Don-t-start-ssh-agent-by-default.patch | 28 +++
0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch | 21 ++
PKGBUILD | 122 +++++++++++++++
gdm.install | 7
4 files changed, 178 insertions(+)
Copied:
gdm/repos/testing-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
(from rev 458470,
gdm/trunk/0001-Xsession-Don-t-start-ssh-agent-by-default.patch)
===================================================================
--- testing-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
(rev 0)
+++ testing-x86_64/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
2022-10-20 21:13:12 UTC (rev 458471)
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+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 2e4de4fe384f..29ebc30ea0c5 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -207,14 +207,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
Copied:
gdm/repos/testing-x86_64/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
(from rev 458470,
gdm/trunk/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch)
===================================================================
--- testing-x86_64/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
(rev 0)
+++ testing-x86_64/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
2022-10-20 21:13:12 UTC (rev 458471)
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Thu, 20 Oct 2022 20:03:36 +0000
+Subject: [PATCH] pam-arch: Remove user_readenv=1 from pam_env
+
+The insecure `user_readenv` setting has been deprecated with pam 1.5.0
+and will be removed in a future release.
+---
+ 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 20d1810a68f5..3c4ad407df89 100644
+--- a/data/pam-arch/gdm-launch-environment.pam
++++ b/data/pam-arch/gdm-launch-environment.pam
+@@ -14,4 +14,4 @@ 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
++session required pam_env.so
Copied: gdm/repos/testing-x86_64/PKGBUILD (from rev 458470, gdm/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2022-10-20 21:13:12 UTC (rev 458471)
@@ -0,0 +1,122 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Jan de Groot <[email protected]>
+
+pkgbase=gdm
+pkgname=(gdm libgdm)
+pkgver=43.0
+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
+ libxdmcp systemd libcanberra)
+makedepends=(yelp-tools gobject-introspection git docbook-xsl meson)
+checkdepends=(check)
+options=(debug)
+_commit=afa6f2ef3d34048cd7a3e1a1ec478be2ff464806 # tags/43.0^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-Remove-user_readenv-1-from-pam_env.patch)
+sha256sums=('SKIP'
+ '39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8'
+ '7e42077a89a6fcf8b02244b01127af7000a10ed55e09e385eb6fac5aef421c07')
+
+pkgver() {
+ cd gdm
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gdm
+
+ # Don't start ssh-agent by default
+ git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
+
+ # https://bugs.archlinux.org/task/68945
+ git apply -3 ../0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
+}
+
+build() {
+ local meson_options=(
+ -D dbus-sys="/usr/share/dbus-1/system.d"
+ -D default-pam-config=arch
+ -D default-path="/usr/local/bin:/usr/local/sbin:/usr/bin"
+ -D gdm-xsession=true
+ -D ipv6=true
+ -D plymouth=disabled
+ -D run-dir=/run/gdm
+ -D selinux=disabled
+ )
+
+ arch-meson gdm build "${meson_options[@]}"
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+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
+
+ meson install -C build --destdir "$pkgdir"
+
+ cd "$pkgdir"
+
+ install -d -o 0 -g 0 -m 0755 var
+ install -d -o 0 -g 0 -m 0755 var/lib
+ install -d -o 120 -g 120 -m 1770 var/lib/gdm
+ install -d -o 120 -g 120 -m 0700 var/lib/gdm/.config
+ install -d -o 120 -g 120 -m 0700 var/lib/gdm/.config/pulse
+ install -d -o 120 -g 120 -m 0700 var/lib/gdm/.local
+ install -d -o 120 -g 120 -m 0755 var/lib/gdm/.local/share
+ install -d -o 120 -g 120 -m 0755 var/lib/gdm/.local/share/applications
+
+ # https://src.fedoraproject.org/rpms/gdm/blob/master/f/default.pa-for-gdm
+ install -o120 -g120 -m644 /dev/stdin var/lib/gdm/.config/pulse/default.pa
<<END
+load-module module-device-restore
+load-module module-card-restore
+load-module module-udev-detect
+load-module module-native-protocol-unix
+load-module module-default-device-restore
+load-module module-always-sink
+load-module module-intended-roles
+load-module module-suspend-on-idle
+load-module module-systemd-login
+load-module module-position-event-sounds
+END
+
+ install -Dm644 /dev/stdin usr/lib/sysusers.d/gdm.conf <<END
+g gdm 120 -
+u gdm 120 "Gnome Display Manager" /var/lib/gdm
+END
+
+ _pick libgdm usr/include
+ _pick libgdm usr/lib/{girepository-1.0,libgdm*,pkgconfig}
+ _pick libgdm usr/share/{gir-1.0,glib-2.0}
+}
+
+package_libgdm() {
+ pkgdesc+=" - support library"
+ depends=(libsystemd.so libg{lib,object,io}-2.0.so)
+ provides=(libgdm.so)
+
+ mv libgdm/* "$pkgdir"
+}
Copied: gdm/repos/testing-x86_64/gdm.install (from rev 458470,
gdm/trunk/gdm.install)
===================================================================
--- testing-x86_64/gdm.install (rev 0)
+++ testing-x86_64/gdm.install 2022-10-20 21:13:12 UTC (rev 458471)
@@ -0,0 +1,7 @@
+post_upgrade() {
+ if (( $(vercmp $2 3.34.0-2) < 0 )); then
+ usermod --expiredate= gdm >/dev/null
+ fi
+}
+
+# vim:set ft=sh sw=2 et:
