11 files changed, 78 insertions, 10 deletions
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 8fd278be2..258146ecf 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:-22}
+BUILD=${BUILD:-23}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -120,6 +120,7 @@ chmod 755 $PKG/sbin/mkinitrd
 
 # Patch to switch to mktemp:
 ( cd $PKG/sbin ; zcat $CWD/mkinitrd.tempfile.to.mktemp.patch.gz | patch --verbose || exit 1) || exit 1
+rm -f $PKG/sbin/mkinitrd.orig
 
 mkdir -p $PKG/usr/man/man{5,8}
 cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz
diff --git a/source/k/kernel-configs/config-generic-5.10.30 b/source/k/kernel-configs/config-generic-5.10.31
index 67aedf839..613e038c8 100644
--- a/source/k/kernel-configs/config-generic-5.10.30
+++ b/source/k/kernel-configs/config-generic-5.10.31
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.30 Kernel Configuration
+# Linux/x86 5.10.31 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-5.10.30.x64 b/source/k/kernel-configs/config-generic-5.10.31.x64
index c914d9d2f..50be57f0d 100644
--- a/source/k/kernel-configs/config-generic-5.10.30.x64
+++ b/source/k/kernel-configs/config-generic-5.10.31.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.30 Kernel Configuration
+# Linux/x86 5.10.31 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-5.10.30-smp b/source/k/kernel-configs/config-generic-smp-5.10.31-smp
index 97a210968..c09d11a5e 100644
--- a/source/k/kernel-configs/config-generic-smp-5.10.30-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.10.31-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.30 Kernel Configuration
+# Linux/x86 5.10.31 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.10.30 b/source/k/kernel-configs/config-huge-5.10.31
index 0fd787c07..1d1158ccc 100644
--- a/source/k/kernel-configs/config-huge-5.10.30
+++ b/source/k/kernel-configs/config-huge-5.10.31
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.30 Kernel Configuration
+# Linux/x86 5.10.31 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.10.30.x64 b/source/k/kernel-configs/config-huge-5.10.31.x64
index 61206e4e1..f4bdf5635 100644
--- a/source/k/kernel-configs/config-huge-5.10.30.x64
+++ b/source/k/kernel-configs/config-huge-5.10.31.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.30 Kernel Configuration
+# Linux/x86 5.10.31 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-5.10.30-smp b/source/k/kernel-configs/config-huge-smp-5.10.31-smp
index 678788263..22d1d87ad 100644
--- a/source/k/kernel-configs/config-huge-smp-5.10.30-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.10.31-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.30 Kernel Configuration
+# Linux/x86 5.10.31 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/l/libusb/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch b/source/l/libusb/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch
new file mode 100644
index 000000000..739d41c40
--- /dev/null
+++ b/source/l/libusb/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch
@@ -0,0 +1,65 @@
+From f6d2cb561402c3b6d3627c0eb89e009b503d9067 Mon Sep 17 00:00:00 2001
+From: Chris Dickens <christopher.a.dickens@gmail.com>
+Date: Sun, 13 Dec 2020 15:49:19 -0800
+Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for
+ multi-configuration devices
+
+Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device
+initialization") introduced a regression for devices with multiple
+configurations. The logic that verifies the reported length of the
+configuration descriptors failed to count the length of the
+configuration descriptor itself and would truncate the actual length by
+9 bytes, leading to a parsing error for subsequent descriptors.
+
+Closes #825
+
+Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
+---
+ libusb/os/linux_usbfs.c | 12 ++++++++----
+ libusb/version_nano.h   |  2 +-
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
+index fb2ed53a..4d2dc8d6 100644
+--- a/libusb/os/linux_usbfs.c
++++ b/libusb/os/linux_usbfs.c
+@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx,
+ 	uint8_t *buffer, size_t len)
+ {
+ 	struct usbi_descriptor_header *header;
+-	int offset = 0;
++	int offset;
++
++	/* Start seeking past the config descriptor */
++	offset = LIBUSB_DT_CONFIG_SIZE;
++	buffer += LIBUSB_DT_CONFIG_SIZE;
++	len -= LIBUSB_DT_CONFIG_SIZE;
+ 
+ 	while (len > 0) {
+ 		if (len < 2) {
+@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
+ 		}
+ 
+ 		if (priv->sysfs_dir) {
+-			 /*
++			/*
+ 			 * In sysfs wTotalLength is ignored, instead the kernel returns a
+ 			 * config descriptor with verified bLength fields, with descriptors
+ 			 * with an invalid bLength removed.
+@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
+ 			int offset;
+ 
+ 			if (num_configs > 1 && idx < num_configs - 1) {
+-				offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
+-							     remaining - LIBUSB_DT_CONFIG_SIZE);
++				offset = seek_to_next_config(ctx, buffer, remaining);
+ 				if (offset < 0)
+ 					return offset;
+ 				sysfs_config_len = (uint16_t)offset;
+diff --git a/libusb/version_nano.h b/libusb/version_nano.h
+index 61a0a700..578b0979 100644
+--- a/libusb/version_nano.h
++++ b/libusb/version_nano.h
+@@ -1 +1 @@
+-#define LIBUSB_NANO 11584
++#define LIBUSB_NANO 11586
diff --git a/source/l/libusb/libusb.SlackBuild b/source/l/libusb/libusb.SlackBuild
index 0293c0558..c8c429c68 100755
--- a/source/l/libusb/libusb.SlackBuild
+++ b/source/l/libusb/libusb.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libusb
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -77,6 +77,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+zcat $CWD/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index f3eaba9aa..0476a7b8c 100755
--- a/source/n/network-scripts/network-scripts.SlackBuild
+++ b/source/n/network-scripts/network-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=network-scripts
 VERSION=${VERSION:-15.0}
 ARCH=noarch
-BUILD=${BUILD:-15}
+BUILD=${BUILD:-16}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
diff --git a/source/n/network-scripts/scripts/netconfig b/source/n/network-scripts/scripts/netconfig
index f3e7445d6..bb11b3eba 100644
--- a/source/n/network-scripts/scripts/netconfig
+++ b/source/n/network-scripts/scripts/netconfig
@@ -617,7 +617,7 @@ space delimited, IPv4 addresses with netmasks in the format:
   <IP address>/<CIDR netmask>
 For example:
   111.112.113.114/24  or  111.112.113.114/24 10.0.1.114/8
-Old style netmask 255.255.255.0 is equilivant of 24 in CIDR style.
+Old style netmask 255.255.255.0 is equivalent of 24 in CIDR style.
 If a netmask is not specified a default of 24 will be used.
 
 The first address entered will become the primary IPv4 address