Date: Tuesday, November 1, 2022 @ 01:25:06
  Author: anatolik
Revision: 1340050

upgpkg: shairport-sync 4.1-1

Modified:
  shairport-sync/trunk/PKGBUILD
  shairport-sync/trunk/remove_useradd.patch

----------------------+
 PKGBUILD             |   14 +++++++-------
 remove_useradd.patch |   34 ++++++++++------------------------
 2 files changed, 17 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-01 01:12:29 UTC (rev 1340049)
+++ PKGBUILD    2022-11-01 01:25:06 UTC (rev 1340050)
@@ -1,7 +1,7 @@
 # Maintainer: Anatol Pomozov <[email protected]>
 
 pkgname=shairport-sync
-pkgver=3.3.9
+pkgver=4.1
 pkgrel=1
 pkgdesc='Emulates an AirPort Express for the purpose of streaming music from 
iTunes and compatible iPods and iPhones'
 url='https://github.com/mikebrady/shairport-sync'
@@ -8,14 +8,14 @@
 arch=(x86_64)
 license=(GPL)
 backup=(etc/shairport-sync.conf)
-depends=(openssl avahi libsoxr popt alsa-lib libconfig libpulse jack mosquitto)
-makedepends=(xmltoman)
+depends=(openssl avahi libsoxr popt alsa-lib libconfig libpulse jack mosquitto 
libplist ffmpeg libsodium)
+makedepends=(xmltoman vim) # vim for xxd tool
 
source=(shairport-sync-$pkgver.zip::https://github.com/mikebrady/shairport-sync/archive/$pkgver.zip
         shairport-sync.sysusers
         remove_useradd.patch)
-sha1sums=('a428810174452a796008bc4a4b04ec5a6e858a39'
+sha1sums=('1a1c6d5d87a086333e26f5c5e6c0f4a0eb678aff'
           'b806f9cd3eeaf8585a51d79c7b5681e3d3e4748a'
-          '2cdd711a21a74748137d2e3894fb0fcb189c41e2')
+          'bce50eb33ff8573988c7132e5f4097e955082017')
 
 prepare() {
   cd shairport-sync-$pkgver
@@ -27,10 +27,10 @@
   cd shairport-sync-$pkgver
 
   autoreconf -i -f
-  ./configure --prefix=/usr --sysconfdir=/etc --with-alsa --with-pa 
--with-avahi --with-jack --with-stdout --with-pipe --with-ssl=openssl 
--with-soxr --with-dns_sd --with-pkg-config --with-systemd --with-configfiles 
--with-metadata --with-mqtt-client
+  ./configure --prefix=/usr --sysconfdir=/etc --with-alsa --with-pa 
--with-avahi --with-jack --with-stdout --with-pipe --with-ssl=openssl 
--with-soxr --with-dns_sd --with-pkg-config --with-systemd --with-configfiles 
--with-metadata --with-mqtt-client --with-airplay-2
   make
 
-  sed 's|/usr/local/bin/|/usr/bin/|' -i scripts/shairport-sync.service
+  sed 's|/usr/local/bin/|/usr/bin/|' -i scripts/shairport-sync.service.in
 }
 
 package() {

Modified: remove_useradd.patch
===================================================================
--- remove_useradd.patch        2022-11-01 01:12:29 UTC (rev 1340049)
+++ remove_useradd.patch        2022-11-01 01:25:06 UTC (rev 1340050)
@@ -1,27 +1,13 @@
-commit 48eb4034563e29dd3fba7310106d929811da32eb
-Author: Anatol Pomozov <[email protected]>
-Date:   Tue Jun 11 21:30:13 2019 -0700
-
-    Revert "Update System V and System D installers to define user, group and 
runtime directory as necessary"
-    
-    This reverts commit 15c376ad57629dad16f1120dbf4c080f7de48475.
-
 diff --git a/Makefile.am b/Makefile.am
-index 2bbc387..99db873 100644
+index 1634c6af..2f9b7583 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -185,14 +185,10 @@ endif
- endif
- endif
- if INSTALL_SYSTEMV
--      getent group shairport-sync &>/dev/null || groupadd -r shairport-sync 
>/dev/null
--      getent passwd shairport-sync &> /dev/null || useradd -r -M -g 
shairport-sync -s /usr/bin/nologin -G audio shairport-sync >/dev/null
-       [ -e $(DESTDIR)$(sysconfdir)/init.d ] || mkdir -p 
$(DESTDIR)$(sysconfdir)/init.d
-       [ -f $(DESTDIR)$(sysconfdir)/init.d/shairport-sync ] || cp 
scripts/shairport-sync $(DESTDIR)$(sysconfdir)/init.d/
- endif
- if INSTALL_SYSTEMD
--      getent group shairport-sync &>/dev/null || groupadd -r shairport-sync 
>/dev/null
--      getent passwd shairport-sync &> /dev/null || useradd -r -M -g 
shairport-sync -s /usr/bin/nologin -G audio shairport-sync >/dev/null
-       [ -e $(DESTDIR)$(systemdsystemunitdir) ] || mkdir -p 
$(DESTDIR)$(systemdsystemunitdir)
-       [ -f $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service ] || cp 
scripts/shairport-sync.service $(DESTDIR)$(systemdsystemunitdir)
- endif
+@@ -297,7 +297,7 @@ INSTALL_SYSTEMD_TARGET = install-systemd-local
+ # will be stored in a scripts folder in the _build_ folder
+ # which will be the source folder if you're not using a separate build folder
+ 
+-$(INSTALL_SYSTEMD_TARGET): scripts/$(SYSTEMD_SERVICE) $(INSTALL_USER_TARGET)
++$(INSTALL_SYSTEMD_TARGET): scripts/$(SYSTEMD_SERVICE)
+       install -d $(DESTDIR)$(systemdsystemunitdir)
+       [ -e $(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service ] || 
install -m 0644 scripts/$(SYSTEMD_SERVICE) 
$(DESTDIR)$(systemdsystemunitdir)/shairport-sync.service
+ 

Reply via email to