UPD to 3.26.1

4 files changed, 27 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72a91208495a..29f5ec5a451f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Aug 16 07:18:23 UTC 2017
+# Sat Oct  7 08:19:19 UTC 2017
 pkgbase = gdm-plymouth
 	pkgdesc = Gnome Display Manager with Plymouth support.
-	pkgver = 3.24.2
+	pkgver = 3.26.1
 	pkgrel = 1
 	url = http://www.gnome.org
 	arch = i686
@@ -20,10 +20,12 @@ pkgbase = gdm-plymouth
 	depends = xorg-server
 	depends = xorg-server-xwayland
 	depends = xorg-xhost
-	source = https://git.gnome.org/browse/gdm/snapshot/gdm-3.24.2.tar.xz
+	source = https://git.gnome.org/browse/gdm/snapshot/gdm-3.26.1.tar.xz
 	source = 0002-Xsession-Don-t-start-ssh-agent-by-default.patch
-	sha256sums = 75c2f3c20ebf42484cd10889df123a9c27d3c4b138b9cc8496952e36bf40e440
+	source = gdm.sysusers
+	sha256sums = 7eaa3b4bfea6cd7461719114b374a269618c2a92441a1b2289ba58449a3c6a72
 	sha256sums = 63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca
+	sha256sums = d665e8f82ea2f6b03147223c04ca53ddb02eb3f550e3cf54dc96a44e50fb811d
 
 pkgname = gdm-plymouth
 	install = gdm-plymouth.install
@@ -54,6 +56,7 @@ pkgname = libgdm-plymouth
 	pkgdesc = GDM support library including Plymouth support
 	depends = systemd
 	depends = glib2
+	depends = dconf
 	provides = libgdm
 	conflicts = libgdm
 
diff --git a/PKGBUILD b/PKGBUILD
index e68d56e8bf19..ae67325b24c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgbase=gdm
 pkgbase=gdm-plymouth
 pkgname=(gdm-plymouth libgdm-plymouth)
-pkgver=3.24.2
+pkgver=3.26.1
 pkgrel=1
 pkgdesc="Gnome Display Manager with Plymouth support."
 arch=(i686 x86_64)
@@ -16,9 +16,11 @@ depends=('plymouth' 'gnome-shell>=3.24.1' 'gnome-session' 'upower' 'xorg-xrdb' '
 makedepends=('intltool' 'yelp-tools' 'gobject-introspection')
 checkdepends=('check')
 source=("https://git.gnome.org/browse/gdm/snapshot/${_pkgbase}-${pkgver}.tar.xz"
-	"0002-Xsession-Don-t-start-ssh-agent-by-default.patch")
-sha256sums=('75c2f3c20ebf42484cd10889df123a9c27d3c4b138b9cc8496952e36bf40e440'
-            '63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca')
+	"0002-Xsession-Don-t-start-ssh-agent-by-default.patch"
+	"gdm.sysusers")
+sha256sums=('7eaa3b4bfea6cd7461719114b374a269618c2a92441a1b2289ba58449a3c6a72'
+            '63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca'
+            'd665e8f82ea2f6b03147223c04ca53ddb02eb3f550e3cf54dc96a44e50fb811d')
 
 prepare() {
   cd $_pkgbase-${pkgver}
@@ -43,9 +45,10 @@ build() {
     --with-plymouth \
     --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
     --with-check-accelerated-directory=/usr/lib/gnome-session \
+    --with-default-pam-config=arch \
+    --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
     --with-gnome-settings-daemon-directory=/usr/lib/gnome-settings-daemon \
-    --without-tcp-wrappers \
-    --with-default-pam-config=arch
+    --without-tcp-wrappers
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
@@ -71,16 +74,21 @@ package_gdm-plymouth() {
   cd $_pkgbase-${pkgver}
   make DESTDIR="$pkgdir" install
 
-  rm -r "$pkgdir/var/run"
+  chown -R 120:120 "$pkgdir/var/lib/gdm"
 
-### Split libgdm
+  # Unused or created at start
+  rm -r "$pkgdir"/var/{cache,log,run}
+
+  install -Dm644 ../gdm.sysusers "$pkgdir/usr/lib/sysusers.d/gdm.conf"
+
+  ### Split libgdm
   make -C libgdm DESTDIR="$pkgdir" uninstall
   mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir"
 }
 
 package_libgdm-plymouth() {
   pkgdesc="GDM support library including Plymouth support"
-  depends=(systemd glib2)
+  depends=(systemd glib2 dconf)
   provides=("libgdm")
   conflicts=("libgdm")
 
diff --git a/gdm-plymouth.install b/gdm-plymouth.install
index 9a18e81cf3fd..0f25f1f32a18 100644
--- a/gdm-plymouth.install
+++ b/gdm-plymouth.install
@@ -1,15 +1,4 @@
 post_install() {
-  if ! getent passwd gdm >/dev/null; then
-    groupadd -g 120 gdm
-    useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-    passwd -ql gdm > /dev/null
-    chown -R gdm:gdm /var/lib/gdm > /dev/null
-    chown root:gdm /var/log/gdm > /dev/null
-  fi
-}
-
-post_remove() {
-  getent passwd gdm >/dev/null 2>&1 && userdel gdm
-  getent group gdm >/dev/null 2>&1 && groupdel gdm
+  systemd-sysusers gdm.conf
 }
 
diff --git a/gdm.sysusers b/gdm.sysusers
new file mode 100644
index 000000000000..6f2a2790d590
--- /dev/null
+++ b/gdm.sysusers
@@ -0,0 +1,2 @@
+g gdm 120 -
+u gdm 120 "Gnome Display Manager" /var/lib/gdm