From 70c069bd5cf5acd2bb3b115218e801d038ec9ad6 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 26 Mar 2021 18:05:00 +0000
Subject: Fri Mar 26 18:05:00 UTC 2021

a/mkinitrd-1.4.11-x86_64-20.txz:  Rebuilt.
  mkinitrd_command_generator.sh: account for the mmc_block module having an
  internal name of "mmcblk". Thanks to Andypoo.
ap/cups-filters-1.28.8-x86_64-1.txz:  Upgraded.
l/expat-2.3.0-x86_64-1.txz:  Upgraded.
l/libvpx-1.10.0-x86_64-1.txz:  Upgraded.
l/netpbm-10.93.03-x86_64-1.txz:  Upgraded.
n/pam-krb5-4.10-x86_64-1.txz:  Upgraded.
---
 source/a/mkinitrd/mkinitrd.SlackBuild           |  2 +-
 source/a/mkinitrd/mkinitrd_command_generator.sh |  1 +
 source/ap/cups-filters/cups-filters.SlackBuild  |  2 +-
 source/l/expat/expat.SlackBuild                 |  2 +-
 source/l/libvpx/libvpx.SlackBuild               |  2 +-
 source/n/pam-krb5/pam-krb5.SlackBuild           |  2 +-
 source/n/rsync.nolchmod.diff                    | 21 ---------------------
 7 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 source/n/rsync.nolchmod.diff

(limited to 'source')

diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index fec4051f7..030f61625 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:-19}
+BUILD=${BUILD:-20}
 
 # 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 739499f16..88de76d15 100644
--- a/source/a/mkinitrd/mkinitrd_command_generator.sh
+++ b/source/a/mkinitrd/mkinitrd_command_generator.sh
@@ -212,6 +212,7 @@ determine_blockdev_drivers() {
   MLIST=$(for i in $(find /sys/block/*/ -name "device" -print0 | xargs -0 -i'{}' readlink -f '{}' | sort -u); do
     /sbin/udevadm info --query=all --path=$i --attribute-walk | \
       sed -ne 's/^[[:blank:]]\+DRIVER[S]*=="\([^"]\+\)"$/\1/p' | \
+      sed -e 's/^mmcblk$/mmc_block/' | \
       xargs -I@ /sbin/modprobe --set-version $KVER --show-depends @ \
       2>/dev/null | grep -v "builtin " | \
       while read LINE ; do 
diff --git a/source/ap/cups-filters/cups-filters.SlackBuild b/source/ap/cups-filters/cups-filters.SlackBuild
index 4b7060281..ffbe020a5 100755
--- a/source/ap/cups-filters/cups-filters.SlackBuild
+++ b/source/ap/cups-filters/cups-filters.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cups-filters
 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/l/expat/expat.SlackBuild b/source/l/expat/expat.SlackBuild
index 3de6596a3..ac9926fa2 100755
--- a/source/l/expat/expat.SlackBuild
+++ b/source/l/expat/expat.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=expat
 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/l/libvpx/libvpx.SlackBuild b/source/l/libvpx/libvpx.SlackBuild
index 2111f9a96..b61b08bcb 100755
--- a/source/l/libvpx/libvpx.SlackBuild
+++ b/source/l/libvpx/libvpx.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libvpx
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/n/pam-krb5/pam-krb5.SlackBuild b/source/n/pam-krb5/pam-krb5.SlackBuild
index c032fae59..67dbe04ba 100755
--- a/source/n/pam-krb5/pam-krb5.SlackBuild
+++ b/source/n/pam-krb5/pam-krb5.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pam-krb5
 VERSION=${VERSION:-$(echo $PKGNAM-*.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/n/rsync.nolchmod.diff b/source/n/rsync.nolchmod.diff
deleted file mode 100644
index 9fc90dd3a..000000000
--- a/source/n/rsync.nolchmod.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./rsync-3.2.3/syscall.c.orig	2020-07-27 18:36:55.000000000 -0500
-+++ ./rsync-3.2.3/syscall.c	2021-02-22 14:28:02.306029758 -0600
-@@ -232,7 +232,8 @@
- 	RETURN_ERROR_IF_RO_OR_LO;
- #ifdef HAVE_LCHMOD
- 	code = lchmod(path, mode & CHMOD_BITS);
--#else
-+	if (code < 0 && errno == ENOTSUP) {
-+#endif
- 	if (S_ISLNK(mode)) {
- # if defined HAVE_SETATTRLIST
- 		struct attrlist attrList;
-@@ -247,6 +248,8 @@
- # endif
- 	} else
- 		code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
-+#ifdef HAVE_LCHMOD
-+	}
- #endif /* !HAVE_LCHMOD */
- 	if (code != 0 && (preserve_perms || preserve_executability))
- 		return code;
-- 
cgit v1.2.3