filesystem-2014.05-2: updating version

* add systemd-timesync and systemd-journal-gateway users/groups
* fix incorrect group in /etc/passwd for systemd-journal-gateway

5 files changed, 37 insertions, 30 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 1ed9e7d46..9590f1a83 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $
+# $Id: PKGBUILD 214251 2014-06-04 14:43:58Z dreisner $
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=filesystem
-pkgver=2013.05
-pkgrel=2.2
+pkgver=2014.05
+pkgrel=2
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,6 +21,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' 'parabola.7.txt'
         'locale.sh')
+md5sums=('e26a6b21c1e154e87a5c45e8b8c366fd'
+         '6be47d893fd49b2e4a8c0e811b350861'
+         '9e4533df61f0c82d6b2e2371f7376282'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '932af5f313265a774ec5995d9e720025'
+         '2ef2429c2c98d0883906aa6f5363be80'
+         '693c97f2c9a519bb97a17008e92c2b74'
+         '1745349eb24ed21b4cfaa6f423bddb76'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '0e145e18fea8fd190b30d45764f5707c'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '22518e922891f9359f971f4f5b4e793c'
+         'f45389e116ab0b9e9968287617d27c7d'
+         '0b6f835598c7640184e476057b3c7722'
+         'a8a962370cd0128465d514e6a1f74130'
+         'd5732ffdb3488e1383d4ea199343e767'
+         '4fab2b798deff348e04f05152111aae0')
 
 build() {
 	cd ${srcdir}
@@ -53,7 +73,7 @@ package() {
 		install -m600 ${srcdir}/${f} etc/
 	done
 	touch etc/parabola-release
-	ln -s parabola-release etc/arch-release
+	ln -sv parabola-release etc/arch-release
 	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
 	install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
 
@@ -112,23 +132,3 @@ package() {
 	done
 	ln -s ../man usr/local/share/man
 }
-md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
-         '6be47d893fd49b2e4a8c0e811b350861'
-         '9e4533df61f0c82d6b2e2371f7376282'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '1cfd310dff0804a7d21958487c32a3b1'
-         '2ef2429c2c98d0883906aa6f5363be80'
-         '693c97f2c9a519bb97a17008e92c2b74'
-         '1745349eb24ed21b4cfaa6f423bddb76'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '0e145e18fea8fd190b30d45764f5707c'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '22518e922891f9359f971f4f5b4e793c'
-         'f45389e116ab0b9e9968287617d27c7d'
-         '0b6f835598c7640184e476057b3c7722'
-         'a8a962370cd0128465d514e6a1f74130'
-         'd5732ffdb3488e1383d4ea199343e767'
-         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index c04374422..62e553ce4 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -25,15 +25,19 @@ 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
 
 	# sync gshadow to group (fixes FS#19869)
 	if ! grep -q '^lock:' etc/gshadow; then
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 6c91b292f..0d0918cbb 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -33,3 +33,5 @@ power:x:98:
 nobody:x:99:
 users:x:100:
 systemd-journal:x:190:
+systemd-journal-gateway:x:191:
+systemd-timesync:x:192:
diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh
index 5fd4174d5..3cfc89c1b 100644
--- a/libre/filesystem/locale.sh
+++ b/libre/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/libre/filesystem/passwd b/libre/filesystem/passwd
index 671fc486e..b65b7cc8a 100644
--- a/libre/filesystem/passwd
+++ b/libre/filesystem/passwd
@@ -7,3 +7,5 @@ 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