[arch-commits] Commit in filesystem/trunk (PKGBUILD locale.sh nsswitch.conf profile)

[Sébastien Luttringer]

    Date: Sunday, December 31, 2017 @ 18:33:48
  Author: seblu
Revision: 313826

upgpkg: filesystem 2017.12-1

- fix FS#56684
- fix FS#56688

Modified:
  filesystem/trunk/PKGBUILD
  filesystem/trunk/locale.sh
  filesystem/trunk/nsswitch.conf
  filesystem/trunk/profile

---------------+
 PKGBUILD      |   10 +++++-----
 locale.sh     |   23 ++++++++---------------
 nsswitch.conf |    2 +-
 profile       |    2 +-
 4 files changed, 15 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-31 18:14:19 UTC (rev 313825)
+++ PKGBUILD	2017-12-31 18:33:48 UTC (rev 313826)
@@ -3,8 +3,8 @@
 # Contributor: Tom Gundersen <teg at jklm.no>
 
 pkgname=filesystem
-pkgver=2017.10
-pkgrel=2
+pkgver=2017.12
+pkgrel=1
 pkgdesc='Base Arch Linux files'
 arch=('x86_64')
 license=('GPL')
@@ -28,12 +28,12 @@
          'a1315ea3e2b64d197b6efaf9c14ff778'
          '7813c481156f6b280a3ba91fc6236368'
          '5deb9f890a4d08a245e9752ede77271e'
-         '71ed98c52e11ada1f936ac8cb14eecd9'
+         '380ccce470d309efb631f7ec3f86db48'
          'd41d8cd98f00b204e9800998ecf8427e'
-         '44851ecc062ba34a4c024b6f3246c48f'
+         '9a439ad4ca5c0fe885fc79159a108e36'
          '0a0fbb8e64faabb40023bd180d7190a1'
          '5182ac38a0de85da8ade93ef71975ca4'
-         '13feaea89d404729ad2f7cf0bcc41d85'
+         '2c79e1762978235e7b4a9ef595f6c029'
          '0ee015fad07732676d9488ae498eed41'
          'f04bcb2803afc4dcb95670fe87343b4d'
          'f64466dd77c7bec37a8b47681468211a'

Modified: locale.sh
===================================================================
--- locale.sh	2017-12-31 18:14:19 UTC (rev 313825)
+++ locale.sh	2017-12-31 18:33:48 UTC (rev 313826)
@@ -1,26 +1,19 @@
 #!/bin/sh
 
+# load locale.conf in XDG paths.
+# /etc/locale.conf loads and overrides by kernel command line is done by systemd
 if [ -z "$LANG" ]; then
   if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
     . "$XDG_CONFIG_HOME/locale.conf"
   elif [ -n "$HOME" ] && [ -r "$HOME/.config/locale.conf" ]; then
     . "$HOME/.config/locale.conf"
-  elif [ -r /etc/locale.conf ]; then
-    . /etc/locale.conf
   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_ALL LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+ LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_IDENTIFICATION \
+ LC_MEASUREMENT

Modified: nsswitch.conf
===================================================================
--- nsswitch.conf	2017-12-31 18:14:19 UTC (rev 313825)
+++ nsswitch.conf	2017-12-31 18:33:48 UTC (rev 313826)
@@ -7,7 +7,7 @@
 
 publickey: files
 
-hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname
+hosts: files mymachine myhostnames resolve [!UNAVAIL=return] dns
 networks: files
 
 protocols: files

Modified: profile
===================================================================
--- profile	2017-12-31 18:14:19 UTC (rev 313825)
+++ profile	2017-12-31 18:33:48 UTC (rev 313826)
@@ -9,7 +9,7 @@
         *:"$1":*)
             ;;
         *)
-            PATH="$PATH:$1"
+            PATH="${PATH:+$PATH:}$1"
     esac
 }