[arch-commits] Commit in filesystem/trunk (5 files)

[Dave Reisner]

    Date: Thursday, June 12, 2014 @ 00:41:38
  Author: dreisner
Revision: 215048

upgpkg: filesystem 2014.06-2

- add systemd-bus-proxy user/group for systemd 214
- add systemd-* users to stock shadow file (FS#40800)
- run pwdconv/grpconv if we touch passwd/group, respecitively (FS#40800)

Modified:
  filesystem/trunk/PKGBUILD
  filesystem/trunk/filesystem.install
  filesystem/trunk/group
  filesystem/trunk/passwd
  filesystem/trunk/shadow

--------------------+
 PKGBUILD           |    8 ++++----
 filesystem.install |   18 ++++++++++++------
 group              |    1 +
 passwd             |    7 ++++---
 shadow             |    4 ++++
 5 files changed, 25 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-11 22:01:17 UTC (rev 215047)
+++ PKGBUILD	2014-06-11 22:41:38 UTC (rev 215048)
@@ -3,7 +3,7 @@
 
 pkgname=filesystem
 pkgver=2014.06
-pkgrel=1
+pkgrel=2
 pkgdesc='Base filesystem'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,14 +19,14 @@
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
         'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'archlinux.7.txt'
         'locale.sh')
-md5sums=('764dca1d786d43fbee33364ccbebfcd3'
+md5sums=('de91c0620e1ce373eda07843d231bae6'
          '7813c481156f6b280a3ba91fc6236368'
          '9e4533df61f0c82d6b2e2371f7376282'
          '4c4540eeb748bf1f71d631b8c1dcf0b3'
          'f28150d4c0b22a017be51b9f7f9977ed'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '18a8a3564f40a28d8f9f6060001c6f9e'
-         '2ef2429c2c98d0883906aa6f5363be80'
+         '5bdc034b401012480c55e853fd017465'
+         '046855d4bd6854add64fb1c4add666d3'
          '693c97f2c9a519bb97a17008e92c2b74'
          '1745349eb24ed21b4cfaa6f423bddb76'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'

Modified: filesystem.install
===================================================================
--- filesystem.install	2014-06-11 22:01:17 UTC (rev 215047)
+++ filesystem.install	2014-06-11 22:41:38 UTC (rev 215048)
@@ -1,14 +1,14 @@
 # args: <group> [options]
 _addgroup() {
-	if ! getent group "$1" >/dev/null; then
-		groupadd "$@" >/dev/null
+	if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then
+		need_group_update=1
 	fi
 }
 
 # args: <group> [options]
 _adduser() {
-	if ! getent passwd "$1" >/dev/null; then
-		useradd "$@" >/dev/null
+	if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then
+		need_passwd_update=1
 	fi
 }
 
@@ -40,12 +40,18 @@
 	_adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin
 	_addgroup systemd-network -g 193
 	_adduser systemd-network -u 193 -g 193 -d / -s /usr/bin/nologin
+	_addgroup systemd-bus-proxy -g 194
+	_adduser systemd-bus-proxy -u 194 -g 194 -d / -s /usr/bin/nologin
 
-	# sync gshadow to group (fixes FS#19869)
-	if ! grep -q '^lock:' etc/gshadow; then
+	# update shadow files if needed
+	if (( need_group_update )); then
 		grpconv >/dev/null
 	fi
 
+	if (( need_passwd_update )); then
+		pwconv >/dev/null
+	fi
+
 	if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
 		echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
 	fi

Modified: group
===================================================================
--- group	2014-06-11 22:01:17 UTC (rev 215047)
+++ group	2014-06-11 22:41:38 UTC (rev 215048)
@@ -36,3 +36,4 @@
 systemd-journal-gateway:x:191:
 systemd-timesync:x:192:
 systemd-network:x:193:
+systemd-bus-proxy:x:194:

Modified: passwd
===================================================================
--- passwd	2014-06-11 22:01:17 UTC (rev 215047)
+++ passwd	2014-06-11 22:41:38 UTC (rev 215048)
@@ -1,12 +1,13 @@
 root:x:0:0:root:/root:/bin/bash
 bin:x:1:1:bin:/bin:/usr/bin/nologin
-daemon:x:2:2:daemon:/sbin:/usr/bin/nologin
+daemon:x:2:2:daemon:/:/usr/bin/nologin
 mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin
 ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin
 http:x:33:33:http:/srv/http:/usr/bin/nologin
-uuidd:x:68:68:uuidd:/:/sbin/nologin
-dbus:x:81:81:dbus:/:/sbin/nologin
+uuidd:x:68:68:uuidd:/:/usr/bin/nologin
+dbus:x:81:81:dbus:/:/usr/bin/nologin
 nobody:x:99:99:nobody:/:/usr/bin/nologin
 systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/usr/bin/nologin
 systemd-timesync:x:192:192:systemd-timesync:/:/usr/bin/nologin
 systemd-network:x:193:193:systemd-network:/:/usr/bin/nologin
+systemd-bus-proxy:x:194:194:systemd-bus-proxy:/:/usr/bin/nologin

Modified: shadow
===================================================================
--- shadow	2014-06-11 22:01:17 UTC (rev 215047)
+++ shadow	2014-06-11 22:41:38 UTC (rev 215048)
@@ -7,3 +7,7 @@
 uuidd:x:14871::::::
 dbus:x:14871::::::
 nobody:x:14871::::::
+systemd-journal-gateway:x:14871::::::
+systemd-timesync:x:14871::::::
+systemd-network:x:14871::::::
+systemd-bus-proxy:x:14871::::::