Update to 43.0

4 files changed, 35 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d14c9e62572f..8250684224d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gdm-prime
 	pkgdesc = Display manager and login screen - patched with Prime support for Optimus laptops
-	pkgver = 42.0+r11+g4a52f026
+	pkgver = 43.0
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GDM
 	arch = x86_64
@@ -21,11 +21,13 @@ pkgbase = gdm-prime
 	depends = systemd
 	depends = libcanberra
 	options = debug
-	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=4a52f026dc0b218a2ca33fa32853c71a0f88a2b4
+	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=afa6f2ef3d34048cd7a3e1a1ec478be2ff464806
 	source = 0001-Xsession-Don-t-start-ssh-agent-by-default.patch
-	source = 0002-nvidia-prime.patch
+	source = 0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
+	source = 0003-nvidia-prime.patch
 	sha256sums = SKIP
 	sha256sums = 39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8
+	sha256sums = 7e42077a89a6fcf8b02244b01127af7000a10ed55e09e385eb6fac5aef421c07
 	sha256sums = a1fb80c69454492390e4b7edac0efe55b2178c7031051d3eab99ed8c14d3e0e4
 
 pkgname = gdm-prime
diff --git a/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch b/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
new file mode 100644
index 000000000000..fcc39cf93f19
--- /dev/null
+++ b/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
@@ -0,0 +1,21 @@
+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
diff --git a/0002-nvidia-prime.patch b/0003-nvidia-prime.patch
index b4b804864ae0..b4b804864ae0 100644
--- a/0002-nvidia-prime.patch
+++ b/0003-nvidia-prime.patch
diff --git a/PKGBUILD b/PKGBUILD
index 7484d401c8bf..2cad7902423e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase=gdm-prime
 pkgname=(gdm-prime libgdm-prime)
-pkgver=42.0+r11+g4a52f026
+pkgver=43.0
 pkgrel=1
 pkgdesc="Display manager and login screen - patched with Prime support for Optimus laptops"
 url="https://wiki.gnome.org/Projects/GDM"
@@ -15,12 +15,14 @@ depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost
 makedepends=(yelp-tools gobject-introspection git docbook-xsl meson)
 checkdepends=(check)
 options=(debug)
-_commit=4a52f026dc0b218a2ca33fa32853c71a0f88a2b4  # main
+_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-nvidia-prime.patch)
+        0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
+        0003-nvidia-prime.patch)
 sha256sums=('SKIP'
             '39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8'
+            '7e42077a89a6fcf8b02244b01127af7000a10ed55e09e385eb6fac5aef421c07'
             'a1fb80c69454492390e4b7edac0efe55b2178c7031051d3eab99ed8c14d3e0e4')
 
 pkgver() {
@@ -34,7 +36,10 @@ prepare() {
   # Don't start ssh-agent by default
   git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
 
-  git apply -3 ../0002-nvidia-prime.patch
+  # https://bugs.archlinux.org/task/68945
+  git apply -3 ../0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
+
+  git apply -3 ../0003-nvidia-prime.patch
 }
 
 build() {