Update to 45.0.1

3 files changed, 11 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a44aa100b24..db07ec5f7ce6 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 = 44.1
+	pkgver = 45.0.1
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GDM
 	arch = x86_64
@@ -21,12 +21,12 @@ pkgbase = gdm-prime
 	depends = xorg-server
 	depends = xorg-xhost
 	depends = xorg-xrdb
-	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=b622872c5f24960c18900ebf14b5233b8701a8f9
+	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=ef5620737de697d215f655722617e49f4a9a448e
 	source = 0001-Xsession-Don-t-start-ssh-agent-by-default.patch
 	source = 0002-nvidia-prime.patch
-	sha256sums = SKIP
-	sha256sums = 39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8
-	sha256sums = a1fb80c69454492390e4b7edac0efe55b2178c7031051d3eab99ed8c14d3e0e4
+	md5sums = SKIP
+	md5sums = 48c7fb3c79183ae55b4dcb25cf75204e
+	md5sums = 7776ab2a539af7ce44cb3ae04669ffa1
 
 pkgname = gdm-prime
 	install = gdm-prime.install
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
deleted file mode 100644
index fcc39cf93f19..000000000000
--- a/0002-pam-arch-Remove-user_readenv-1-from-pam_env.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/PKGBUILD b/PKGBUILD
index 8c4a38285db5..acdbc6c59ce2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Robin Lange <robin.langenc@gmail.com>
+# Contributor: Fabian Bornschein <fabiscafe-at-mailbox-dot-org>
 # Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gdm-prime
 pkgname=(gdm-prime libgdm-prime)
-pkgver=44.1
+pkgver=45.0.1
 pkgrel=1
 pkgdesc="Display manager and login screen - patched with Prime support for Optimus laptops"
 url="https://wiki.gnome.org/Projects/GDM"
@@ -30,15 +31,15 @@ makedepends=(
   yelp-tools
 )
 checkdepends=(check)
-_commit=b622872c5f24960c18900ebf14b5233b8701a8f9  # tags/44.1^0
+_commit=ef5620737de697d215f655722617e49f4a9a448e  # tags/45.0.1^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
 )
-sha256sums=('SKIP'
-            '39a7e1189d423dd428ace9baac77ba0442c6706a861d3c3db9eb3a6643e223f8'
-            'a1fb80c69454492390e4b7edac0efe55b2178c7031051d3eab99ed8c14d3e0e4')
+md5sums=('SKIP'
+         '48c7fb3c79183ae55b4dcb25cf75204e'
+         '7776ab2a539af7ce44cb3ae04669ffa1')
 
 pkgver() {
   cd gdm
@@ -48,9 +49,6 @@ 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