From a22d1843900f65ede3f87d55207ca0b8f2a38b98 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 18 Sep 2018 19:22:30 +0000
Subject: Tue Sep 18 19:22:30 UTC 2018

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.
---
 source/a/coreutils/coreutils.SlackBuild   |  3 +++
 source/a/cpio/cpio.SlackBuild             |  3 +++
 source/a/findutils/findutils.SlackBuild   | 20 +-------------------
 source/a/gawk/gawk.SlackBuild             |  3 +++
 source/a/gettext/gettext-tools.SlackBuild |  3 +++
 source/a/gettext/gettext.SlackBuild       |  3 +++
 source/a/grep/grep.SlackBuild             |  3 +++
 source/a/grub/grub.SlackBuild             |  3 +++
 source/a/gzip/gzip.SlackBuild             |  3 +++
 source/a/lbzip2/lbzip2.SlackBuild         |  3 +++
 source/a/patch/patch.SlackBuild           |  3 +++
 source/a/sed/sed.SlackBuild               |  3 +++
 source/a/sharutils/sharutils.SlackBuild   |  3 +++
 source/a/tar/tar.SlackBuild               | 20 +-------------------
 14 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'source/a')

diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild
index 47f75266..cb282345 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 a7928361..8441f487 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 8e7d4f32..b0c0594c 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 7d55a870..121339dd 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 5d133ad9..6cf4e15f 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 93089261..a05053fb 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 cf6a352c..75f0e96b 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 26b8e51e..d7867deb 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 09b92f8c..77d12698 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 35fc9231..9dcf736f 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 8ee0d50a..125317b3 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 bf3feedc..10c3b939 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 b6dfc5ea..7c9d938d 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 3b21c7a8..6c97c24e 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
-- 
cgit v1.2.3