core/pacman: removed test ignore, adapted makepkg.conf to upstream changes

2 files changed, 8 insertions, 15 deletions

diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 23c625a8..85a805de 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,11 +1,11 @@
-# upstream git revision: fb2af6c105822feb0e5e097d25cc2816416bb294
+# upstream git revision: 65d13ac09a0c56a80a71280d5669eb8a8f557426
 
 depends+=(archlinux32-keyring)
 
 # fail if upstream changes makepkg.conf or pacman.conf
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '89d1dd7e7064243754efc1993a8843a400afd5d7c15070787985376ec346d6d9' ]; then
-    sha256sums[${i}]='79c5cb75d53a957db9dcc4605a3aa7cefa27915992267bee1f5747264ac1359d'
+  if [ "${sha256sums[${i}]}" = '8bf61d04aa67979e58bada8538f62b4b37a58bab1aabe97d6b148da0f4c920d9' ]; then
+    sha256sums[${i}]='f3ce4ba937ff47c10ae4b7c3b4e46bac3aa8975b1a9171eb95fdd3dd68fe4251'
   fi
   if [ "${sha256sums[${i}]}" = '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7' ]; then
     sha256sums[${i}]='fa05e6f8a83f09fc347988a8ad9dce6fad50d542b2d77fc07fd1b604309990be'
@@ -23,6 +23,7 @@ if [ ! "${CARCH}" = "i686" ]; then
   )"
 fi
 
+# patch pacman for automatic architecture detection
 source+=('replace-i686-by-pentium4-when-architecture-is-auto.patch')
 sha256sums+=('6a7906bd28a57cbcff58d856ffefbbb9096a163aaff79913b4fac69d75d0028a')
 
@@ -36,11 +37,3 @@ eval "$(
        patch -p1 -i ../replace-i686-by-pentium4-when-architecture-is-auto.patch
   '
 )"
-
-# FAIL: test 600 (also 64-bit), ignore for now
-eval "$(
-  declare -f check | \
-    sed '
-      s/make\(.*\)check/make \1 check || true/
-    '
-)"
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index 3e9fd8e7..98bca384 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -9,10 +9,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
-          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
+          'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')