Merge branch 'master' into i486

12 files changed, 68 insertions, 110 deletions

diff --git a/README.md b/README.md
index d1c1712c..3c577877 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,12 @@ It is currently hosted on https://git.archlinux32.org/archlinux32/packages.
 
 * There are subdirectories `repository/package` which contain new packages and customizations for existent packages to compile for i686 or adopt to our environment.
 In case, the files therein exist in the respective original package, the respective original package files are either appended (in case of `PKGBUILD`) or overwritten (for other files).
-* The file `blacklist` containes a list of packages which won't be built for i686 (because they can't be built for or are useless on i686).
+* The file `blacklist` containes a list of packages which won't be built for Arch Linux 32 (because they can't be built for or are useless on i686).
+An entry in this file consist of an architecture and a pkgbase separated by a space.
+The given package will be black listed for all architectures less potent than the given one or, if "any" is given, for all architectures.
 * The file `extra-from-multilib` contains a list of packages which are in multilib for x86_64, but belong in extra (and not community) for i686.
 
 Additional to the abovementioned changes to the package sources, the following changes are made automatically by the [build master's mangle_pkgbuild()](https://github.com/archlinux32/builder/blob/master/lib/common-functions) which should therefor **not** be committed here:
 * append architectures to `arch` array
 * append our sub_pkgrel
-* remove `lib32-` prefixes if present
\ No newline at end of file
+* remove `lib32-` prefixes if present
diff --git a/blacklist b/blacklist
index aa2898a5..a2680182 100644
--- a/blacklist
+++ b/blacklist
@@ -1,33 +1,33 @@
-bazel # reports are there for making 32-bit compile, see <a href="https://github.com/bazelbuild/bazel/issues/3643">upstream</a>
-ceph # fails fatally in check() - see <a href="https://bugs.archlinux32.org/index.php?do=details&task_id=21">FS32#21</a>
-cuda # cuda 9.0 is 64-bit only
-delve # currently no 32-bit support, see <a href="https://github.com/derekparker/delve/issues/20">upstream</a>
-dotnet-core # not available for 32-bit on linux, see <a href="https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.5-download.md">here</a>
-linux-hardened # not <a href="https://mirror.archlinux32.org/irc-logs/%23archlinux-ports/2017-06-28.html#04:04:01">really useful</a> on i686 + hard to maintain
-libretro-citra # do not build, see FS32#23
-libretro-mupen64plus # do not build, see FS32#23
-libretro-parallel-n64 # do not build, see FS32#23
-libretro-ppsspp # do not build, see FS32#23
-luxrays # does not compile on i686 - see FS#54960
-mongodb # dropped support for 32-bit in version 3.4
-nginx-mod-pagespeed # bundles a 64-bit only version of psol, doesn't build that way
-nsjail # kafel has no 32-bit Intel support, see also <a href="https://bbs.archlinux32.org/viewtopic.php?pid=795#p795">forum</a>
-nvidia # dropped support after release 390: https://www.phoronix.com/scan.php?page=news_item&px=32-bit-NVIDIA-Drop-Dropping
-nvidia-lts # see nvidia
-nvidia-utils # see nvidia
-opera # dropped 32-bit version in version 46.0.2597.26
-opera-ffmpeg-codecs # as opera itself is blacklisted
-ospray # "Your Embree build needs to support at least one ISA >= SSE4.1!"
-ovmf # "ERROR: This package must be built under the x86_64 architecture.", UEFI for VMS, of little use anyway with 32-bit machines
-parallel-netcdf-openmpi # requires MPI_Offset >= 8, which is not (yet?) possible on 32 bits - see https://github.com/open-mpi/ompi/issues/3195
-parity # "32-bit targets are not supported at the moment, You can use '32bit_opt_in' feature. See https://github.com/pepyakin/wasmi/issues/43
-python-pytorch # Gloo can only be built on 64-bit systems
-qcef # contains CEF binaries (not current ones) for 64-bit and MIPS only, no 32-bit Intel. Discuss with the authors if you need it.
-rubinius # Support for non-64bit platforms was deprecated 1 Jun 2016 and has now been removed. If non-64bit support is a critical feature for your application, please email contact@rubinius.com
-sbcl # blocks again
-skia-sharp # does not provide a bin/gn for 32-bit Linux, see FS32#8
-skia-sharp58 # does not provide a bin/gn for 32-bit Linux, see FS32#8
-tarantool # hand-crafted assembly code, see <a href="https://github.com/tarantool/tarantool/issues/3029">upstream</a>
-vc # "Unsupported target architecture 'i686'. No support_???.cpp file exists for this architecture", complain upstream if you need it
-wiredtiger # WiredTiger requires a 64-bit build
-zcash # <a href="https://github.com/zcash/zcash/issues/914">We don't yet support 32bit systems (and we won't by launch) but we can look into this after launch.</a>
+i686 bazel # reports are there for making 32-bit compile, see <a href="https://github.com/bazelbuild/bazel/issues/3643">upstream</a>
+i686 ceph # fails fatally in check() - see <a href="https://bugs.archlinux32.org/index.php?do=details&task_id=21">FS32#21</a>
+i686 cuda # cuda 9.0 is 64-bit only
+i686 delve # currently no 32-bit support, see <a href="https://github.com/derekparker/delve/issues/20">upstream</a>
+i686 dotnet-core # not available for 32-bit on linux, see <a href="https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.5-download.md">here</a>
+i686 linux-hardened # not <a href="https://mirror.archlinux32.org/irc-logs/%23archlinux-ports/2017-06-28.html#04:04:01">really useful</a> on i686 + hard to maintain
+i686 libretro-citra # do not build, see FS32#23
+i686 libretro-mupen64plus # do not build, see FS32#23
+i686 libretro-parallel-n64 # do not build, see FS32#23
+i686 libretro-ppsspp # do not build, see FS32#23
+i686 luxrays # does not compile on i686 - see FS#54960
+i686 mongodb # dropped support for 32-bit in version 3.4
+i686 nginx-mod-pagespeed # bundles a 64-bit only version of psol, doesn't build that way
+i686 nsjail # kafel has no 32-bit Intel support, see also <a href="https://bbs.archlinux32.org/viewtopic.php?pid=795#p795">forum</a>
+i686 nvidia # dropped support after release 390: https://www.phoronix.com/scan.php?page=news_item&px=32-bit-NVIDIA-Drop-Dropping
+i686 nvidia-lts # see nvidia
+i686 nvidia-utils # see nvidia
+i686 opera # dropped 32-bit version in version 46.0.2597.26
+i686 opera-ffmpeg-codecs # as opera itself is blacklisted
+i686 ospray # "Your Embree build needs to support at least one ISA >= SSE4.1!"
+any ovmf # "ERROR: This package must be built under the x86_64 architecture.", UEFI for VMS, of little use anyway with 32-bit machines
+i686 parallel-netcdf-openmpi # requires MPI_Offset >= 8, which is not (yet?) possible on 32 bits - see https://github.com/open-mpi/ompi/issues/3195
+i686 parity # "32-bit targets are not supported at the moment, You can use '32bit_opt_in' feature. See https://github.com/pepyakin/wasmi/issues/43
+i686 python-pytorch # Gloo can only be built on 64-bit systems
+i686 qcef # contains CEF binaries (not current ones) for 64-bit and MIPS only, no 32-bit Intel. Discuss with the authors if you need it.
+i686 rubinius # Support for non-64bit platforms was deprecated 1 Jun 2016 and has now been removed. If non-64bit support is a critical feature for your application, please email contact@rubinius.com
+i686 sbcl # blocks again
+i686 skia-sharp # does not provide a bin/gn for 32-bit Linux, see FS32#8
+i686 skia-sharp58 # does not provide a bin/gn for 32-bit Linux, see FS32#8
+i686 tarantool # hand-crafted assembly code, see <a href="https://github.com/tarantool/tarantool/issues/3029">upstream</a>
+i686 vc # "Unsupported target architecture 'i686'. No support_???.cpp file exists for this architecture", complain upstream if you need it
+i686 wiredtiger # WiredTiger requires a 64-bit build
+i686 zcash # <a href="https://github.com/zcash/zcash/issues/914">We don't yet support 32bit systems (and we won't by launch) but we can look into this after launch.</a>
diff --git a/community/electron/PKGBUILD b/community/electron/PKGBUILD
index 03e55b2f..b8b43791 100644
--- a/community/electron/PKGBUILD
+++ b/community/electron/PKGBUILD
@@ -4,6 +4,7 @@ sha512sums+=('bce6716f88c0ed7acc72f90ef62f7c4a28b88e98d7fc8dcb6abf545eb6ab7de11e
 eval "$(
   declare -f prepare | \
     sed '
+      2 a find "${srcdir}" \\( '"-name '*.a' -o -name '*.o'"' \\) -delete
       3 a patch -Np1 -i "${srcdir}"/allow-i686.patch
     '
   declare -f build | \
diff --git a/community/pacman-contrib/PKGBUILD b/community/pacman-contrib/PKGBUILD
new file mode 100644
index 00000000..3b82e161
--- /dev/null
+++ b/community/pacman-contrib/PKGBUILD
@@ -0,0 +1,7 @@
+source+=('rankmirror.sh.diff')
+sha256sums+=('7a0fe662825d70decaa613a6d6104c39b3046f4ac710dc0c974316c671af35da')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/rankmirror.sh.diff"
+}
diff --git a/community/pacman-contrib/rankmirror.sh.diff b/community/pacman-contrib/rankmirror.sh.diff
new file mode 100644
index 00000000..c7ea00a1
--- /dev/null
+++ b/community/pacman-contrib/rankmirror.sh.diff
@@ -0,0 +1,16 @@
+diff --git a/src/rankmirrors.sh.in b/src/rankmirrors.sh.in
+index 08f7e28..8f9143f 100644
+--- a/src/rankmirrors.sh.in
++++ b/src/rankmirrors.sh.in
+@@ -79,10 +79,8 @@ getfetchurl() {
+ 	local replacedurl="${strippedurl//'$arch'/$ARCH}"
+ 	if [[ ! $TARGETREPO ]]; then
+ 		replacedurl="${replacedurl//'$repo'/core}"
+-		local tmp="${replacedurl%/*}"
+-		tmp="${tmp%/*}"
+ 
+-		local reponame="${tmp##*/}"
++		local reponame="${replacedurl##*/}"
+ 	else
+ 		replacedurl="${replacedurl//'$repo'/$TARGETREPO}"
+ 		local reponame="$TARGETREPO"
diff --git a/community/python-redis/tmp b/community/python-redis/tmp
deleted file mode 100644
index 6381b912..00000000
--- a/community/python-redis/tmp
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
-# Contributor: Karol 'Kenji Takahashi' Woźniak <kenji.sx>
-# Contributor: Pierre Gueth <pierre.gueth@gmail.com>
-
-pkgbase=python-redis
-pkgname=('python-redis' 'python2-redis')
-pkgver=2.10.6
-pkgrel=1
-pkgdesc='The Python interface to the Redis key-value store'
-arch=('any')
-url="http://github.com/andymccurdy/redis-py"
-license=('MIT')
-makedepends=('python-setuptools' 'python2-setuptools')
-checkdepends=('python-pytest' 'python2-pytest' 'python-mock' 'python2-mock' 'python-pifpaf' 'redis')
-source=("https://pypi.io/packages/source/r/redis/redis-$pkgver.tar.gz" precision.patch)
-sha512sums=('e7df464bc3b26e23f6a0d2d2896306c1e4792b9a2a4ecaea6dd8690ffa17853cc85345f063307295dd3c2da399f7f203f4b21d785f7e073c0501732257419dad' 'SKIP')
-
-prepare() {
-  patch -p0 -i precision.patch
-  cp -a redis-$pkgver{,-py2}
-}
-
-build() {
-  cd redis-$pkgver
-  python setup.py build
-
-  cd ../redis-$pkgver-py2
-  python2 setup.py build
-}
-
-check() {
-  cd redis-$pkgver
-  pifpaf run redis py.test
-
-  cd ../redis-$pkgver-py2
-  pifpaf run redis py.test2
-}
-
-package_python-redis() {
-  depends=('python')
-
-  cd redis-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python2-redis() {
-  depends=('python2')
-
-  cd redis-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:
-# see https://github.com/andymccurdy/redis-py/issues/899
-
-source+=('precision.patch')
-sha512sums+=('ccefada444c145f78098a37880bf7b1c7a2f2e24e92efc62f084610064c4391e4e0792a3e380ca940b73b15d703d5d0f166a8f7d8d17b9d84772b3e870fb74d5')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      /^{/ a \
-        patch -p0 -i precision.patch
-    '
-)"
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index e76f402c..1a0491e0 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -4,7 +4,7 @@ depends+=(archlinux32-keyring)
 
 # fail if upstream changes makepkg.conf or pacman.conf
 if [ "${sha256sums[4]}" = '95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b' ]; then
-  sha256sums[4]='240f25727c5ac21feeb14fb1d4c03b09d2cf0a43c1d02b042376c12e34b1f8ef'
+  sha256sums[4]='008f9da1eb55e679eabbab762e106c7741d5ad303adc9644baf589a99e3c1e41'
 fi
 if [ "${sha256sums[5]}" = '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e' ]; then
   sha256sums[5]='d1c3e5f9b7259e401ab121aff335531452d23dc67d9e6c2f464771d25f11058a'
diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf
index 87a21824..bf27b628 100644
--- a/core/pacman/pacman.conf
+++ b/core/pacman/pacman.conf
@@ -38,7 +38,7 @@ CheckSpace
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
+SigLevel    = Required DatabaseOptional DatabaseTrustAll
 LocalFileSigLevel = Optional
 #RemoteFileSigLevel = Required
 
diff --git a/extra/archiso/PKGBUILD b/extra/archiso/PKGBUILD
index a962ad24..9ff3f3e6 100644
--- a/extra/archiso/PKGBUILD
+++ b/extra/archiso/PKGBUILD
@@ -5,7 +5,7 @@ url='https://git.archlinux32.org/archlinux32/archiso32'
 source=("https://sources.archlinux32.org/sources/${pkgname}32-i686-v${pkgver}.tar.gz"{,.sig})
 unset sha256sums
 sha512sums=(
-  'cb33d61a4985e4277e0503dc5ea52c16f15ff69b4af583fbf7a19cfa3c050d5d84e52071bfb337f48a8e7a7b51a0edd8980614c8fafb733e3c25a9bcf8fc6447'
+  'ee6f912c09009f42389bf9eaea97a3e3c59122f20c2a62edbf57430f48777fc97d1b16853a4b08d5fa4c554804e2f27adbebdca2f55c2396ac45079c430ac144'
   'SKIP'
 )
 validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 80da221f..28904b14 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=linux-pae           # Build stock -ARCH kernel
 _srcname=linux-4.17
-pkgver=4.17.8
+pkgver=4.17.10
 pkgrel=1
 arch=('i686')
 url="https://www.kernel.org/"
@@ -29,9 +29,9 @@ validpgpkeys=(
 )
 sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13'
             'SKIP'
-            '146f68fa5ded4c33f3bafba23224ed8fae2a27f701257c899c6a4a7fa61eb6d0'
+            '41ad005296c7a1b5245a87881f666b3f4d7aa05a6b9409454b2e473d473c4cee'
             'SKIP'
-            'bf04f144e4637534e484d9f168a93a0d07707c0f86e15f776568a4daa8cf9310'
+            '6eb872aa69991b1f700d533ec8b092be60d4c8203e1cb7da4d42d167337ec2ac'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index 3a00533b..a4febc4e 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.8-1 Kernel Configuration
+# Linux/x86 4.17.10-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/extra/linux-pae/linux-4.17.tar.xz.part b/extra/linux-pae/linux-4.17.tar.xz.part
deleted file mode 100644
index 448ee231..00000000
--- a/extra/linux-pae/linux-4.17.tar.xz.part
+++ /dev/null