libre/filesystem: updated to 2020.05.07-1

3 files changed, 12 insertions, 33 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 874860cfd..93e9e2fe7 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=filesystem
-pkgver=2019.10
-pkgrel=2
+pkgver=2020.05.07
+pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Base Parabola GNU/Linux-libre files'
 arch=('x86_64')
@@ -13,8 +13,6 @@ arch+=('i686' 'armv7h' 'ppc64le')
 license=('GPL')
 url='https://www.parabola.nu'
 depends=('iana-etc')
-replaces=(filesystem-parabola)
-conflicts=(filesystem-parabola)
 backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf'
         'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty'
@@ -37,40 +35,16 @@ md5sums=('5fa6674df7645d7f5895f2d12b4ef4e9'
          '981ee4d7e506a9d6d9ed2d872e16004b'
          '14be02a20b9da728434ecb73e80111dc'
          '5182ac38a0de85da8ade93ef71975ca4'
-         '2c79e1762978235e7b4a9ef595f6c029'
+         '7b208a630a548740e0f4cd368badae23'
          '0ee015fad07732676d9488ae498eed41'
          'f04bcb2803afc4dcb95670fe87343b4d'
-         'f64466dd77c7bec37a8b47681468211a'
+         '815652599be54fd3607cf276e89a0a19'
          'a78cd8d7f8240a8448edee82f503c34e'
          'a51847c012555c843dbdf8df0da171d3'
          '9010c45efc9156e6f57f641ce43f9ad7'
          '0267a3a463f35eec8a31f40a720dfd86'
          '13e684d392ec61180766ed129a7a40e1'
          '65e26b0bd5d6390ddd694d1ef0c520ce')
-sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
-            'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da'
-            'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696'
-            '244f0718ee2a9d6862ae59d6c18c1dd1568651eada91a704574fa527fbac2b3a'
-            '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273'
-            '4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733'
-            'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9'
-            '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385'
-            'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5'
-            '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10'
-            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-            '2af11d071689f648859a65dd9fbb677bfaa89b0935676e4f1df769e9a90f73a9'
-            '1fb18c22836c5b679d183a504e594f14d2fdbeb7ce97dd3de5a0c88299f3d597'
-            '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
-            '5da078777cda24e4df697e2928451723f2303bfdbb2ce9551c822188c7945d25'
-            '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c'
-            'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b'
-            '8ce994663d7588143ad7ed4441b07f468f4f7d3590164dd73ddfa3ea307ece8e'
-            'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61'
-            '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4'
-            '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818'
-            '618ac097441c1f2daffc9967e5c3cd18ea8866f776db62d04bf401c53907b1c9'
-            'cb8ece3772744ef162d0ff6018e6a7051889c2aba1bf6439ba9e74a64ac46927'
-            '826c61cb40bb0b31e2071b21e04ad7f8c6aabe2817e681246569ae9dff81cd9b')
 
 package() {
   cd "$pkgdir"
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
index a4f717734..790e59b1d 100644
--- a/libre/filesystem/profile
+++ b/libre/filesystem/profile
@@ -28,8 +28,13 @@ if test -d /etc/profile.d/; then
 	unset profile
 fi
 
-# Source global bash config
-if test "$PS1" && test "$BASH" && test -z ${POSIXLY_CORRECT+x} && test -r /etc/bash.bashrc; then
+# Source global bash config, when interactive but not posix or sh mode
+if test "$BASH" &&\
+   test "$PS1" &&\
+   test -z "$POSIXLY_CORRECT" &&\
+   test "${0#-}" != sh &&\
+   test -r /etc/bash.bashrc
+then
 	. /etc/bash.bashrc
 fi
 
diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow
index 7edfd69be..a8860d1aa 100644
--- a/libre/filesystem/shadow
+++ b/libre/filesystem/shadow
@@ -1 +1 @@
-root::14871::::::
+root:*:14871::::::