Merge branch 'master' into i486

5 files changed, 34 insertions, 10 deletions

diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD
index 69bb8d85..e0cd2b31 100644
--- a/core/linux-lts/PKGBUILD
+++ b/core/linux-lts/PKGBUILD
@@ -2,7 +2,7 @@
 
 # fail if upstream's .config changes
 if [ "${sha256sums[4]}" = 'c645053c4525a1a70d5c10b52257ac136da7e9059b6a4a566a857a3d42046426' ]; then
-  sha256sums[4]='93082396973984f8cdb0fb5b05ba9e50f35ebd4d766e2aadfd5a69acce1cfab1'
+  sha256sums[4]='15ac94245d0de07d062665cc14169151179049948119f92949e3bd0fbdb4af41'
 fi
 
 eval "$(
diff --git a/core/linux-lts/config b/core/linux-lts/config
index a7349a67..0eb4661b 100644
--- a/core/linux-lts/config
+++ b/core/linux-lts/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.39 Kernel Configuration
+# Linux/x86 4.14.61-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -36,6 +36,7 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
+CONFIG_X86_32_LAZY_GS=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=2
@@ -299,10 +300,10 @@ CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR_NONE=y
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
 CONFIG_THIN_ARCHIVES=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -1312,6 +1313,9 @@ CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1319,10 +1323,7 @@ CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -8520,7 +8521,6 @@ CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 9a78606e..4a923bcc 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -13,7 +13,7 @@ eval "$(
       \,/tools/objtool" ,d
       \,arch/x86/Makefile, {
         a \
-        install -t "${_builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu
+        install -t "${builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu
       }
     '
 )"
diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD
new file mode 100644
index 00000000..410b180a
--- /dev/null
+++ b/core/syslinux/PKGBUILD
@@ -0,0 +1,13 @@
+# include sysmacros.h in extlinux, otherwise you get undefined references
+# to minor and major
+
+source+=(syslinux-sysmacros.patch)
+sha1sums+=('52c5233da147acd41d542b1673835be966b561e3')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      /patch.*efi_no_kbd/a patch -p1 < ../syslinux-sysmacros.patch
+    '
+)"
+
diff --git a/core/syslinux/syslinux-sysmacros.patch b/core/syslinux/syslinux-sysmacros.patch
new file mode 100644
index 00000000..ee7c4b61
--- /dev/null
+++ b/core/syslinux/syslinux-sysmacros.patch
@@ -0,0 +1,11 @@
+diff -rauN syslinux/extlinux/main.c syslinux-sysmacros-patch/extlinux/main.c
+--- syslinux/extlinux/main.c	2018-08-10 11:28:39.164004538 +0200
++++ syslinux-sysmacros-patch/extlinux/main.c	2018-08-10 11:33:05.410671208 +0200
+@@ -19,6 +19,7 @@
+  */
+ 
+ #define  _GNU_SOURCE		/* Enable everything */
++#include <sys/sysmacros.h>
+ #include <inttypes.h>
+ /* This is needed to deal with the kernel headers imported into glibc 3.3.3. */
+ #include <alloca.h>