5 files changed, 76 insertions, 19 deletions
diff --git a/system/rtirq/README b/system/rtirq/README
index 17f6b1cd99..1774f4bec8 100644
--- a/system/rtirq/README
+++ b/system/rtirq/README
@@ -3,7 +3,7 @@ rtirq (set priorities on kernel IRQ threads)
 The rtirq script is a bash script written by Rui Nuno Capela which works
 in conjunction with the IRQ threading facility of the Linux kernel. The
 script takes advantage of the fact that the kernel can use threads for
-IRQs management, and as such these threads (like any other thread running
+IRQ management, and as such these threads (like any other thread running
 on your system) can be given maximum priority in an effort to minimize
 the latency of audio peripherals.
 
diff --git a/system/rtirq/git2tarxz.sh b/system/rtirq/git2tarxz.sh
new file mode 100644
index 0000000000..a3d2335440
--- /dev/null
+++ b/system/rtirq/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=rtirq
+CLONE_URL=https://github.com/rncbc/rtirq
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/rtirq/rtirq.SlackBuild b/system/rtirq/rtirq.SlackBuild
index 606dfb5653..7a886b673b 100644
--- a/system/rtirq/rtirq.SlackBuild
+++ b/system/rtirq/rtirq.SlackBuild
@@ -1,11 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rtirq
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210824 bkw:
+# - updated for version 20210530_acf01e7 (add git hash to VERSION)
+# - use github homepage
+# - fix minor typo in README and slack-desc
+
 # 20150512 bkw:
 # - updated for version 20150216
 
@@ -13,14 +18,21 @@
 # - updated for version 20140413
 # - host source on my server, because upstream doesn't keep old versions
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rtirq
-VERSION=${VERSION:-20150216}
+VERSION=${VERSION:-20210530_acf01e7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -31,25 +43,26 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 mkdir -p $PKG/etc/rc.d
 install -m0644 $PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
 install -m0755 $PRGNAM.sh $PKG/etc/rc.d/rc.$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+if [ -e README.md ]; then
+  sed -i 's,do sp ,do so ,' README.md
+  cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
+fi
 
 # get rid of DOS line endings on LICENSE
 sed 's/\r//' LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
 
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -57,4 +70,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rtirq/rtirq.info b/system/rtirq/rtirq.info
index 6376ed271b..9368f8abc8 100644
--- a/system/rtirq/rtirq.info
+++ b/system/rtirq/rtirq.info
@@ -1,10 +1,10 @@
 PRGNAM="rtirq"
-VERSION="20150216"
-HOMEPAGE="https://alsa.opensrc.org/Rtirq"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/rtirq-20150216.tar.gz"
-MD5SUM="59e8b012c16b1e879ce8648f537400c5"
+VERSION="20210530_acf01e7"
+HOMEPAGE="https://github.com/rncbc/rtirq"
+DOWNLOAD="https://slackware.uk/~urchlay/src/rtirq-20210530_acf01e7.tar.xz"
+MD5SUM="14d9c4b6ec1ba8fe4abd70c4315eea04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/rtirq/slack-desc b/system/rtirq/slack-desc
index f2b598cef9..82136b7a92 100644
--- a/system/rtirq/slack-desc
+++ b/system/rtirq/slack-desc
@@ -11,7 +11,7 @@ rtirq:
 rtirq: The rtirq script is a bash script written by Rui Nuno Capela which
 rtirq: works in conjunction with the IRQ threading facility of the Linux
 rtirq: kernel. The script takes advantage of the fact that the kernel can
-rtirq: use threads for IRQs management, and as such these threads (like any
+rtirq: use threads for IRQ management, and as such these threads (like any
 rtirq: other thread running on your system) can be given maximum priority
 rtirq: in an effort to minimize the latency of audio peripherals.
 rtirq: