12 files changed, 50 insertions, 23 deletions
diff --git a/source/a/efibootmgr/efibootmgr.SlackBuild b/source/a/efibootmgr/efibootmgr.SlackBuild
index 58d0ef61..b1580808 100755
--- a/source/a/efibootmgr/efibootmgr.SlackBuild
+++ b/source/a/efibootmgr/efibootmgr.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=efibootmgr
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -79,6 +79,9 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION
 
+# Remove wrong check of opts.reconnect:
+zcat $CWD/f862d860103511ae953cc2dd1283e1e95bf00376.patch.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/a/efibootmgr/f862d860103511ae953cc2dd1283e1e95bf00376.patch b/source/a/efibootmgr/f862d860103511ae953cc2dd1283e1e95bf00376.patch
new file mode 100644
index 00000000..2b1a0a40
--- /dev/null
+++ b/source/a/efibootmgr/f862d860103511ae953cc2dd1283e1e95bf00376.patch
@@ -0,0 +1,22 @@
+From f862d860103511ae953cc2dd1283e1e95bf00376 Mon Sep 17 00:00:00 2001
+From: Sly_tom_cat <slytomcat@users.noreply.github.com>
+Date: Thu, 24 Oct 2019 22:23:49 +0300
+Subject: [PATCH] Remove wrong check of opts.reconnect
+
+---
+ src/efibootmgr.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/efibootmgr.c b/src/efibootmgr.c
+index 59ba871..f9d01bb 100644
+--- a/src/efibootmgr.c
++++ b/src/efibootmgr.c
+@@ -1738,9 +1738,6 @@ main(int argc, char **argv)
+ 			mode = driver;
+ 	}
+ 
+-	if (opts.reconnect && !opts.driver)
+-		errorx(30, "--reconnect is supported only for driver entries.");
+-
+ 	if (!efi_variables_supported())
+ 		errorx(2, "EFI variables are not supported on this system.");
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index 5e647f51..3c9617cb 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.0
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-27}
+BUILD=${BUILD:-28}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
diff --git a/source/a/pkgtools/scripts/makepkg b/source/a/pkgtools/scripts/makepkg
index 9030d1f5..e8e1f068 100644
--- a/source/a/pkgtools/scripts/makepkg
+++ b/source/a/pkgtools/scripts/makepkg
@@ -298,8 +298,8 @@ echo
 echo "Searching for symbolic links:"
 # Get rid of possible pre-existing trouble:
 INST=$(mktemp $TMP/makepkg.XXXXXX)
-# Escape some characters in symlink names. Current escape list is (space at the end): ;!#$\&*<> 
-find . -type l -printf "%p\t%l\n" | LC_COLLATE=C sort | sed 's,^\./,, ; s,\([;!#$\&*<> ]\),\\\1,g' | tee $INST
+# Escape some characters in symlink names:
+find . -type l -printf "%p\t%l\n" | LC_COLLATE=C sort | sed 's,^\./,,; s,[ "#$&\x27()*;<>?[\\`{|~],\\&,g;' | tee $INST
 if [ ! "$(cat $INST)" = "" ]; then
   echo
   echo "Making symbolic link creation script:"
diff --git a/source/ap/lxc/lxc-slackware.in b/source/ap/lxc/lxc-slackware.in
index 53e5e2b1..c49366ac 100644
--- a/source/ap/lxc/lxc-slackware.in
+++ b/source/ap/lxc/lxc-slackware.in
@@ -90,6 +90,8 @@ cp $rootfs/etc/HOSTNAME $rootfs/etc/hostname
 # http://www.vislab.uq.edu.au/howto/lxc/MAKEDEV.sh
 DEV=$rootfs/dev
 mkdir -p ${DEV}
+# Make sure ${DEV}/null isn't accidentally a file by deleting it first:
+rm -f ${DEV}/null
 mknod -m 666 ${DEV}/null c 1 3
 mknod -m 666 ${DEV}/zero c 1 5
 mknod -m 666 ${DEV}/random c 1 8
diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild
index 5ac8cd87..1cd5c5e8 100755
--- a/source/ap/lxc/lxc.SlackBuild
+++ b/source/ap/lxc/lxc.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=lxc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/k/kernel-configs/config-generic-4.19.85 b/source/k/kernel-configs/config-generic-4.19.86
index 2aa9ef32..a6da7b32 100644
--- a/source/k/kernel-configs/config-generic-4.19.85
+++ b/source/k/kernel-configs/config-generic-4.19.86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.85 Kernel Configuration
+# Linux/x86 4.19.86 Kernel Configuration
 #
 
 #
@@ -5494,10 +5494,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
diff --git a/source/k/kernel-configs/config-generic-4.19.85.x64 b/source/k/kernel-configs/config-generic-4.19.86.x64
index fc4d91e3..521c7528 100644
--- a/source/k/kernel-configs/config-generic-4.19.85.x64
+++ b/source/k/kernel-configs/config-generic-4.19.86.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.85 Kernel Configuration
+# Linux/x86 4.19.86 Kernel Configuration
 #
 
 #
@@ -5464,10 +5464,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
diff --git a/source/k/kernel-configs/config-generic-smp-4.19.85-smp b/source/k/kernel-configs/config-generic-smp-4.19.86-smp
index 18a175ee..1a7d0415 100644
--- a/source/k/kernel-configs/config-generic-smp-4.19.85-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.19.86-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.85 Kernel Configuration
+# Linux/x86 4.19.86 Kernel Configuration
 #
 
 #
@@ -5541,10 +5541,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
diff --git a/source/k/kernel-configs/config-huge-4.19.85 b/source/k/kernel-configs/config-huge-4.19.86
index f91c6d9a..a8ba130c 100644
--- a/source/k/kernel-configs/config-huge-4.19.85
+++ b/source/k/kernel-configs/config-huge-4.19.86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.85 Kernel Configuration
+# Linux/x86 4.19.86 Kernel Configuration
 #
 
 #
@@ -5494,10 +5494,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
diff --git a/source/k/kernel-configs/config-huge-4.19.85.x64 b/source/k/kernel-configs/config-huge-4.19.86.x64
index d616c017..4d509284 100644
--- a/source/k/kernel-configs/config-huge-4.19.85.x64
+++ b/source/k/kernel-configs/config-huge-4.19.86.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.85 Kernel Configuration
+# Linux/x86 4.19.86 Kernel Configuration
 #
 
 #
@@ -5464,10 +5464,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
diff --git a/source/k/kernel-configs/config-huge-smp-4.19.85-smp b/source/k/kernel-configs/config-huge-smp-4.19.86-smp
index 0f109397..a1ef4ebb 100644
--- a/source/k/kernel-configs/config-huge-smp-4.19.85-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.19.86-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.85 Kernel Configuration
+# Linux/x86 4.19.86 Kernel Configuration
 #
 
 #
@@ -5541,10 +5541,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y