diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | snapcast-systemd.patch | 36 | ||||
| -rw-r--r-- | snapcast.install | 31 |
4 files changed, 55 insertions, 41 deletions
@@ -1,10 +1,11 @@ # Generated by mksrcinfo v8 -# Mon Nov 28 11:36:08 UTC 2016 +# Fri Mar 17 21:29:29 UTC 2017 pkgbase = snapcast pkgdesc = Synchronous multi-room audio player - pkgver = 0.10.0 - pkgrel = 2 + pkgver = 0.11.0 + pkgrel = 1 url = https://github.com/badaix/snapcast + install = snapcast.install arch = i686 arch = x86_64 arch = armv6h @@ -18,10 +19,10 @@ pkgbase = snapcast depends = flac backup = etc/default/snapserver backup = etc/default/snapclient - source = git+https://github.com/badaix/snapcast.git#tag=v0.10.0 + source = git+https://github.com/badaix/snapcast.git#tag=v0.11.0 source = snapcast-systemd.patch md5sums = SKIP - md5sums = 409bb645138a52462aa8800a3f1b620b + md5sums = 374f174354508e3a3e2ab28910a9eb5c pkgname = snapcast @@ -1,8 +1,8 @@ # Maintainer: Bart De Vries <devriesb@gmail.com> pkgname=snapcast -pkgver=0.10.0 -pkgrel=2 +pkgver=0.11.0 +pkgrel=1 pkgdesc="Synchronous multi-room audio player" arch=('i686' 'x86_64' 'armv6h' 'armv7h') url="https://github.com/badaix/snapcast" @@ -17,27 +17,21 @@ conflicts=() replaces=() backup=('etc/default/snapserver' 'etc/default/snapclient') options=() -install= +install=snapcast.install changelog= source=("git+https://github.com/badaix/${pkgname}.git#tag=v${pkgver//_/-}" "${pkgname}-systemd.patch") noextract=() validpgpkeys=() md5sums=('SKIP' - '409bb645138a52462aa8800a3f1b620b') + '374f174354508e3a3e2ab28910a9eb5c') prepare() { cd "$pkgname" patch -p1 -i "$srcdir/$pkgname-systemd.patch" cd externals - # submodule update barfs on vorbis which is in 0.10.0, but unused! - # switch back to line below on next version! - #git submodule update --init --recursive - git submodule update --init asio - git submodule update --init flac - git submodule update --init ogg - git submodule update --init popl - git submodule update --init tremor + # update all submodules + git submodule update --init --recursive } build() { diff --git a/snapcast-systemd.patch b/snapcast-systemd.patch index d91bc6160b23..e555e5efbc88 100644 --- a/snapcast-systemd.patch +++ b/snapcast-systemd.patch @@ -1,36 +1,24 @@ -diff -aur snapcast-0.5.0-beta-1-orig/client/debian/snapclient.service snapcast-0.5.0-beta-1/client/debian/snapclient.service ---- snapcast-0.5.0-beta-1-orig/client/debian/snapclient.service 2016-02-11 11:35:44.674153749 +0100 -+++ snapcast-0.5.0-beta-1/client/debian/snapclient.service 2016-02-11 11:46:39.844153747 +0100 -@@ -1,11 +1,13 @@ - [Unit] +diff -aur snapcast-orig/client/debian/snapclient.service snapcast/client/debian/snapclient.service +--- snapcast-orig/client/debian/snapclient.service 2017-03-17 14:59:08.600000000 +0100 ++++ snapcast/client/debian/snapclient.service 2017-03-17 15:01:24.960000000 +0100 +@@ -2,6 +2,8 @@ Description=Snapcast client - After=network.target + After=network-online.target sound.target + Requires=network-online.target +After=avahi-daemon.service +Requires=avahi-daemon.service [Service] EnvironmentFile=-/etc/default/snapclient - Type=forking --ExecStart=/usr/sbin/snapclient $SNAPCLIENT_OPTS -+ExecStart=/usr/bin/snapclient $SNAPCLIENT_OPTS - PIDFile=/var/run/snapclient.pid - - [Install] -diff -aur snapcast-0.5.0-beta-1-orig/server/debian/snapserver.service snapcast-0.5.0-beta-1/server/debian/snapserver.service ---- snapcast-0.5.0-beta-1-orig/server/debian/snapserver.service 2016-02-11 11:35:44.667487082 +0100 -+++ snapcast-0.5.0-beta-1/server/debian/snapserver.service 2016-02-11 11:45:51.524153748 +0100 -@@ -1,11 +1,13 @@ - [Unit] +diff -aur snapcast-orig/server/debian/snapserver.service snapcast/server/debian/snapserver.service +--- snapcast-orig/server/debian/snapserver.service 2017-03-17 14:59:08.610000000 +0100 ++++ snapcast/server/debian/snapserver.service 2017-03-17 15:02:05.140000000 +0100 +@@ -2,6 +2,8 @@ Description=Snapcast server - After=network.target + After=network-online.target + Requires=network-online.target +After=avahi-daemon.service +Requires=avahi-daemon.service [Service] EnvironmentFile=-/etc/default/snapserver - Type=forking --ExecStart=/usr/sbin/snapserver $SNAPSERVER_OPTS -+ExecStart=/usr/bin/snapserver $SNAPSERVER_OPTS - PIDFile=/var/run/snapserver.pid - - [Install] diff --git a/snapcast.install b/snapcast.install new file mode 100644 index 000000000000..5911354ad7ca --- /dev/null +++ b/snapcast.install @@ -0,0 +1,31 @@ +post_install() { + echo "Creating snapclient and snapserver users and groups." + if ! getent passwd snapclient &>/dev/null; then + useradd --gid audio --system --home-dir /var/lib/snapclient snapclient -s /bin/false + passwd -l snapclient &>/dev/null + fi + if ! getent passwd snapserver &>/dev/null; then + useradd --user-group --system --home-dir /var/lib/snapserver snapserver -s /bin/false + passwd -l snapserver &>/dev/null + fi +} + +post_upgrade() { + echo "Creating snapclient and snapserver users and groups." + if ! getent passwd snapclient &>/dev/null; then + useradd --gid audio --system --home-dir /var/lib/snapclient snapclient -s /bin/false + passwd -l snapclient &>/dev/null + fi + if ! getent passwd snapserver &>/dev/null; then + useradd --user-group --system --home-dir /var/lib/snapserver snapserver -s /bin/false + passwd -l snapserver &>/dev/null + fi +} + +post_remove() { + echo "Removing snapclient and snapserver users and groups." + userdel --force snapclient > /dev/null || true + userdel --force snapserver > /dev/null || true + # group is automatically removed by userdel command, so not needed + #groupdel snapserver > /dev/null || true +} |