From 3e4907157f8f424eb08e8f8c53cd9250f85f6a53 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 12 Oct 2021 19:22:20 +0000
Subject: Tue Oct 12 19:22:20 UTC 2021

a/kernel-firmware-20211012_b563148-noarch-1.txz:  Upgraded.
a/mkinitrd-1.4.11-x86_64-26.txz:  Rebuilt.
  Don't include 40-usb_modeswitch.rules on the initrd. Thanks to LuckyCyborg.
d/scons-4.2.0-x86_64-1.txz:  Upgraded.
l/python-charset-normalizer-2.0.7-x86_64-1.txz:  Upgraded.
xfce/mousepad-0.5.7-x86_64-2.txz:  Rebuilt.
  Added plugins directory. Thanks to Roman Dyaba.
---
 source/a/mkinitrd/0003-blacklist.40-usb_modeswitch.rules.patch | 10 ++++++++++
 source/a/mkinitrd/mkinitrd.SlackBuild                          |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 source/a/mkinitrd/0003-blacklist.40-usb_modeswitch.rules.patch

(limited to 'source/a')

diff --git a/source/a/mkinitrd/0003-blacklist.40-usb_modeswitch.rules.patch b/source/a/mkinitrd/0003-blacklist.40-usb_modeswitch.rules.patch
new file mode 100644
index 000000000..86f496e8d
--- /dev/null
+++ b/source/a/mkinitrd/0003-blacklist.40-usb_modeswitch.rules.patch
@@ -0,0 +1,10 @@
+--- ./mkinitrd.orig	2021-10-12 13:50:48.059708275 -0500
++++ ./mkinitrd	2021-10-12 13:51:36.482705596 -0500
+@@ -69,6 +69,7 @@
+   check-mtp-device \
+   check-ptp-camera \
+   udev-configure-printer \
++  rules.d/40-usb_modeswitch.rules \
+   rules.d/60-openobex.rules \
+   rules.d/73-seat-late.rules \
+   rules.d/85-regulatory.rules \
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 58dc341de..6b5070396 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:-25}
+BUILD=${BUILD:-26}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -122,6 +122,8 @@ chmod 755 $PKG/sbin/mkinitrd
 ( cd $PKG/sbin ; zcat $CWD/mkinitrd.tempfile.to.mktemp.patch.gz | patch --verbose || exit 1) || exit 1
 # Patch mkinitrd to bail on no temp directory:
 ( cd $PKG/sbin ; zcat $CWD/0002-bail-if-temp-dir-is-not-created.patch.gz | patch -p1 --verbose || exit 1) || exit 1
+# Don't include 40-usb_modeswitch.rules on the initrd:
+( cd $PKG/sbin ; zcat $CWD/0003-blacklist.40-usb_modeswitch.rules.patch.gz | patch -p1 --verbose || exit 1) || exit 1
 rm -f $PKG/sbin/mkinitrd.orig
 
 mkdir -p $PKG/usr/man/man{5,8}
-- 
cgit v1.2.3-79-gdb01