summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-03-06 13:50:35 +0000
committer Eric Hameleers <alien@slackware.com>2020-03-06 13:50:35 +0000
commitc3c0ed2c6085da9fd77f5974cc83ecea095eb4e2 (patch)
treed8196e786b65d22f3103d3025ab78bdf8052dbb2
parent304de66ac50adfefeb298d85d4b510dfb099c3c1 (diff)
downloadasb-c3c0ed2c6085da9fd77f5974cc83ecea095eb4e2.tar.gz
asb-c3c0ed2c6085da9fd77f5974cc83ecea095eb4e2.tar.xz
jack2: fixes for use in liveslak and limit execution to audio group
-rwxr-xr-xjack2/build/jack2.SlackBuild16
1 files changed, 12 insertions, 4 deletions
diff --git a/jack2/build/jack2.SlackBuild b/jack2/build/jack2.SlackBuild
index 2433b972..b3362822 100755
--- a/jack2/build/jack2.SlackBuild
+++ b/jack2/build/jack2.SlackBuild
@@ -44,6 +44,8 @@
# * Update. Renamed to 'jack2' to align with SBo.
# 1.9.14-1: 19/jan/2020 by Eric Hameleers <alien@slackware.com>
# * Update.
+# 1.9.14-2: 19/jan/2020 by Eric Hameleers <alien@slackware.com>
+# * Fix the doinst.sh script for liveslak.
#
# Run 'sh jack.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -53,7 +55,7 @@
PRGNAM=jack2
VERSION=${VERSION:-1.9.14}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
TAG=${TAG:-"alien"}
@@ -185,6 +187,10 @@ python2 waf configure \
python2 waf build 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
python2 waf install --destdir=$PKG 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+# Only allow execution by user in 'audio' group:
+chown root:audio $PKG/usr/bin/*
+chmod 0750 $PKG/usr/bin/*
+
# Create a post installation script:
mkdir -p $PKG/install
cat <<EOINS > $PKG/install/doinst.sh
@@ -198,9 +204,11 @@ fi
# Write an entry into fstab for the RAM-based tmpfs that jack wants to
# see mounted on /dev/shm (for the low-latency!!!).
-if ! grep -q "/dev/shm" etc/fstab ; then
- echo "# Next line added for jack audio - it will not harm your system" >> etc/fstab
- echo "none /dev/shm tmpfs defaults 0 0" >> etc/fstab
+if [ -f etc/fstab ]; then
+ if ! grep -q "/dev/shm" etc/fstab ; then
+ echo "# Next line added for jack audio - it will not harm your system" >> etc/fstab
+ echo "none /dev/shm tmpfs defaults 0 0" >> etc/fstab
+ fi
fi
if ! mount | grep -q "/dev/shm" ; then
mount /dev/shm 2>/dev/null