Update to 40.0

4 files changed, 26 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index daa3fc1624b4..cecad4495e38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,6 @@
 pkgbase = gdm-prime
-	pkgver = 3.38.2
+	pkgdesc = Display manager and login screen
+	pkgver = 40.0
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GDM
 	arch = x86_64
@@ -18,14 +19,14 @@ pkgbase = gdm-prime
 	depends = xorg-xhost
 	depends = libxdmcp
 	depends = systemd
-	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=840d027559760b1cd48aa0175ffe8a15e66a9234
-	source = 0001-Xsession-Don-t-start-ssh-agent-by-default.patch
-	source = 0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=3246bf1af8589899621649df523e6840e4858cda
+	source = 0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+	source = 0002-Xsession-Don-t-start-ssh-agent-by-default.patch
 	source = 0003-nvidia-prime.patch
 	source = default.pa
 	sha256sums = SKIP
-	sha256sums = b9ead66d2b6207335f0bd982a835647536998e7c7c6b5248838e5d53132ca21a
-	sha256sums = d5cd6a401db2aa19374d477817420a39759044393bd420414fdc41881fd93597
+	sha256sums = f32555703d4f3b6babbe49ddd2c82295238623050b63826c95a959d5caec37f8
+	sha256sums = aa751223e8664f65fe2cae032dc93bb94338a41cfca4c6b66a0fca0c788c4313
 	sha256sums = a1fb80c69454492390e4b7edac0efe55b2178c7031051d3eab99ed8c14d3e0e4
 	sha256sums = e88410bcec9e2c7a22a319be0b771d1f8d536863a7fc618b6352a09d61327dcb
 
@@ -62,4 +63,3 @@ pkgname = libgdm-prime
 	depends = dconf
 	provides = libgdm
 	conflicts = libgdm
-
diff --git a/0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch b/0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch
index 19d0b23cedd3..9f4cce14fc54 100644
--- a/0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+++ b/0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch
@@ -3,6 +3,9 @@ From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
 Date: Tue, 27 Oct 2020 18:59:14 +0000
 Subject: [PATCH] pam-arch: Update to match pambase 20200721.1-2
 
+Update the PAM files for Arch Linux. This has been applied downstream
+since Aug 2020.
+
 https://bugs.archlinux.org/task/67485
 ---
  data/meson.build                         |  1 -
@@ -16,10 +19,10 @@ https://bugs.archlinux.org/task/67485
  delete mode 100644 data/pam-arch/gdm-pin.pam
 
 diff --git a/data/meson.build b/data/meson.build
-index 05a20117..5d9e2847 100644
+index 23e2d7f9..7c5222ea 100644
 --- a/data/meson.build
 +++ b/data/meson.build
-@@ -135,7 +135,6 @@ pam_data_files_map = {
+@@ -134,7 +134,6 @@ pam_data_files_map = {
      'gdm-fingerprint',
      'gdm-smartcard',
      'gdm-password',
diff --git a/0001-Xsession-Don-t-start-ssh-agent-by-default.patch b/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
index 6eaa16349312..568eb2c56828 100644
--- a/0001-Xsession-Don-t-start-ssh-agent-by-default.patch
+++ b/0002-Xsession-Don-t-start-ssh-agent-by-default.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Xsession: Don't start ssh-agent by default
  1 file changed, 8 deletions(-)
 
 diff --git a/data/Xsession.in b/data/Xsession.in
-index 9d79558c..ff6d9de0 100755
+index 2e4de4fe..29ebc30e 100755
 --- a/data/Xsession.in
 +++ b/data/Xsession.in
-@@ -175,14 +175,6 @@ if [ "x$command" = "xdefault" ] ; then
+@@ -207,14 +207,6 @@ if [ "x$command" = "xdefault" ] ; then
    fi
  fi
  
diff --git a/PKGBUILD b/PKGBUILD
index 4f311e28feee..8bef453ca0b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,9 @@
 
 pkgbase=gdm-prime
 pkgname=(gdm-prime libgdm-prime)
-pkgver=3.38.2
+pkgver=40.0
 pkgrel=1
+pkgdesc="Display manager and login screen"
 url="https://wiki.gnome.org/Projects/GDM"
 arch=(x86_64)
 license=(GPL)
@@ -13,29 +14,31 @@ depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost
          libxdmcp systemd)
 makedepends=(yelp-tools gobject-introspection git docbook-xsl meson)
 checkdepends=(check)
-_commit=840d027559760b1cd48aa0175ffe8a15e66a9234  # tags/3.38.2^0
+_commit=3246bf1af8589899621649df523e6840e4858cda  # tags/40.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-Update-to-match-pambase-20200721.1-2.patch
+        0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+        0002-Xsession-Don-t-start-ssh-agent-by-default.patch
         0003-nvidia-prime.patch
         default.pa)
 sha256sums=('SKIP'
-            'b9ead66d2b6207335f0bd982a835647536998e7c7c6b5248838e5d53132ca21a'
-            'd5cd6a401db2aa19374d477817420a39759044393bd420414fdc41881fd93597'
+            'f32555703d4f3b6babbe49ddd2c82295238623050b63826c95a959d5caec37f8'
+            'aa751223e8664f65fe2cae032dc93bb94338a41cfca4c6b66a0fca0c788c4313'
             'a1fb80c69454492390e4b7edac0efe55b2178c7031051d3eab99ed8c14d3e0e4'
             'e88410bcec9e2c7a22a319be0b771d1f8d536863a7fc618b6352a09d61327dcb')
 
 pkgver() {
   cd gdm
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/\.rc/rc/;s/-/+/g'
 }
 
 prepare() {
   cd gdm
-  git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
 
   # https://bugs.archlinux.org/task/67485
-  git apply -3 ../0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+  git apply -3 ../0001-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+
+  # Don't start ssh-agent by default
+  git apply -3 ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
 
   git apply -3 ../0003-nvidia-prime.patch
 }