5 files changed, 16 insertions, 12 deletions
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