Merge branch 'master' into i486

2 files changed, 10 insertions, 8 deletions

diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 1a0491e0..86372fc6 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,14 +1,16 @@
-# upstream git revision: 819bac64f58416f1910c65c8ee40f919cf51ccbb
+# upstream git revision: e06c0338abc7919fe18a2070704bcd498344b29e
 
 depends+=(archlinux32-keyring)
 
 # fail if upstream changes makepkg.conf or pacman.conf
-if [ "${sha256sums[4]}" = '95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b' ]; then
-  sha256sums[4]='008f9da1eb55e679eabbab762e106c7741d5ad303adc9644baf589a99e3c1e41'
-fi
-if [ "${sha256sums[5]}" = '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e' ]; then
-  sha256sums[5]='d1c3e5f9b7259e401ab121aff335531452d23dc67d9e6c2f464771d25f11058a'
-fi
+for ((i=0; i<${#sha256sums[@]}; i++)); do
+  if [ "${sha256sums[${i}]}" = 'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb' ]; then
+    sha256sums[${i}]='d75bbbe42d290c4f22a95e6ac86d4723dc6d0c08228d14c3dcbae9dc5d2514e5'
+  fi
+  if [ "${sha256sums[${i}]}" = '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e' ]; then
+    sha256sums[${i}]='d1c3e5f9b7259e401ab121aff335531452d23dc67d9e6c2f464771d25f11058a'
+  fi
+done
 
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf
index bf27b628..f6afcb76 100644
--- a/core/pacman/pacman.conf
+++ b/core/pacman/pacman.conf
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7