[arch-commits] Commit in shairport-sync/trunk (5 files)

[Anatol Pomozov]

    Date: Friday, April 3, 2015 @ 04:08:47
  Author: anatolik
Revision: 130554

upgpkg: shairport-sync 2.2.2-2

Added:
  shairport-sync/trunk/remove-init.d.patch
  shairport-sync/trunk/shairport-sync.install
Modified:
  shairport-sync/trunk/PKGBUILD
  shairport-sync/trunk/shairport-sync.conf
  shairport-sync/trunk/shairport-sync.service

------------------------+
 PKGBUILD               |   13 ++++++++-----
 remove-init.d.patch    |   12 ++++++++++++
 shairport-sync.conf    |    1 +
 shairport-sync.install |    9 +++++++++
 shairport-sync.service |    5 +++--
 5 files changed, 33 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-03 01:06:02 UTC (rev 130553)
+++ PKGBUILD	2015-04-03 02:08:47 UTC (rev 130554)
@@ -7,19 +7,21 @@
 url='https://github.com/mikebrady/shairport-sync'
 arch=(i686 x86_64)
 license=(GPL)
+backup=(etc/conf.d/shairport-sync)
+install=shairport-sync.install
 depends=(openssl avahi libsoxr popt alsa-lib)
-source=(https://github.com/mikebrady/shairport-sync/archive/$pkgver.zip
+source=(shairport-sync-$pkgver.zip::https://github.com/mikebrady/shairport-sync/archive/$pkgver.zip
         shairport-sync.service
         shairport-sync.conf
-        remove_rc.patch)
+        remove-init.d.patch)
 sha1sums=('5360f4bd6a6b9678a8d7d3c2006db2146cda2d69'
-          '5f3f8d8c64d90603d9efc2faed4c80f9221a2f25'
-          'f16217da0fe559616db36e37214853c42e7f24ae'
+          '5b998234e1fbc31645285d8b1fbc5ea6cd69e850'
+          'eb937e306436af2e47e7ff1bec1eba88b14e0d81'
           '48174838de1ef4672bd71511753f05fd845b7137')
 
 prepare() {
   cd shairport-sync-$pkgver
-  patch -p1 < ../remove_rc.patch
+  patch -p1 < ../remove-init.d.patch
 }
 
 build() {
@@ -33,6 +35,7 @@
 package() {
   cd shairport-sync-$pkgver
   make DESTDIR="$pkgdir" install
+  install -D -m664 LICENSES "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
   install -D -m644 "$srcdir"/shairport-sync.service "$pkgdir"/usr/lib/systemd/system/shairport-sync.service
   install -D -m644 "$srcdir"/shairport-sync.conf "$pkgdir"/etc/conf.d/shairport-sync
 }

Added: remove-init.d.patch
===================================================================
--- remove-init.d.patch	                        (rev 0)
+++ remove-init.d.patch	2015-04-03 02:08:47 UTC (rev 130554)
@@ -0,0 +1,12 @@
+diff --git a/Makefile.am b/Makefile.am
+index ce1f0ba..9b32c2c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,7 +35,3 @@ endif
+ if USE_DNS_SD
+ shairport_sync_SOURCES += mdns_dns_sd.c
+ endif
+-
+-install-exec-hook:
+-	[ -f /etc/init.d/shairport-sync ] || cp scripts/shairport-sync /etc/init.d/
+-	update-rc.d shairport-sync defaults 90 10

Modified: shairport-sync.conf
===================================================================
--- shairport-sync.conf	2015-04-03 01:06:02 UTC (rev 130553)
+++ shairport-sync.conf	2015-04-03 02:08:47 UTC (rev 130554)
@@ -1 +1,2 @@
 # ShairportSync Daemon options
+SHAIRPORT_ARGS=""

Added: shairport-sync.install
===================================================================
--- shairport-sync.install	                        (rev 0)
+++ shairport-sync.install	2015-04-03 02:08:47 UTC (rev 130554)
@@ -0,0 +1,9 @@
+post_install() {
+  getent group shairport-sync &>/dev/null || groupadd --system shairport-sync >/dev/null
+  getent passwd shairport-sync &> /dev/null || useradd --system -c 'ShairportSync AirPort receiver' -d /var/lib/shairport-sync -m -g shairport-sync -s /bin/false -G audio shairport-sync >/dev/null
+  true
+}
+
+post_upgrade() {
+  post_install
+}
\ No newline at end of file

Modified: shairport-sync.service
===================================================================
--- shairport-sync.service	2015-04-03 01:06:02 UTC (rev 130553)
+++ shairport-sync.service	2015-04-03 02:08:47 UTC (rev 130554)
@@ -6,8 +6,9 @@
 
 [Service]
 EnvironmentFile=/etc/conf.d/shairport-sync
-ExecStart=/usr/bin/shairport-sync
-Restart=always
+ExecStart=/usr/bin/shairport-sync "$SHAIRPORT_ARGS"
+User=shairport-sync
+Group=shairport-sync
 
 [Install]
 WantedBy=multi-user.target