44.0-1

0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch

-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-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

PKGBUILD

@@ -2,24 +2,43 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gdm
-pkgname=(gdm libgdm)
-pkgver=43.0
+pkgname=(
+  gdm
+  libgdm
+)
+pkgver=44.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)
+depends=(
+  gnome-session
+  gnome-shell
+  libcanberra
+  libxdmcp
+  systemd
+  upower
+  xorg-server
+  xorg-xhost
+  xorg-xrdb
+)
+makedepends=(
+  docbook-xsl
+  git
+  gobject-introspection
+  meson
+  plymouth
+  yelp-tools
+)
 checkdepends=(check)
-_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')
+_commit=6f137e9b59a0bb4b5a47d4af723c64bce053ea1d  # tags/44.0^0
+source=(
+  "git+https://gitlab.gnome.org/GNOME/gdm.git#commit=$_commit"
+  0001-Xsession-Don-t-start-ssh-agent-by-default.patch
+)
+b2sums=('SKIP'
+        'f7e868fdd7cc121433de1572583eb728f4d186cd4f52c6d6c8f2ccf4a3cf781144ff71f704f13571ddb97a1ff4ec55cfa3df25d38737ad19da21e84ddc2d3ee4')
 
 pkgver() {
   cd gdm
@@ -29,11 +48,11 @@ pkgver() {
 prepare() {
   cd gdm
 
+  # https://gitlab.gnome.org/GNOME/gdm/-/issues/730
+  git cherry-pick -n b29510dbc51ccf71a7c0ed656d21634a83766c0c
+
   # 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() {
@@ -43,7 +62,6 @@ build() {
     -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
   )