community/gdm: upgrade to 3.37.90

3 files changed, 36 insertions, 46 deletions

diff --git a/community/gdm/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch b/community/gdm/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
index f200d043dee..a5b7bfbadf2 100644
--- a/community/gdm/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+++ b/community/gdm/0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
@@ -90,15 +90,17 @@ diff --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch
 index d59c9cb9..2ff5ae56 100644
 --- a/data/pam-arch/gdm-launch-environment.pam
 +++ b/data/pam-arch/gdm-launch-environment.pam
-@@ -1,10 +1,16 @@
+@@ -1,13 +1,16 @@
 -auth     required  pam_env.so
+-auth     required  pam_succeed_if.so audit quiet_success user = gdm
 -auth     optional  pam_permit.so
 +#%PAM-1.0
 +auth       required                    pam_succeed_if.so    quiet_success user = gdm
 +auth       optional                    pam_permit.so
 +auth       required                    pam_env.so
  
--account  include   system-local-login
+-account  required  pam_succeed_if.so audit quiet_success user = gdm
+-account  optional  pam_permit.so
 +account    required                    pam_succeed_if.so    quiet_success user = gdm
 +account    optional                    pam_permit.so
  
@@ -106,6 +108,7 @@ index d59c9cb9..2ff5ae56 100644
 +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
 +session    optional                    pam_loginuid.so
@@ -139,25 +142,6 @@ index 8d34794e..137242a6 100644
 +
 +session    include                     system-local-login
 +session    optional                    pam_gnome_keyring.so auto_start
-diff --git a/data/pam-arch/gdm-pin.pam b/data/pam-arch/gdm-pin.pam
-deleted file mode 100644
-index 135e205e..00000000
---- a/data/pam-arch/gdm-pin.pam
-+++ /dev/null
-@@ -1,13 +0,0 @@
--auth     requisite pam_pin.so
--auth     include   system-local-login
--auth     optional  pam_gnome_keyring.so
--
--account  include   system-local-login
--
--password include   system-local-login
--password optional  pam_pin.so
--password optional  pam_gnome_keyring.so use_authtok
--
--session  optional  pam_keyinit.so force revoke
--session  include   system-local-login
--session  optional  pam_gnome_keyring.so auto_start
 diff --git a/data/pam-arch/gdm-smartcard.pam b/data/pam-arch/gdm-smartcard.pam
 index ec6f75d5..e6ec1299 100644
 --- a/data/pam-arch/gdm-smartcard.pam
diff --git a/community/gdm/APKBUILD b/community/gdm/APKBUILD
index ba8111d9d1b..57f1d16b46e 100644
--- a/community/gdm/APKBUILD
+++ b/community/gdm/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gdm
-pkgver=3.36.3
-pkgrel=1
+pkgver=3.37.90
+pkgrel=0
 pkgdesc="GNOME display manager"
 url="https://wiki.gnome.org/Projects/GDM"
 arch="all !armhf !s390x !ppc64le !mips !mips64"
@@ -10,46 +10,41 @@ license="GPL-2.0-or-later"
 depends="dconf linux-pam>=1.4 gnome-settings-daemon gnome-shell xorg-server
 	xorg-server-xwayland xrdb gsettings-desktop-schemas gnome-session"
 makedepends="dconf-dev gnome-desktop-dev accountsservice-dev libcanberra-dev linux-pam-dev
-	intltool itstool libxml2-utils libsm-dev iso-codes nss-dev upower-dev elogind-dev"
+	intltool itstool libxml2-utils libsm-dev iso-codes nss-dev upower-dev elogind-dev
+	meson"
 subpackages="$pkgname-dev $pkgname-lang $pkgname-openrc"
 options="!check" # Causes circular dep with gnome-shell
 source="https://download.gnome.org/sources/gdm/${pkgver%.*}/gdm-$pkgver.tar.xz
 	0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+	remove-systemd-dep.patch
 	gdm.initd
 	Xsession"
 install="gdm.pre-install"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--disable-static \
-		--without-plymouth \
-		--with-initial-vt=1 \
-		--enable-wayland-support \
-		--without-tcp-wrappers \
-		--with-pid-file=/var/run/gdm.pid \
-		--enable-authentication-scheme=pam \
-		--with-default-pam-config=arch \
-		--with-log-dir=/var/log/gdm \
-		--with-pam-mod-dir=/lib/security
-	make
+	abuild-meson \
+		-Ddefault-pam-config=arch \
+		-Dpam-mod-dir=/lib/security \
+		-Dselinux=disabled \
+		-Dlibaudit=disabled \
+		-Dsystemdsystemunitdir=/DELETEME \
+		-Dsystemduserunitdir=/DELETEME \
+		. output
+	ninja -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" ninja -C output install
+
+	rm -rf "$pkgdir"/DELETEME
 
 	sed -i "s/pam_systemd\.so/pam_elogind.so/" "$pkgdir"/etc/pam.d/*
 
 	install -m755 -D "$srcdir/Xsession" "$pkgdir"/etc/gdm
 	install -m755 -D "$srcdir/$pkgname.initd" "$pkgdir"/etc/init.d/gdm
 }
-
-sha512sums="21c3bba0ce5142362e3c86ccb05fc234d9356db295ed63f3c383bd7cc2b7a464bdcec08e472d31a339b5ffbfeaed4db72ebbdeae2e7a71effdeef8c52b53830b  gdm-3.36.3.tar.xz
-24635526dcec45b8665a476ef0a009af6127c220ffb9868b3a1c4fbcf319e6d1a77a60ef19a455510f59aedac202e58fc3eda3b93541e03491c195889c3f1d82  0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+sha512sums="c0ca18ab9842ea2f2a6e876a25bc305bf0100dc259d22a27424a0bb5496a05113746369fc224bf514e0ae69352e231757c810c12c723546518a165ce4d31591b  gdm-3.37.90.tar.xz
+84eaadf000984d547426e853ce2dc380314c707d8aae926fb127f68b6c6af886b0aec05db9ae21a394f94beb81924b00424f082a606d97bde5edfced840fe4fa  0004-pam-arch-Update-to-match-pambase-20200721.1-2.patch
+a48ef7505034e0e0fbadf9bb980ae95c4a0562c29f67d1c5007f7371f707aad27621330dadf1922bbcd4aa6c6c3536e2f27abdf0e99055a446197bb10910e5ef  remove-systemd-dep.patch
 cd4c8f80e37dc362727bd535cbe1d3917f2bc47d52af717595e19709051ab5f27c0f650195152ccd1a7e5e2f886e4e8bc60287f05dcd81e84237c7f78c89223f  gdm.initd
 f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82  Xsession"
diff --git a/community/gdm/remove-systemd-dep.patch b/community/gdm/remove-systemd-dep.patch
new file mode 100644
index 00000000000..c6b5d257a17
--- /dev/null
+++ b/community/gdm/remove-systemd-dep.patch
@@ -0,0 +1,11 @@
+The systemd dep is only required for determining the systemd{user,system}unitddir
+--- a/meson.build.orig	2020-08-31 12:07:34.734015573 +0200
++++ b/meson.build	2020-08-31 12:07:42.170625714 +0200
+@@ -93,7 +93,6 @@
+   libwrap_dep = cc.find_library('libwrap')
+ endif
+ # systemd
+-systemd_dep = dependency('systemd')
+ libsystemd_dep = dependency('libsystemd')
+ journald_dep = dependency('journald', required: get_option('systemd-journal'))
+ systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)