From 851e0fe05292d250773196e3c5feaeeec3c7da57 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 4 Jun 2014 12:28:01 +0000
Subject: [PATCH] core/filesystem to 2014.05-2, fixes #859

---
 core/filesystem/PKGBUILD           | 44 ++++++++++++++----------------
 core/filesystem/filesystem.install | 12 ++++++--
 core/filesystem/group              |  3 ++
 core/filesystem/locale.sh          |  5 ++--
 core/filesystem/passwd             |  3 ++
 5 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/core/filesystem/PKGBUILD b/core/filesystem/PKGBUILD
index c3efef985..1a312dc24 100644
--- a/core/filesystem/PKGBUILD
+++ b/core/filesystem/PKGBUILD
@@ -4,10 +4,8 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - modifed os-release
 
-noautobuild=1
-
 pkgname=filesystem
-pkgver=2013.05
+pkgver=2014.05
 pkgrel=2
 pkgdesc='Base filesystem'
 arch=('i686' 'x86_64')
@@ -24,6 +22,26 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         '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=('e26a6b21c1e154e87a5c45e8b8c366fd'
+         '7813c481156f6b280a3ba91fc6236368'
+         '9e4533df61f0c82d6b2e2371f7376282'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '932af5f313265a774ec5995d9e720025'
+         '2ef2429c2c98d0883906aa6f5363be80'
+         '693c97f2c9a519bb97a17008e92c2b74'
+         '1745349eb24ed21b4cfaa6f423bddb76'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '52db9503314f639b8f47bd9a251a6ea9'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '22518e922891f9359f971f4f5b4e793c'
+         'f45389e116ab0b9e9968287617d27c7d'
+         '0b6f835598c7640184e476057b3c7722'
+         'a8a962370cd0128465d514e6a1f74130'
+         '2e193c4a37245f2323ebe87f1a673563'
+         '4fab2b798deff348e04f05152111aae0')
 
 build() {
 	cd ${srcdir}
@@ -109,23 +127,3 @@ package() {
 	done
 	ln -s ../man usr/local/share/man
 }
-md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
-         '7813c481156f6b280a3ba91fc6236368'
-         '9e4533df61f0c82d6b2e2371f7376282'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '1cfd310dff0804a7d21958487c32a3b1'
-         '2ef2429c2c98d0883906aa6f5363be80'
-         '693c97f2c9a519bb97a17008e92c2b74'
-         '1745349eb24ed21b4cfaa6f423bddb76'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '52db9503314f639b8f47bd9a251a6ea9'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '22518e922891f9359f971f4f5b4e793c'
-         'f45389e116ab0b9e9968287617d27c7d'
-         '0b6f835598c7640184e476057b3c7722'
-         'a8a962370cd0128465d514e6a1f74130'
-         '2e193c4a37245f2323ebe87f1a673563'
-         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/core/filesystem/filesystem.install b/core/filesystem/filesystem.install
index c04374422..7a43b24df 100644
--- a/core/filesystem/filesystem.install
+++ b/core/filesystem/filesystem.install
@@ -25,15 +25,21 @@ post_upgrade() {
 	_addgroup games   -g 50
 	_addgroup uucp    -g 14
 	_addgroup http    -g 33
-	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false
+	_adduser  http    -u 33 -d /srv/http -g http -s /usr/bin/nologin
 	_addgroup scanner -g 96
 	_addgroup rfkill  -g 24
 	_addgroup lock    -g 54
 	_addgroup uuidd   -g 68
-	_adduser uuidd    -u 68 -d / -g uuidd -s /sbin/nologin
+	_adduser uuidd    -u 68 -d / -g uuidd -s /usr/bin/nologin
 	_addgroup dbus    -g 81
-	_adduser dbus     -u 81 -d / -g dbus -s /sbin/nologin
+	_adduser dbus     -u 81 -d / -g dbus -s /usr/bin/nologin
 	_addgroup systemd-journal -g 190
+	_addgroup systemd-journal-gateway -g 191
+	_adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin
+	_addgroup systemd-timesync -g 192
+	_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
 
 	# sync gshadow to group (fixes FS#19869)
 	if ! grep -q '^lock:' etc/gshadow; then
diff --git a/core/filesystem/group b/core/filesystem/group
index 6c91b292f..3a481a2c0 100644
--- a/core/filesystem/group
+++ b/core/filesystem/group
@@ -33,3 +33,6 @@ power:x:98:
 nobody:x:99:
 users:x:100:
 systemd-journal:x:190:
+systemd-journal-gateway:x:191:
+systemd-timesync:x:192:
+systemd-network:x:193:
diff --git a/core/filesystem/locale.sh b/core/filesystem/locale.sh
index 5fd4174d5..3cfc89c1b 100644
--- a/core/filesystem/locale.sh
+++ b/core/filesystem/locale.sh
@@ -9,11 +9,10 @@ elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
   . "$HOME/.config/locale.conf"
 elif [ -r /etc/locale.conf ]; then
   . /etc/locale.conf
-elif [ -r /etc/rc.conf ]; then
-  LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE")
 fi
 
-export LANG="${LANG:-C}"
+LANG=${LANG:-C}
+export LANG
 [ -n "$LC_CTYPE" ]          && export LC_CTYPE
 [ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
 [ -n "$LC_TIME" ]           && export LC_TIME
diff --git a/core/filesystem/passwd b/core/filesystem/passwd
index 671fc486e..7075ec497 100644
--- a/core/filesystem/passwd
+++ b/core/filesystem/passwd
@@ -7,3 +7,6 @@ http:x:33:33:http:/srv/http:/bin/false
 uuidd:x:68:68:uuidd:/:/sbin/nologin
 dbus:x:81:81:dbus:/:/sbin/nologin
 nobody:x:99:99:nobody:/:/bin/false
+systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/bin/false
+systemd-timesync:x:192:192:systemd-timesync:/:/bin/false
+systemd-network:x:193:193:systemd-network:/:/bin/false