From c702f4c8b2340e0db21698402307c91e600b3451 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 28 Mar 2021 18:58:24 +0000
Subject: Sun Mar 28 18:58:24 UTC 2021

a/mkinitrd-1.4.11-x86_64-21.txz:  Rebuilt.
  mkinitrd_command_generator.sh: use blkid options to ensure that the correct
  root device is matched. Thanks to eduardr and shruggy.
d/ccache-4.2.1-x86_64-1.txz:  Upgraded.
d/re2c-2.1.1-x86_64-1.txz:  Upgraded.
l/gegl-0.4.30-x86_64-1.txz:  Upgraded.
n/epic5-2.1.4-x86_64-1.txz:  Upgraded.
n/fetchmail-6.4.18-x86_64-1.txz:  Upgraded.
n/whois-5.5.9-x86_64-1.txz:  Upgraded.
t/fig2dev-3.2.8a-x86_64-1.txz:  Upgraded.
t/xfig-3.2.8a-x86_64-1.txz:  Upgraded.
---
 source/a/mkinitrd/mkinitrd.SlackBuild           | 2 +-
 source/a/mkinitrd/mkinitrd_command_generator.sh | 2 +-
 source/d/ccache/ccache.SlackBuild               | 2 +-
 source/l/gegl/gegl.SlackBuild                   | 2 +-
 source/t/fig2dev/fig2dev.SlackBuild             | 2 +-
 source/t/xfig/xfig.SlackBuild                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source')

diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 030f61625..ce801c575 100755
--- a/source/a/mkinitrd/mkinitrd.SlackBuild
+++ b/source/a/mkinitrd/mkinitrd.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mkinitrd
 VERSION=${VERSION:-1.4.11}
 BB=1.32.1
-BUILD=${BUILD:-20}
+BUILD=${BUILD:-21}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh
index 88de76d15..e58d197a5 100644
--- a/source/a/mkinitrd/mkinitrd_command_generator.sh
+++ b/source/a/mkinitrd/mkinitrd_command_generator.sh
@@ -171,7 +171,7 @@ get_root_device() {
       DKEY=$(echo $RD | cut -f1 -d=)
       # The value can be LABEL=foo or LABEL='foo' or LABEL="foo"
       DVAL=$(echo $RD | cut -f2 -d= | tr -d "'\042")
-      RD=$(/sbin/blkid | grep -w $DKEY | grep -w $DVAL | cut -f1 -d:)
+      RD=$(/sbin/blkid --match-token $DKEY=$DVAL --list-one --output device)
     fi
   else
     RD=$(grep -m1 "^/dev/.*[[:blank:]]/[[:blank:]]" /proc/mounts | cut -f1 -d' ')
diff --git a/source/d/ccache/ccache.SlackBuild b/source/d/ccache/ccache.SlackBuild
index 3cae12ae6..d2c0fc340 100755
--- a/source/d/ccache/ccache.SlackBuild
+++ b/source/d/ccache/ccache.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ccache
 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/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild
index c583158cd..673123432 100755
--- a/source/l/gegl/gegl.SlackBuild
+++ b/source/l/gegl/gegl.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gegl
 VERSION=${VERSION:-$(echo gegl-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/t/fig2dev/fig2dev.SlackBuild b/source/t/fig2dev/fig2dev.SlackBuild
index 40aab9d62..28c3bb470 100755
--- a/source/t/fig2dev/fig2dev.SlackBuild
+++ b/source/t/fig2dev/fig2dev.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fig2dev
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/t/xfig/xfig.SlackBuild b/source/t/xfig/xfig.SlackBuild
index e4fef83d7..9bd98398e 100755
--- a/source/t/xfig/xfig.SlackBuild
+++ b/source/t/xfig/xfig.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfig
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-- 
cgit v1.2.3