Merge branch 'master' into i486

11 files changed, 87 insertions, 19 deletions

diff --git a/blacklist b/blacklist
index 84b8e26a..d18621d5 100644
--- a/blacklist
+++ b/blacklist
@@ -4,6 +4,7 @@ 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
+i486 linux-pae # not useful - use i686 instead
 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
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
new file mode 100644
index 00000000..96c983d4
--- /dev/null
+++ b/community/rxvt-unicode/PKGBUILD
@@ -0,0 +1,10 @@
+eval "$(
+  declare -f package_rxvt-unicode | \
+    sed '
+      2 a arch=(i486 i686 pentium3 x86_64)
+    '
+  declare -f package_rxvt-unicode-terminfo | \
+    sed '
+      2 a arch=(any)
+    '
+)"
diff --git a/core/ding-libs/PKGBUILD b/core/ding-libs/PKGBUILD
new file mode 100644
index 00000000..ef562218
--- /dev/null
+++ b/core/ding-libs/PKGBUILD
@@ -0,0 +1,10 @@
+# already fixed upstream, see https://github.com/SSSD/ding-libs/issues/7
+
+source+=('ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch')
+sha1sums+=('bec66945c3524a9edf4956f794e99ca4d3d144e0')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i ../ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
+}
diff --git a/core/ding-libs/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch b/core/ding-libs/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
new file mode 100644
index 00000000..29234a70
--- /dev/null
+++ b/core/ding-libs/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
@@ -0,0 +1,35 @@
+diff -rauN ding-libs-0.6.1/ini/ini_validators_ut_check.c ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28-patch/ini/ini_validators_ut_check.c
+--- ding-libs-0.6.1/ini/ini_validators_ut_check.c	2017-09-07 17:24:13.000000000 +0200
++++ ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28-patch/ini/ini_validators_ut_check.c	2018-09-17 13:13:29.989999949 +0200
+@@ -602,11 +602,31 @@
+     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
+     ini_errobj_next(errobj);
+ 
++    /* Different versions of libc produce slightly different error strings
++     * in this case. For simplicity compare against all of them. */
+     errmsg = ini_errobj_get_msg(errobj);
+     ret = strcmp(errmsg,
+                  "[rule/options_for_foo]: Cannot compile regular expression "
+                  "from option 'section_re'. "
+                  "Error: 'Unmatched [ or [^'");
++     if (ret != 0) {
++         ret = strcmp(errmsg,
++                     "[rule/options_for_foo]: Cannot compile regular expression "
++                     "from option 'section_re'. "
++                     "[rule/options_for_foo]: Cannot compile regular "
++		     "expression from option 'section_re'. "
++                      "Error: 'brackets ([ ]) not balanced'");
++     }
++    if (ret != 0) {
++         ret = strcmp(errmsg,
++                     "[rule/options_for_foo]: Cannot compile regular "
++		     "expression from option 'section_re'. "
++		     "Error: 'Unmatched [, [^, [:, [., or [='");
++    }
++     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
++     ini_errobj_next(errobj);
++ 
++                 
+     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
+     ini_errobj_next(errobj);
+ 
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 197ec5f3..f7b7b3fb 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -4,7 +4,7 @@
 for ((i=0; i<${#sha256sums[@]}; i++)); do
   if [ "${sha256sums[${i}]}" = '83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8' ]; then
     source_i686=('config.i686')
-    sha256sums_i686=('224d422c6eea90fa395e49adf672a48468fd9d702f698a3ab4c9b9ee40c7cd18')
+    sha256sums_i686=('fac358ec445aaeafe13b3d5916c2c01304588578632f4d74186f8691acd0419b')
     source_i486=('config.i486')
     sha256sums_i486=('8bb140f3f672d6e10bfb652a617d0c161b24980c750d2358cece2b82f8897dcb')
   fi
diff --git a/core/linux/config.i686 b/core/linux/config.i686
index 2b4c93f6..5e61428f 100644
--- a/core/linux/config.i686
+++ b/core/linux/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.6-arch1 Kernel Configuration
+# Linux/x86 4.18.7-arch1 Kernel Configuration
 #
 
 #
@@ -1121,14 +1121,14 @@ CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_OSF=m
 CONFIG_NF_TABLES=m
-# CONFIG_NF_TABLES_SET is not set
+CONFIG_NF_TABLES_SET=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_COUNTER=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
@@ -1143,7 +1143,7 @@ CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_FIB=m
 CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -5961,7 +5961,13 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_VIA is not set
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
@@ -6016,7 +6022,9 @@ CONFIG_FB_I810_I2C=y
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
 # CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_NEOMAGIC is not set
diff --git a/extra/devtools/PKGBUILD b/extra/devtools/PKGBUILD
index 1a811722..bdc5069f 100644
--- a/extra/devtools/PKGBUILD
+++ b/extra/devtools/PKGBUILD
@@ -1,7 +1,7 @@
 # we override almost everything
 
-pkgver=20180627
-pkgrel=1
+pkgver=20180918
+pkgrel=2
 pkgdesc='Tools for Arch Linux 32 package maintainers'
 license=('GPL')
 url='https://git.archlinux32.org/archlinux32/devtools32/'
@@ -9,7 +9,7 @@ source=(
   "https://sources.archlinux32.org/sources/${pkgname}32-v${pkgver}.tar.gz"{,.sig}
 )
 if [ "${md5sums[0]}" = 'ed3c757184e633faeea09747a7b91bb1' ]; then
-  sha512sums=('d2e27562443999ed3164ed7fea30d64872146a8ce8de2cf57a1e9ecb590049436b19da979b74a029aea9e5430861b01b2d14d851d638c819f20af61c3f07a92f'
+  sha512sums=('e2e6d86c909566d05961abaa95255d5a3eb96f9fc0720235910357f9dd4f512c52a8d2f46d66c5e75e8b9cc347b7430b7100ed8a61b67a9b4cebdab1ade3698a'
               'SKIP')
   validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
   unset md5sums
@@ -21,7 +21,7 @@ prepare() {
     -maxdepth 1 \
     -type f \
     \( \
-      -name 'pacman-*-i686.conf' -o \
+      -name 'pacman-*-32.conf' -o \
       -name 'arch-nspawn.in' \
     \) \
     -exec sed -i 's/mirrorlist32/mirrorlist/g' {} \;
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 31384646..9e0dbdc9 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgbase=linux-pae           # Build stock -ARCH kernel
-pkgver='4.18.8'
+pkgver='4.18.10'
 _srcname=linux-${pkgver}
 pkgrel='1'
 arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('f1551bad69ab617708fa8cf3f94545ae03dd350bdeb3065fbcf39c1a7df85494'
+sha256sums=('10604f7f8ccab5e7ce71f2e87d1410be679cd11c29c6c608ce35df1db40991de'
             'SKIP'
-            'c7209b311fab2453554037977975396d5ef6a2a3b00ea9dccb46a16dfca351bf'
+            '5a87b99396ebe3e88c3848bcea394d6cbe6924546ca375b9d48e134b6daef502'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index 069b32a7..ed8a67c6 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.8-1 Kernel Configuration
+# Linux/x86 4.18.10-1 Kernel Configuration
 #
 
 #
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 933ce385..e5262aa2 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -3,7 +3,7 @@
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
   if [ "${sha256sums[${i}]}" = 'fd5a7203579777ab2c0deb3bcdf94ded8a4422fefc81506b98c3bce8070b5a8f' ]; then
-    sha256sums[${i}]='ad2a55218708ad7af672c718013b9626b847719371bb1a38dfd7df374e87624a'
+    sha256sums[${i}]='e7d5065e6e43f11c1964010da469e6b9e38a73aba40fac99a8cdace18be86ae2'
   fi
 done
 
@@ -11,5 +11,9 @@ eval "$(
   declare -f package_linux-zen-headers | \
     sed '
       \,/tools/objtool" ,d
+      \,arch/x86/Makefile, {
+        a \
+        install -t "${builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu
+      }
     '
 )"
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index b68c8746..0f7ee4d3 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1153,14 +1153,14 @@ CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_OSF=m
 CONFIG_NF_TABLES=m
-# CONFIG_NF_TABLES_SET is not set
+CONFIG_NF_TABLES_SET=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_COUNTER=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
@@ -1175,7 +1175,7 @@ CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_FIB=m
 CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m