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.

42 files changed, 221 insertions, 124 deletions

diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild
index 47f75266d..cb2823459 100755
--- a/source/a/coreutils/coreutils.SlackBuild
+++ b/source/a/coreutils/coreutils.SlackBuild
@@ -69,6 +69,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild
index a79283619..8441f487a 100755
--- a/source/a/cpio/cpio.SlackBuild
+++ b/source/a/cpio/cpio.SlackBuild
@@ -63,6 +63,9 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
diff --git a/source/a/findutils/findutils.SlackBuild b/source/a/findutils/findutils.SlackBuild
index 8e7d4f329..b0c0594cf 100755
--- a/source/a/findutils/findutils.SlackBuild
+++ b/source/a/findutils/findutils.SlackBuild
@@ -58,25 +58,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
 fi
 
 # Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
-  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
-    continue
-  fi
-  if [ -z "$REVERSE_PATH" ]; then
-    REVERSE_PATH="$path_element"
-  else
-    REVERSE_PATH="${REVERSE_PATH}:$path_element"
-  fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
-  if [ -z "$FORWARD_PATH" ]; then
-    FORWARD_PATH="$path_element"
-  else
-    FORWARD_PATH="${FORWARD_PATH}:$path_element"
-  fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
diff --git a/source/a/gawk/gawk.SlackBuild b/source/a/gawk/gawk.SlackBuild
index 7d55a8704..121339dd8 100755
--- a/source/a/gawk/gawk.SlackBuild
+++ b/source/a/gawk/gawk.SlackBuild
@@ -63,6 +63,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild
index 5d133ad95..6cf4e15f5 100755
--- a/source/a/gettext/gettext-tools.SlackBuild
+++ b/source/a/gettext/gettext-tools.SlackBuild
@@ -66,6 +66,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild
index 930892614..a05053fb2 100755
--- a/source/a/gettext/gettext.SlackBuild
+++ b/source/a/gettext/gettext.SlackBuild
@@ -66,6 +66,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
diff --git a/source/a/grep/grep.SlackBuild b/source/a/grep/grep.SlackBuild
index cf6a352c1..75f0e96be 100755
--- a/source/a/grep/grep.SlackBuild
+++ b/source/a/grep/grep.SlackBuild
@@ -63,6 +63,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild
index 26b8e51e6..d7867deba 100755
--- a/source/a/grub/grub.SlackBuild
+++ b/source/a/grub/grub.SlackBuild
@@ -82,6 +82,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild
index 09b92f8cf..77d12698a 100755
--- a/source/a/gzip/gzip.SlackBuild
+++ b/source/a/gzip/gzip.SlackBuild
@@ -59,6 +59,9 @@ else
   SLKCFLAGS="-O2"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
diff --git a/source/a/lbzip2/lbzip2.SlackBuild b/source/a/lbzip2/lbzip2.SlackBuild
index 35fc92310..9dcf736fb 100755
--- a/source/a/lbzip2/lbzip2.SlackBuild
+++ b/source/a/lbzip2/lbzip2.SlackBuild
@@ -67,6 +67,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
diff --git a/source/a/patch/patch.SlackBuild b/source/a/patch/patch.SlackBuild
index 8ee0d50a0..125317b3f 100755
--- a/source/a/patch/patch.SlackBuild
+++ b/source/a/patch/patch.SlackBuild
@@ -60,6 +60,9 @@ else
   SLKCFLAGS="-O2"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 cd $TMP
 rm -rf patch-${VERSION}
 tar xvf $CWD/patch-${VERSION}.tar.?z || exit 1
diff --git a/source/a/sed/sed.SlackBuild b/source/a/sed/sed.SlackBuild
index bf3feedcd..10c3b9391 100755
--- a/source/a/sed/sed.SlackBuild
+++ b/source/a/sed/sed.SlackBuild
@@ -58,6 +58,9 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $PKG $PKG
 
diff --git a/source/a/sharutils/sharutils.SlackBuild b/source/a/sharutils/sharutils.SlackBuild
index b6dfc5eae..7c9d938d3 100755
--- a/source/a/sharutils/sharutils.SlackBuild
+++ b/source/a/sharutils/sharutils.SlackBuild
@@ -58,6 +58,9 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild
index 3b21c7a8b..6c97c24e6 100755
--- a/source/a/tar/tar.SlackBuild
+++ b/source/a/tar/tar.SlackBuild
@@ -51,25 +51,7 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-tar
 
 # Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
-  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
-    continue
-  fi
-  if [ -z "$REVERSE_PATH" ]; then
-    REVERSE_PATH="$path_element"
-  else
-    REVERSE_PATH="${REVERSE_PATH}:$path_element"
-  fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
-  if [ -z "$FORWARD_PATH" ]; then
-    FORWARD_PATH="$path_element"
-  else
-    FORWARD_PATH="${FORWARD_PATH}:$path_element"
-  fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
diff --git a/source/ap/acct/acct.SlackBuild b/source/ap/acct/acct.SlackBuild
index ae09f5ad1..7788a3ee4 100755
--- a/source/ap/acct/acct.SlackBuild
+++ b/source/ap/acct/acct.SlackBuild
@@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-acct
 
diff --git a/source/ap/diffutils/diffutils.SlackBuild b/source/ap/diffutils/diffutils.SlackBuild
index fbfb0bb02..b257322bb 100755
--- a/source/ap/diffutils/diffutils.SlackBuild
+++ b/source/ap/diffutils/diffutils.SlackBuild
@@ -59,6 +59,9 @@ else
   SLKCFLAGS="-O2"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
diff --git a/source/ap/dmidecode/dmidecode.SlackBuild b/source/ap/dmidecode/dmidecode.SlackBuild
index 0b338c75d..329d6dc3b 100755
--- a/source/ap/dmidecode/dmidecode.SlackBuild
+++ b/source/ap/dmidecode/dmidecode.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dmidecode
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/ap/dmidecode/dmidecode.url b/source/ap/dmidecode/dmidecode.url
new file mode 100644
index 000000000..66dd9cd46
--- /dev/null
+++ b/source/ap/dmidecode/dmidecode.url
@@ -0,0 +1 @@
+http://download.savannah.gnu.org/releases/dmidecode/
diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild
index dd3faec2b..080d97594 100755
--- a/source/ap/man-db/man-db.SlackBuild
+++ b/source/ap/man-db/man-db.SlackBuild
@@ -103,25 +103,7 @@ else
 fi
 
 # Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
-  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
-    continue
-  fi
-  if [ -z "$REVERSE_PATH" ]; then
-    REVERSE_PATH="$path_element"
-  else
-    REVERSE_PATH="${REVERSE_PATH}:$path_element"
-  fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
-  if [ -z "$FORWARD_PATH" ]; then
-    FORWARD_PATH="$path_element"
-  else
-    FORWARD_PATH="${FORWARD_PATH}:$path_element"
-  fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 # By default, install binaries to /opt, so as not to stomp on Slackware's
 # man pkg. We will have to include a /etc/profile.d script to set PATH,
diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild
index e0816b313..3635bb7dc 100755
--- a/source/ap/nano/nano.SlackBuild
+++ b/source/ap/nano/nano.SlackBuild
@@ -74,25 +74,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 
 # Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
-  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
-    continue
-  fi
-  if [ -z "$REVERSE_PATH" ]; then
-    REVERSE_PATH="$path_element"
-  else
-    REVERSE_PATH="${REVERSE_PATH}:$path_element"
-  fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
-  if [ -z "$FORWARD_PATH" ]; then
-    FORWARD_PATH="$path_element"
-  else
-    FORWARD_PATH="${FORWARD_PATH}:$path_element"
-  fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
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
diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild
index 7675f86d6..79b6a5fcd 100755
--- a/source/ap/texinfo/texinfo.SlackBuild
+++ b/source/ap/texinfo/texinfo.SlackBuild
@@ -66,6 +66,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-texinfo
 
diff --git a/source/ap/xorriso/xorriso.SlackBuild b/source/ap/xorriso/xorriso.SlackBuild
index 164f78ae6..9282a0ec2 100755
--- a/source/ap/xorriso/xorriso.SlackBuild
+++ b/source/ap/xorriso/xorriso.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xorriso
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -75,7 +75,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild
index 713fda617..03b8b41b8 100755
--- a/source/d/bison/bison.SlackBuild
+++ b/source/d/bison/bison.SlackBuild
@@ -78,25 +78,7 @@ find . \
   -exec chmod 644 {} \;
 
 # Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
-  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
-    continue
-  fi
-  if [ -z "$REVERSE_PATH" ]; then
-    REVERSE_PATH="$path_element"
-  else
-    REVERSE_PATH="${REVERSE_PATH}:$path_element"
-  fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
-  if [ -z "$FORWARD_PATH" ]; then
-    FORWARD_PATH="$path_element"
-  else
-    FORWARD_PATH="${FORWARD_PATH}:$path_element"
-  fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/d/clisp/clisp.SlackBuild b/source/d/clisp/clisp.SlackBuild
index 4205aa137..3b210fdac 100755
--- a/source/d/clisp/clisp.SlackBuild
+++ b/source/d/clisp/clisp.SlackBuild
@@ -61,6 +61,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 TMP=${TMP:-/tmp}
diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index 41b0fd5d7..e697bf4a4 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -56,25 +56,7 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-gdb
 
 # Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
-  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
-    continue
-  fi
-  if [ -z "$REVERSE_PATH" ]; then
-    REVERSE_PATH="$path_element"
-  else
-    REVERSE_PATH="${REVERSE_PATH}:$path_element"
-  fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
-  if [ -z "$FORWARD_PATH" ]; then
-    FORWARD_PATH="$path_element"
-  else
-    FORWARD_PATH="${FORWARD_PATH}:$path_element"
-  fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild
index f90537a15..ff00e4190 100755
--- a/source/d/guile/guile.SlackBuild
+++ b/source/d/guile/guile.SlackBuild
@@ -65,6 +65,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 cd $TMP
 rm -rf guile-$VERSION
 tar xvf $CWD/guile-$VERSION.tar.?z || exit 1
diff --git a/source/d/m4/m4.SlackBuild b/source/d/m4/m4.SlackBuild
index 0bc3f10fc..e297a1830 100755
--- a/source/d/m4/m4.SlackBuild
+++ b/source/d/m4/m4.SlackBuild
@@ -63,6 +63,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
diff --git a/source/d/rcs/rcs.SlackBuild b/source/d/rcs/rcs.SlackBuild
index f2348714b..d0bc509e8 100755
--- a/source/d/rcs/rcs.SlackBuild
+++ b/source/d/rcs/rcs.SlackBuild
@@ -73,6 +73,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
diff --git a/source/e/emacs/emacs.SlackBuild b/source/e/emacs/emacs.SlackBuild
index a4934dffe..51a29e901 100755
--- a/source/e/emacs/emacs.SlackBuild
+++ b/source/e/emacs/emacs.SlackBuild
@@ -72,6 +72,9 @@ else
   SLKCFLAGS="-O2"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 TMP=${TMP:-/tmp}
diff --git a/source/l/libtasn1/libtasn1.SlackBuild b/source/l/libtasn1/libtasn1.SlackBuild
index ad3c897ac..6cd137054 100755
--- a/source/l/libtasn1/libtasn1.SlackBuild
+++ b/source/l/libtasn1/libtasn1.SlackBuild
@@ -59,6 +59,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
diff --git a/source/l/libunistring/libunistring.SlackBuild b/source/l/libunistring/libunistring.SlackBuild
index 047a9ae68..8565e584b 100755
--- a/source/l/libunistring/libunistring.SlackBuild
+++ b/source/l/libunistring/libunistring.SlackBuild
@@ -73,6 +73,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
diff --git a/source/l/lmdb/lmdb.SlackBuild b/source/l/lmdb/lmdb.SlackBuild
index db62820d3..d71b27054 100755
--- a/source/l/lmdb/lmdb.SlackBuild
+++ b/source/l/lmdb/lmdb.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=lmdb
 VERSION=${VERSION:-$(echo LMDB_*.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
@@ -74,9 +74,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf $PKGNAM-$VERSION
+rm -rf lmdb-*${VERSION}
 tar xvf $CWD/LMDB_$VERSION.tar.?z || exit 1
-cd lmdb-LMDB_$VERSION || exit 1
+cd lmdb-*${VERSION} || exit 1
 
 zcat $CWD/lmdb-make.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/lmdb-s390-check.patch.gz | patch -p1 --verbose || exit 1
diff --git a/source/l/parted/parted.SlackBuild b/source/l/parted/parted.SlackBuild
index fb77a67ab..ecbdafe58 100755
--- a/source/l/parted/parted.SlackBuild
+++ b/source/l/parted/parted.SlackBuild
@@ -63,6 +63,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
diff --git a/source/n/gnutls/gnutls-3.6.3-backport-upstream-fixes.patch b/source/n/gnutls/gnutls-3.6.3-backport-upstream-fixes.patch
new file mode 100644
index 000000000..a7aad333c
--- /dev/null
+++ b/source/n/gnutls/gnutls-3.6.3-backport-upstream-fixes.patch
@@ -0,0 +1,55 @@
+diff --git a/lib/cert-cred.c b/lib/cert-cred.c
+index d3777e51f..2150e903f 100644
+--- a/lib/cert-cred.c
++++ b/lib/cert-cred.c
+@@ -387,6 +387,13 @@ static int call_legacy_cert_cb1(gnutls_session_t session,
+ 	if (ret < 0)
+ 		return gnutls_assert_val(ret);
+ 
++	if (st2.ncerts == 0) {
++		*pcert_length = 0;
++		*ocsp_length = 0;
++		*privkey = NULL;
++		return 0;
++	}
++
+ 	if (st2.cert_type != GNUTLS_CRT_X509) {
+ 		gnutls_assert();
+ 		ret = GNUTLS_E_INVALID_REQUEST;
+@@ -503,7 +510,10 @@ void gnutls_certificate_set_retrieve_function
+      gnutls_certificate_retrieve_function * func)
+ {
+ 	cred->legacy_cert_cb1 = func;
+-	cred->get_cert_callback3 = call_legacy_cert_cb1;
++	if (!func)
++		cred->get_cert_callback3 = NULL;
++	else
++		cred->get_cert_callback3 = call_legacy_cert_cb1;
+ }
+ 
+ static int call_legacy_cert_cb2(gnutls_session_t session,
+@@ -578,7 +588,10 @@ void gnutls_certificate_set_retrieve_function2
+      gnutls_certificate_retrieve_function2 * func) 
+ {
+ 	cred->legacy_cert_cb2 = func;
+-	cred->get_cert_callback3 = call_legacy_cert_cb2;
++	if (!func)
++		cred->get_cert_callback3 = NULL;
++	else
++		cred->get_cert_callback3 = call_legacy_cert_cb2;
+ }
+ 
+ /**
+diff --git a/lib/hello_ext.c b/lib/hello_ext.c
+index a3027130a..f72afe77f 100644
+--- a/lib/hello_ext.c
++++ b/lib/hello_ext.c
+@@ -208,7 +208,7 @@ int hello_ext_parse(void *_ctx, unsigned tls_id, const uint8_t *data, unsigned d
+ 
+ 	if (tls_id == PRE_SHARED_KEY_TLS_ID) {
+ 		ctx->seen_pre_shared_key = 1;
+-	} else if (ctx->seen_pre_shared_key) {
++	} else if (ctx->seen_pre_shared_key && session->security_parameters.entity == GNUTLS_SERVER) {
+ 		/* the pre-shared key extension must always be the last one,
+ 		 * draft-ietf-tls-tls13-28: 4.2.11 */
+ 		return gnutls_assert_val(GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER);
diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild
index 331b9b94f..11320730f 100755
--- a/source/n/gnutls/gnutls.SlackBuild
+++ b/source/n/gnutls/gnutls.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gnutls
 VERSION=${VERSION:-$(echo gnutls-*.tar.xz | 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
@@ -60,6 +60,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
@@ -78,6 +81,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# This patch addresses some issues with SSL/TLS breakage in 3.6.3:
+zcat $CWD/gnutls-3.6.3-backport-upstream-fixes.patch.gz | patch -p1 --verbose || exit 1
+
 # Need to reconf to find guile-2.2.x:
 autoreconf -vif
 
diff --git a/source/n/lftp/lftp.SlackBuild b/source/n/lftp/lftp.SlackBuild
index d98953be3..865e1c4b1 100755
--- a/source/n/lftp/lftp.SlackBuild
+++ b/source/n/lftp/lftp.SlackBuild
@@ -63,6 +63,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index caaa4d195..4cfc9510f 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=samba
 VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -e $CWD/machine.conf ]; then
   . $CWD/machine.conf ]
diff --git a/source/n/wget/wget.SlackBuild b/source/n/wget/wget.SlackBuild
index 0d15aab3a..39b814192 100755
--- a/source/n/wget/wget.SlackBuild
+++ b/source/n/wget/wget.SlackBuild
@@ -58,6 +58,9 @@ else
   SLKCFLAGS="-O2"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-wget
 
diff --git a/source/xap/gv/gv.SlackBuild b/source/xap/gv/gv.SlackBuild
index 46f76aa99..67e43dbaf 100755
--- a/source/xap/gv/gv.SlackBuild
+++ b/source/xap/gv/gv.SlackBuild
@@ -61,6 +61,9 @@ else
   SLKCFLAGS="-O2"
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1