Tue Sep 18 19:22:30 UTC 201820180918192230

ap/dmidecode-3.2-x86_64-1.txz:  Upgraded.
ap/nano-3.1-x86_64-1.txz:  Upgraded.
ap/slackpkg-2.83.0-noarch-4.txz:  Rebuilt.
  Merged two patches from git:
  Clarify that a press of "Enter" is needed to confirm kernel change
  Mention possible stale mirror if CHECKSUMS.md5 gpg verify fails
  Thanks to Mario Preksavec and Robby Workman.
ap/sqlite-3.25.0-x86_64-1.txz:  Upgraded.
ap/xorriso-1.5.0-x86_64-1.txz:  Upgraded.
l/lmdb-0.9.22-x86_64-2.txz:  Rebuilt.
  Fixed the build script to clear out the build area properly - previously
  it was possible for binaries of the wrong $ARCH to end up in the package.
  Thanks to reddog83.
n/gnutls-3.6.3-x86_64-2.txz:  Rebuilt.
  Merged backported SSL/TLS fixes. Thanks to orbea.
n/samba-4.9.0-x86_64-2.txz:  Rebuilt.
  Recompiled in case the lmdb package was broken.

3 files changed, 66 insertions, 1 deletions

diff --git a/source/ap/slackpkg/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch b/source/ap/slackpkg/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch
new file mode 100644
index 000000000..c228d5df3
--- /dev/null
+++ b/source/ap/slackpkg/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch
@@ -0,0 +1,27 @@
+From 24ec5a28f81504c339152840c4282c77b2506398 Mon Sep 17 00:00:00 2001
+From: Mario Preksavec <mario at slackware dot hr>
+Date: Wed, 20 Jun 2018 01:27:04 -0500
+Subject: [PATCH 5/6] Clarify that a press of "Enter" is needed to confirm
+ kernel change
+
+Signed-off-by: Robby Workman <rworkman@slackware.com>
+---
+ files/post-functions.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/post-functions.sh b/files/post-functions.sh
+index b5fecd3..b3beac8 100644
+--- a/files/post-functions.sh
++++ b/files/post-functions.sh
+@@ -236,7 +236,7 @@ Your kernel image was updated, and lilo does not appear to be used on
+ your system.  You may need to adjust your boot manager (like GRUB) to 
+ boot the appropriate kernel (after generating an initrd if required)."
+ 		fi
+-		echo -e "Press any key to continue...\n "
++		echo -e "Press the \"Enter\" key to continue...\n "
+ 		read _junk
+ 	fi
+ }
+-- 
+2.18.0
+
diff --git a/source/ap/slackpkg/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch b/source/ap/slackpkg/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch
new file mode 100644
index 000000000..2ca7bedef
--- /dev/null
+++ b/source/ap/slackpkg/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch
@@ -0,0 +1,30 @@
+From ff0b9ff70a6031e712035e98b1dd2845774cb137 Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Wed, 5 Sep 2018 22:49:24 -0500
+Subject: [PATCH 6/6] Mention possible stale mirror if CHECKSUMS.md5 gpg verify
+ fails
+
+Signed-off-by: Robby Workman <rworkman@slackware.com>
+---
+ files/core-functions.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/files/core-functions.sh b/files/core-functions.sh
+index 76cab6f..908edb0 100644
+--- a/files/core-functions.sh
++++ b/files/core-functions.sh
+@@ -1067,7 +1067,10 @@ function updatefilelists()
+ 				echo -e "\
+ \n\t\tERROR: Verification of the  gpg signature on CHECKSUMS.md5\n\
+ \t\t       failed! This could mean that the file is out of date\n\
+-\t\t       or has been tampered with.\n"
++\t\t       or has been tampered with. If you use mirrors.slackware.com\n\
++\t\t       as your mirror, this could also mean that the mirror to\n\
++\t\t       which you got redirected is not yet updated with the most\n\
++\t\t       recent changes in the Slackware tree.\n"
+ 				cleanup
+ 			fi
+ 		elif [ "$SLACKKEY" != "" ]; then
+-- 
+2.18.0
+
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 2d6fe94c8..a9323d8aa 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=slackpkg
 VERSION=${VERSION:-2.83.0}
 ARCH="noarch"
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # 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
@@ -134,6 +134,14 @@ mkdir -pv $PKG/var/cache/packages
   zcat $CWD/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz | patch -p2 --verbose || exit 1
 ) || exit 1
 
+( cd $PKG/usr/libexec/slackpkg/functions.d
+  zcat $CWD/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch.gz | patch -p2 --verbose || exit 1
+) || exit 1
+
+( cd $PKG/usr/libexec/slackpkg
+  zcat $CWD/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch.gz | patch -p2 --verbose || exit 1
+) || exit 1
+
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc