core/filesystem to 2018.1-2

core/filesystem/PKGBUILD

@@ -6,10 +6,10 @@
 #  - modifed os-release
 
 pkgname=filesystem
-pkgver=2017.10
+pkgver=2018.1
 pkgrel=2
 pkgdesc='Base Arch Linux files'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL')
 url='https://www.archlinux.org'
 groups=('base')
@@ -31,12 +31,12 @@ md5sums=('5fa6674df7645d7f5895f2d12b4ef4e9'
          'a1315ea3e2b64d197b6efaf9c14ff778'
          '7813c481156f6b280a3ba91fc6236368'
          '5deb9f890a4d08a245e9752ede77271e'
-         '71ed98c52e11ada1f936ac8cb14eecd9'
+         '580cf8b59eebfaac4fad373ffadc9912'
          'd41d8cd98f00b204e9800998ecf8427e'
-         '44851ecc062ba34a4c024b6f3246c48f'
+         '981ee4d7e506a9d6d9ed2d872e16004b'
          '52db9503314f639b8f47bd9a251a6ea9'
          '5182ac38a0de85da8ade93ef71975ca4'
-         '13feaea89d404729ad2f7cf0bcc41d85'
+         '2c79e1762978235e7b4a9ef595f6c029'
          '0ee015fad07732676d9488ae498eed41'
          'f04bcb2803afc4dcb95670fe87343b4d'
          'f64466dd77c7bec37a8b47681468211a'

core/filesystem/locale.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# load locale.conf in XDG paths.
+# /etc/locale.conf loads and overrides by kernel command line is done by systemd
+# But we override it here, see FS#56688
 if [ -z "$LANG" ]; then
   if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
     . "$XDG_CONFIG_HOME/locale.conf"
@@ -10,17 +13,10 @@ if [ -z "$LANG" ]; then
   fi
 fi
 
+# define default LANG to C if not already defined
 LANG=${LANG:-C}
-export LANG
-[ -n "$LC_CTYPE" ]          && export LC_CTYPE
-[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
-[ -n "$LC_TIME" ]           && export LC_TIME
-[ -n "$LC_COLLATE" ]        && export LC_COLLATE
-[ -n "$LC_MONETARY" ]       && export LC_MONETARY
-[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
-[ -n "$LC_PAPER" ]          && export LC_PAPER
-[ -n "$LC_NAME" ]           && export LC_NAME
-[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
-[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
-[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
-[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION
+
+# export all locale (7) variables when they exist
+export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+       LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \
+       LC_IDENTIFICATION

core/filesystem/nsswitch.conf

@@ -7,7 +7,7 @@ shadow: files
 
 publickey: files
 
-hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname
+hosts: files mymachines myhostname resolve [!UNAVAIL=return] dns
 networks: files
 
 protocols: files

core/filesystem/profile

@@ -9,7 +9,7 @@ appendpath () {
         *:"$1":*)
             ;;
         *)
-            PATH="$PATH:$1"
+            PATH="${PATH:+$PATH:}$1"
     esac
 }