4 files changed, 23 insertions, 12 deletions
diff --git a/audio/zita-rev1/README b/audio/zita-rev1/README
index 243a1b48fc0a..d2c0b4284398 100644
--- a/audio/zita-rev1/README
+++ b/audio/zita-rev1/README
@@ -4,3 +4,9 @@ on a wide variety of instruments or voices. It is not a spatialiser -
 the early reflections are different for the L and R inputs, but do not
 correspond to any real room. They have been tuned to match left and
 right sources to some extent.
+
+This package uses POSIX filesystem capabilities to execute with
+elevated privileges (required for realtime audio processing). This
+may be considered a security/stability risk. Please read
+http://www.slackbuilds.org/caps/ for more information. To disable
+capabilities, pass SETCAP=no to the script.
diff --git a/audio/zita-rev1/setcap.sh b/audio/zita-rev1/setcap.sh
new file mode 100644
index 000000000000..95bf24b2f3e4
--- /dev/null
+++ b/audio/zita-rev1/setcap.sh
@@ -0,0 +1 @@
+[ -x /sbin/setcap ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/zita-rev1
diff --git a/audio/zita-rev1/zita-rev1.SlackBuild b/audio/zita-rev1/zita-rev1.SlackBuild
index 0907099299c5..9b3b3db83256 100644
--- a/audio/zita-rev1/zita-rev1.SlackBuild
+++ b/audio/zita-rev1/zita-rev1.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=zita-rev1
-VERSION=${VERSION:-0.2.1}
+VERSION=${VERSION:-0.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,20 +47,16 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 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 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 {} \+
 
+sed -i 's,pkgconf,pkg-config,' source/Makefile
 make -C source CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr
 make -C source install DESTDIR=$PKG PREFIX=/usr
 strip $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING doc/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/share/pixmaps
@@ -73,5 +69,13 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Only add capability stuff if not disabled:
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  cat $CWD/setcap.sh >> $PKG/install/doinst.sh
+  # Only allow execution by audio group
+  chown root:audio $PKG/usr/bin/$PRGNAM
+  chmod 0750 $PKG/usr/bin/$PRGNAM
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/zita-rev1/zita-rev1.info b/audio/zita-rev1/zita-rev1.info
index b89544dedc4f..4d5324a83cb7 100644
--- a/audio/zita-rev1/zita-rev1.info
+++ b/audio/zita-rev1/zita-rev1.info
@@ -1,8 +1,8 @@
 PRGNAM="zita-rev1"
-VERSION="0.2.1"
+VERSION="0.2.2"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/zita-rev1-doc/quickguide.html"
-DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-rev1-0.2.1.tar.bz2"
-MD5SUM="f1403a7b85a7aa4bbac66c08abfd8293"
+DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-rev1-0.2.2.tar.bz2"
+MD5SUM="54867ec701dc4cb7c750f22c191a2e28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="clalsadrv clxclient jack-audio-connection-kit"