update to 3.38.0

6 files changed, 69 insertions, 115 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c633c38cb9ee..60ae11ecad5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gdm-plymouth
 	pkgdesc = Display manager and login screen with plymouth support
-	pkgver = 3.36.3
-	pkgrel = 3
+	pkgver = 3.38.0
+	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GDM
 	arch = x86_64
 	license = GPL
@@ -10,23 +10,24 @@ pkgbase = gdm-plymouth
 	makedepends = gobject-introspection
 	makedepends = git
 	makedepends = docbook-xsl
+	makedepends = meson
 	depends = plymouth
 	depends = gnome-shell
 	depends = gnome-session
 	depends = upower
+	depends = systemd
 	depends = xorg-xrdb
 	depends = xorg-server
 	depends = xorg-xhost
-	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=24a4c0afe337a7a381397c87a39e3a666c0ae6cc
+	depends = libxdmcp
+	source = git+https://gitlab.gnome.org/GNOME/gdm.git#commit=6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770
 	source = 0001-Xsession-Don-t-start-ssh-agent-by-default.patch
-	source = 0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch
-	source = 0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
-	source = 0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+	source = 0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+	source = default.pa
 	sha256sums = SKIP
 	sha256sums = 5a32db412fc5256e16691e8f2db0b460bafbbb2be8eb9b9bcc71b5cd49688f9e
-	sha256sums = e879a982467a62c4c1557067dbdef6b56a774273df1368a60c4b036015111cdd
-	sha256sums = 4648e7b920ccb14d8a87634c3c98d51ff13163ae2fc9fc4a3c2e9ec876515469
-	sha256sums = ba98385cf1de00560f77d75a241b1895567c6b8d4babf230d10ae7fd19739fda
+	sha256sums = 723bf4462ea4eed4193a891e95137687abfeefe6a170ec5822921bffdfc1f412
+	sha256sums = a18ea3a17bf1c52011cb15f500973946625586786ad8f7c7eec1808f80ffd939
 
 pkgname = gdm-plymouth
 	install = gdm.install
@@ -35,9 +36,11 @@ pkgname = gdm-plymouth
 	depends = gnome-shell
 	depends = gnome-session
 	depends = upower
+	depends = systemd
 	depends = xorg-xrdb
 	depends = xorg-server
 	depends = xorg-xhost
+	depends = libxdmcp
 	depends = libgdm-plymouth
 	optdepends = fprintd: fingerprint authentication
 	provides = gdm
diff --git a/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch b/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch
deleted file mode 100644
index 0d9814e740f8..000000000000
--- a/0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 10 Sep 2019 20:37:08 +0000
-Subject: [PATCH] pam-arch: Don't check greeter account for expiry
-
-systemd-sysusers now creates expired accounts, which broke the greeter
-on new installations.
-
-Doesn't actually fully fix the problem as the user@.service still fails
-to launch.
----
- 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 618a7d3a..89521472 100644
---- a/data/pam-arch/gdm-launch-environment.pam
-+++ b/data/pam-arch/gdm-launch-environment.pam
-@@ -1,7 +1,7 @@
- auth     required  pam_env.so
- auth     optional  pam_permit.so
- 
--account  include   system-local-login
-+account  optional  pam_permit.so
- 
- password required  pam_deny.so
- 
-
diff --git a/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch b/0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch
index d7601f2f07dc..b6f7e6fbd9ad 100644
--- a/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+++ b/0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch
@@ -5,15 +5,28 @@ Subject: [PATCH] pam-arch: Update to match pambase 20200721.1-2
 
 https://bugs.archlinux.org/task/67485
 ---
+ data/meson.build                         |  1 -
  data/pam-arch/gdm-autologin.pam          | 22 +++++++++--------
  data/pam-arch/gdm-fingerprint.pam        | 31 +++++++++++++++---------
  data/pam-arch/gdm-launch-environment.pam | 24 ++++++++++--------
  data/pam-arch/gdm-password.pam           | 17 +++++++------
  data/pam-arch/gdm-pin.pam                | 13 ----------
  data/pam-arch/gdm-smartcard.pam          | 31 +++++++++++++++---------
- 6 files changed, 75 insertions(+), 63 deletions(-)
+ 7 files changed, 75 insertions(+), 64 deletions(-)
  delete mode 100644 data/pam-arch/gdm-pin.pam
 
+diff --git a/data/meson.build b/data/meson.build
+index 05a20117..5d9e2847 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -135,7 +135,6 @@ pam_data_files_map = {
+     'gdm-fingerprint',
+     'gdm-smartcard',
+     'gdm-password',
+-    'gdm-pin',
+   ],
+   'none': [],
+   # We should no longer have 'autodetect' at this point
 diff --git a/data/pam-arch/gdm-autologin.pam b/data/pam-arch/gdm-autologin.pam
 index 99b14209..30bdf529 100644
 --- a/data/pam-arch/gdm-autologin.pam
@@ -198,4 +211,3 @@ index ec6f75d5..e6ec1299 100644
 +
 +session    include                     system-local-login
 +session    optional                    pam_gnome_keyring.so auto_start
-
diff --git a/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch b/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
deleted file mode 100644
index e87b1ffc0e43..000000000000
--- a/0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 10 Sep 2019 20:41:10 +0000
-Subject: [PATCH] pam-arch: Restrict greeter service to the gdm user
-
-Copied from pam-exherbo.
----
- data/pam-arch/gdm-launch-environment.pam | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam
-index 89521472..d59c9cb9 100644
---- a/data/pam-arch/gdm-launch-environment.pam
-+++ b/data/pam-arch/gdm-launch-environment.pam
-@@ -1,10 +1,13 @@
- auth     required  pam_env.so
-+auth     required  pam_succeed_if.so audit quiet_success user = gdm
- auth     optional  pam_permit.so
- 
-+account  required  pam_succeed_if.so audit quiet_success user = gdm
- account  optional  pam_permit.so
- 
- password required  pam_deny.so
- 
- session  optional  pam_keyinit.so force revoke
-+session  required  pam_succeed_if.so audit quiet_success user = gdm
- session  required  pam_systemd.so
- session  optional  pam_permit.so
-
diff --git a/PKGBUILD b/PKGBUILD
index 99036a836d60..43c927231cf0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,72 +7,52 @@
 _pkgbase=gdm
 pkgbase=gdm-plymouth
 pkgname=(gdm-plymouth libgdm-plymouth)
-pkgver=3.36.3
-pkgrel=3
+pkgver=3.38.0
+pkgrel=1
 pkgdesc="Display manager and login screen with plymouth support"
 url="https://wiki.gnome.org/Projects/GDM"
 arch=(x86_64)
 license=(GPL)
-depends=(plymouth gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost)
-makedepends=(yelp-tools gobject-introspection git docbook-xsl)
+depends=(plymouth gnome-shell gnome-session upower systemd xorg-xrdb xorg-server xorg-xhost libxdmcp)
+makedepends=(yelp-tools gobject-introspection git docbook-xsl meson)
 checkdepends=(check)
-_commit=24a4c0afe337a7a381397c87a39e3a666c0ae6cc  # tags/3.36.3^0
+_commit=6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770  # tags/3.38.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-Don-t-check-greeter-account-for-expiry.patch
-        0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
-        0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch)
+        0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+        default.pa)
 sha256sums=('SKIP'
             '5a32db412fc5256e16691e8f2db0b460bafbbb2be8eb9b9bcc71b5cd49688f9e'
-            'e879a982467a62c4c1557067dbdef6b56a774273df1368a60c4b036015111cdd'
-            '4648e7b920ccb14d8a87634c3c98d51ff13163ae2fc9fc4a3c2e9ec876515469'
-            'ba98385cf1de00560f77d75a241b1895567c6b8d4babf230d10ae7fd19739fda')
+            '723bf4462ea4eed4193a891e95137687abfeefe6a170ec5822921bffdfc1f412'
+            'a18ea3a17bf1c52011cb15f500973946625586786ad8f7c7eec1808f80ffd939')
 
 pkgver() {
-  cd gdm
+  cd $_pkgbase
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  mkdir -p build
-  cd gdm
-  patch -Np1 -i ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
-
-  # https://bugs.archlinux.org/task/63706
-  patch -Np1 -i ../0002-pam-arch-Don-t-check-greeter-account-for-expiry.patch
-  patch -Np1 -i ../0003-pam-arch-Restrict-greeter-service-to-the-gdm-user.patch
+  cd $_pkgbase
+  git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch
 
   # https://bugs.archlinux.org/task/67485
-  patch -Np1 -i ../0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
-
-  NOCONFIGURE=1 ./autogen.sh
+  git apply -3 ../0002-pam-arch-Update-to-match-pambase-20200721.1-2.patch
 }
 
 build() {
-  cd build
-  ../gdm/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib \
-    with_dbus_sys=/usr/share/dbus-1/system.d \
-    --disable-schemas-compile \
-    --disable-static \
-    --enable-gdm-xsession \
-    --enable-ipv6 \
-    --with-default-pam-config=arch \
-    --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
-    --with-plymouth \
-    --without-tcp-wrappers
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
+  arch-meson gdm build \
+    -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 run-dir=/run/gdm \
+    -D selinux=disabled
+  meson compile -C build
 }
 
 check() {
-  make -C build check
+    meson test -C build --print-errorlogs
 }
 
 package_gdm-plymouth() {
@@ -86,12 +66,18 @@ package_gdm-plymouth() {
   groups=(gnome)
   install=gdm.install
 
-  DESTDIR="$pkgdir" make -C build install
+  DESTDIR="$pkgdir" meson install -C build
 
-  chown -Rc 120:120 "$pkgdir/var/lib/gdm"
+  install -d "$pkgdir/var/lib"
+  install -d "$pkgdir/var/lib/gdm"                           -o120 -g120 -m1770
+  install -d "$pkgdir/var/lib/gdm/.config"                   -o120 -g120 -m700
+  install -d "$pkgdir/var/lib/gdm/.config/pulse"             -o120 -g120
+  install -d "$pkgdir/var/lib/gdm/.local"                    -o120 -g120 -m700
+  install -d "$pkgdir/var/lib/gdm/.local/share"              -o120 -g120
+  install -d "$pkgdir/var/lib/gdm/.local/share/applications" -o120 -g120
 
-  # Unused or created at start
-  rm -r "$pkgdir"/var/{cache,log,run}
+  # https://src.fedoraproject.org/rpms/gdm/blob/master/f/default.pa-for-gdm
+  install -Dt "$pkgdir/var/lib/gdm/.config/pulse" -o120 -g120 -m644 default.pa
 
   install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/gdm.conf" <<END
 g gdm 120 -
diff --git a/default.pa b/default.pa
new file mode 100644
index 000000000000..d633aee9109a
--- /dev/null
+++ b/default.pa
@@ -0,0 +1,10 @@
+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-rescue-streams
+load-module module-always-sink
+load-module module-intended-roles
+load-module module-suspend-on-idle
+load-module module-position-event-sounds