From 3be7c5fe3b6a961dac28eb856ed2d8ca0bd0e2c9 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 15 Dec 2019 18:20:57 +0000
Subject: Sun Dec 15 18:20:57 UTC 2019

a/kernel-firmware-20191215_eefb5f7-noarch-1.txz:  Upgraded.
a/mcelog-167-x86_64-1.txz:  Upgraded.
a/mkinitrd-1.4.11-x86_64-14.txz:  Rebuilt.
  Patched init to fix the case where -T and -C options are used with UUID=.
  Thanks to davjohn and GazL.
ap/cups-filters-1.26.0-x86_64-1.txz:  Upgraded.
d/re2c-1.3-x86_64-1.txz:  Upgraded.
l/fuse3-3.9.0-x86_64-1.txz:  Upgraded.
n/mutt-1.13.1-x86_64-1.txz:  Upgraded.
---
 .../0001-Fix-LUKSTRIM-with-C-T-and-UUID.patch      | 31 ++++++++++++++++++++++
 source/a/mkinitrd/mkinitrd.SlackBuild              |  7 +++--
 source/l/fuse3/fuse3.SlackBuild                    |  2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 source/a/mkinitrd/0001-Fix-LUKSTRIM-with-C-T-and-UUID.patch

(limited to 'source')

diff --git a/source/a/mkinitrd/0001-Fix-LUKSTRIM-with-C-T-and-UUID.patch b/source/a/mkinitrd/0001-Fix-LUKSTRIM-with-C-T-and-UUID.patch
new file mode 100644
index 000000000..8166d9ffd
--- /dev/null
+++ b/source/a/mkinitrd/0001-Fix-LUKSTRIM-with-C-T-and-UUID.patch
@@ -0,0 +1,31 @@
+--- ./init.orig	2018-04-18 13:55:09.661574866 -0500
++++ ./init	2019-12-15 12:09:45.337013433 -0600
+@@ -219,11 +219,15 @@
+     fi
+ 
+     LUKSLIST_DEFERRED=""
+-    LUKSLIST=$(echo $LUKSDEV | tr -s ':' ' ')
++    for dev in $(echo $LUKSDEV | tr -s ':' ' ') ; do
++      LUKSLIST="$LUKSLIST $(findfs $dev)" 
++    done
++
++    for dev in $(echo $LUKSTRIM | tr -s ':' ' ') ; do
++      TRIMLIST="$TRIMLIST $(findfs $dev)" 
++    done
++
+     for LUKSDEV in $LUKSLIST ; do
+-      if echo $LUKSDEV | grep -q "LABEL=" || echo $LUKSDEV | grep -q "UUID=" ; then
+-        LUKSDEV=$(findfs $LUKSDEV)
+-      fi
+       if /sbin/cryptsetup isLuks ${LUKSDEV} 1>/dev/null 2>/dev/null ; then
+         if echo $ROOTDEV | grep -q "LABEL=" || echo $ROOTDEV | grep -q "UUID=" ; then
+           CRYPTDEV="luks$(basename $LUKSDEV)"
+@@ -232,7 +236,7 @@
+         else
+           CRYPTDEV="luks$(basename $LUKSDEV)"
+         fi
+-        if echo $LUKSTRIM | grep -wq $LUKSDEV 2>/dev/null ; then 
++        if echo "$TRIMLIST" | grep -wq "$LUKSDEV" 2>/dev/null ; then 
+           LUKSOPTS="--allow-discards"
+         else
+           LUKSOPTS=""
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 550576038..20965e3ab 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.30.1
-BUILD=${BUILD:-13}
+BUILD=${BUILD:-14}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -93,12 +93,15 @@ chmod 644 $PKG/usr/share/mkinitrd/keymaps.tar.gz
   tar xf $CWD/_initrd-tree.tar.gz
   cat $CWD/init > init
 
+  # Patch init:
+  zcat $CWD/0001-Fix-LUKSTRIM-with-C-T-and-UUID.patch.gz | patch -p1 --verbose || exit 1
+
   # These are useful for ARM:
   mknod -m 644 dev/random c 1 8
   mknod -m 644 dev/urandom c 1 9
 
   tar czf ../initrd-tree.tar.gz .
-)
+) || exit 1
 rm -rf $PKG/usr/share/mkinitrd/initrd-tree
 
 # Add busybox docs:
diff --git a/source/l/fuse3/fuse3.SlackBuild b/source/l/fuse3/fuse3.SlackBuild
index 7a85f8c28..054179b2c 100755
--- a/source/l/fuse3/fuse3.SlackBuild
+++ b/source/l/fuse3/fuse3.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=fuse3
 SRCNAM=fuse
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
-- 
cgit v1.2.3