7 files changed, 54 insertions, 45 deletions
diff --git a/source/d/autoconf/autoconf.SlackBuild b/source/d/autoconf/autoconf.SlackBuild
index f8c883698..59093015d 100755
--- a/source/d/autoconf/autoconf.SlackBuild
+++ b/source/d/autoconf/autoconf.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=autoconf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild
index 6fbc3b063..21915f799 100755
--- a/source/d/automake/automake.SlackBuild
+++ b/source/d/automake/automake.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2012, 2015, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2012, 2015, 2018, 2022  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=automake
 VERSION=${VERSION:-$(echo automake-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Note: the package is _built_ as 'noarch'
 # Automatically determine architecture for build & packaging:
@@ -63,9 +63,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# Python detection fix for 3.10:
-zcat $CWD/automake.python.3.10.diff.gz | patch -p1 --verbose || exit 1
-
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
diff --git a/source/d/automake/automake.python.3.10.diff b/source/d/automake/automake.python.3.10.diff
deleted file mode 100644
index 02dd7348f..000000000
--- a/source/d/automake/automake.python.3.10.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./m4/python.m4.orig	2020-01-01 13:43:28.000000000 -0600
-+++ ./m4/python.m4	2021-10-15 11:40:40.523668203 -0500
-@@ -86,12 +86,14 @@
-     m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
-   else
- 
--  dnl Query Python for its version number.  Getting [:3] seems to be
--  dnl the best way to do this; it's what "site.py" does in the standard
--  dnl library.
--
-+  dnl Query Python for its version number.  Although site.py simply uses
-+  dnl sys.version[:3], printing that failed with Python 3.10, since the
-+  dnl trailing zero was eliminated. So now we output just the major
-+  dnl and minor version numbers, as numbers. Apparently the tertiary
-+  dnl version is not of interest.
-+  dnl
-   AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
--    [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
-+    [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
-   AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
- 
-   dnl Use the values of $prefix and $exec_prefix for the corresponding
diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild
index 07cd9ce32..f4733e492 100755
--- a/source/d/binutils/binutils.SlackBuild
+++ b/source/d/binutils/binutils.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=binutils
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -131,16 +131,18 @@ zcat $CWD/patches/binutils-revert-PLT-elision.patch.gz | patch -p1 --verbose ||
 zcat $CWD/patches/binutils-special-sections-in-groups.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/binutils-testsuite-fixes.patch.gz | patch -p1 --verbose || exit 1
 
-# Thanks to Fedora:
-# Dependencies are not set up to rebuild the configure files
-# in the subdirectories.  So we just rebuild the ones we care
-# about after applying the configure patches
-pushd libiberty
-autoconf
-popd
-pushd intl
-autoconf
-popd
+## COMMENTED OUT as nothing touches configure-related files in these
+## directories, and the latest autoconf isn't working to rebuild them.
+## Thanks to Fedora:
+## Dependencies are not set up to rebuild the configure files
+## in the subdirectories.  So we just rebuild the ones we care
+## about after applying the configure patches
+#pushd libiberty
+#autoconf
+#popd
+#pushd intl
+#autoconf
+#popd
 
 chown -R root:root .
 find . \
diff --git a/source/d/rcs/rcs-5.10.0-SIGSTKSZ.patch b/source/d/rcs/rcs-5.10.0-SIGSTKSZ.patch
new file mode 100644
index 000000000..5906e3e91
--- /dev/null
+++ b/source/d/rcs/rcs-5.10.0-SIGSTKSZ.patch
@@ -0,0 +1,29 @@
+diff -up rcs-5.10.0.orig/src/b-isr.c rcs-5.10.0/src/b-isr.c
+--- rcs-5.10.0.orig/src/b-isr.c	2021-04-04 14:13:59.185941494 +0200
++++ rcs-5.10.0/src/b-isr.c	2021-04-04 14:15:21.087397267 +0200
+@@ -198,22 +198,16 @@ setup_catchsig (size_t count, int const
+ #undef MUST
+ }
+ 
+-#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
+-#define ISR_STACK_SIZE  (10 * SIGSTKSZ)
+-#else
+-#define ISR_STACK_SIZE  0
+-#endif
+-
+ struct isr_scratch *
+ isr_init (bool *be_quiet)
+ {
+   struct isr_scratch *scratch = ZLLOC (1, struct isr_scratch);
+ 
+-#if ISR_STACK_SIZE
++#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
+   stack_t ss =
+     {
+-      .ss_sp = alloc (PLEXUS, ISR_STACK_SIZE),
+-      .ss_size = ISR_STACK_SIZE,
++      .ss_sp = alloc (PLEXUS, (10 * SIGSTKSZ)),
++      .ss_size = (10 * SIGSTKSZ),
+       .ss_flags = 0
+     };
+ 
diff --git a/source/d/rcs/rcs.SlackBuild b/source/d/rcs/rcs.SlackBuild
index e9b5a8126..bd87fab50 100755
--- a/source/d/rcs/rcs.SlackBuild
+++ b/source/d/rcs/rcs.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rcs
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -84,7 +84,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION
 
 chown -R root:root .
@@ -94,6 +94,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# patch to build with glibc-2.34 from https://src.fedoraproject.org/rpms/rcs/raw/rawhide/f/rcs-5.10.0-upstream-8883c4f5a2.patch
+zcat $CWD/rcs-5.10.0-SIGSTKSZ.patch.gz | patch -Esp1 --verbose || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS -std=c99" \
 ./configure \
diff --git a/source/d/scons/scons.SlackBuild b/source/d/scons/scons.SlackBuild
index c924783c9..5353b47ed 100755
--- a/source/d/scons/scons.SlackBuild
+++ b/source/d/scons/scons.SlackBuild
@@ -24,8 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=scons
-VERSION=${VERSION:-$(echo scons-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo SCons-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -67,7 +67,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf SCons-$VERSION scons-$VERSION
-tar xvf $CWD/scons-$VERSION.tar.*z* || exit 1
+tar xvf $CWD/SCons-$VERSION.tar.*z* || exit 1
 cd SCons-$VERSION || cd scons-$VERSION || exit 1
 chown -R root:root .
 find . \