[arch-commits] Commit in shairport-sync/trunk (PKGBUILD remove_useradd.patch)

[Anatol Pomozov]

    Date: Wednesday, June 12, 2019 @ 04:33:00
  Author: anatolik
Revision: 480576

upgpkg: shairport-sync 3.3.1-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-12 04:18:47 UTC (rev 480575)
+++ PKGBUILD	2019-06-12 04:33:00 UTC (rev 480576)
@@ -1,8 +1,8 @@
 # Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
 
 pkgname=shairport-sync
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.3.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'
 arch=(x86_64)
@@ -12,15 +12,15 @@
 makedepends=(xmltoman)
 source=(shairport-sync-$pkgver.zip::https://github.com/mikebrady/shairport-sync/archive/$pkgver.zip
         shairport-sync.sysusers
-        useradd.patch::https://github.com/mikebrady/shairport-sync/commit/15c376ad57629dad16f1120dbf4c080f7de48475.patch)
-sha1sums=('58524de686caad22a21a15dde7bce60d6360244c'
+        remove_useradd.patch)
+sha1sums=('ac4e9cc624082ac547c1cafe9b5fec171ae0e8d9'
           'b806f9cd3eeaf8585a51d79c7b5681e3d3e4748a'
-          '0d216ac98a7c390476c79732e7361c4e66651340')
+          '2cdd711a21a74748137d2e3894fb0fcb189c41e2')
 
 prepare() {
   cd shairport-sync-$pkgver
-  # Revert adding users with 'make install'. We have a separate *.install script for it.
-  patch -R < ../useradd.patch
+
+  patch -p1 < ../remove_useradd.patch
 }
 
 build() {

Added: remove_useradd.patch
===================================================================
--- remove_useradd.patch	                        (rev 0)
+++ remove_useradd.patch	2019-06-12 04:33:00 UTC (rev 480576)
@@ -0,0 +1,27 @@
+commit 48eb4034563e29dd3fba7310106d929811da32eb
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+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
+--- 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