From abdca401c7c45e652987c030a41f12408b916eee Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 27 Apr 2021 19:19:28 +0000
Subject: Tue Apr 27 19:19:28 UTC 2021

a/mkinitrd-1.4.11-x86_64-24.txz:  Rebuilt.
  Change mkinitrd shebang to #!/bin/bash. Thanks to mumahendras3.
  Still, don't point /bin/sh at a shell other than bash.
  Only include dm-snapshot if LVM is included. Thanks to j12i.
a/tcsh-6.22.04-x86_64-1.txz:  Upgraded.
ap/mariadb-10.6.0-x86_64-1.txz:  Upgraded.
  Removed TokuDB stuff from rc.mysqld. Thanks to gsl.
  This update fixes the illegal instruction regession on 32-bit with processors
  that do not support SSE4.1 instructions.
  Thanks to Noel and Charlie Wilder for reporting the issue upstream
  and Matteo Bernardini for helping with the debugging.
  And of course, thanks to the MariaDB upstream developers. :-)
---
 source/a/mkinitrd/mkinitrd            | 9 ++++++---
 source/a/mkinitrd/mkinitrd.SlackBuild | 2 +-
 source/a/tcsh/tcsh.SlackBuild         | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'source/a')

diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd
index 7a8d772a..3c90f06b 100644
--- a/source/a/mkinitrd/mkinitrd
+++ b/source/a/mkinitrd/mkinitrd
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
 # Copyright 2004  Patrick J. Volkerding, Concord, CA, USA
 # Copyright 2007, 2008, 2009, 2010, 2011, 2015, 2016, 2017  Patrick J. Volkerding, Sebeka, MN, USA
@@ -653,8 +653,11 @@ if [ ! -z "$CRYPT" -o ! -z "$LVM" ]; then
   elif ! echo ${MODULE_LIST} | grep -q dm-mod ; then
     MODULE_LIST="$MODULE_LIST:dm-mod"
   fi
-  if ! echo ${MODULE_LIST} | grep -q dm-snapshot ; then
-    MODULE_LIST="$MODULE_LIST:dm-snapshot"
+  # Ensure that dm-snapshot is included if LVM is used:
+  if [ ! -z "$LVM" ]; then
+    if ! echo ${MODULE_LIST} | grep -q dm-snapshot ; then
+      MODULE_LIST="$MODULE_LIST:dm-snapshot"
+    fi
   fi
   mkdir -p $SOURCE_TREE/lib/udev/rules.d
   echo 'KERNEL=="dm-[0-9]*", OPTIONS+="db_persist"' > \
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 258146ec..232dc6ac 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:-23}
+BUILD=${BUILD:-24}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild
index c9602c84..a681a664 100755
--- a/source/a/tcsh/tcsh.SlackBuild
+++ b/source/a/tcsh/tcsh.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tcsh
 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