Some changes to systemd service and hqplayer user

6 files changed, 21 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68887952d2c8..741c1361ae70 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = hqplayer-embedded
 	pkgdesc = Signalyst HQPlayer Embedded HQPlayer - the high-end upsampling multichannel software HD-audio player
 	pkgver = 4.32.0
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.signalyst.com/custom.html
 	install = hqplayer-embedded.install
 	arch = x86_64
@@ -22,18 +22,15 @@ pkgbase = hqplayer-embedded
 	depends = openmp
 	depends = mpg123
 	depends = lame
+	optdepends = hqplayer-client
 	provides = hqplayer
 	conflicts = hqplayer-embedded-amd
 	conflicts = hqplayer-embedded-rocm
 	conflicts = hqplayer4
 	source = hqplayerd.service
 	source = hqplayerd_user.service
-	source = sysusers.d
-	source = tmpfiles.d
-	sha256sums = d46242c40660ddf877eff89e2459a76fe5fbecb5621fd727aad742d69cbf96d1
+	sha256sums = 9aa79c67c22924c02b2c43cacbd3fac21dd9abbd146819ce46fe2b34f0193ef0
 	sha256sums = 5d4194a704979b3ff92482e155769460906745a66e759142eba33a2226f9cb3a
-	sha256sums = 911b813c6d6b4b88daab7c28566136112f1217dce7f890902fd0f46a519c50fc
-	sha256sums = 353eb19a099092f1ee3b34b46a68e684b221003f221dc92e2c6e929311d0ff83
 	source_x86_64 = https://www.signalyst.eu/bins/hqplayerd/focal/hqplayerd_4.32.0-133_amd64.deb
 	sha256sums_x86_64 = 20f9e9b3aded45840ac3cbcf624de343a1cee56b4eb32fd7203131125e436582
 	source_aarch64 = https://www.signalyst.eu/bins/hqplayerd/bullseye/hqplayerd_4.32.0-133_arm64.deb
diff --git a/PKGBUILD b/PKGBUILD
index 4c33a2f0fb0e..82272b7cf7c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,36 @@ pkgname=hqplayer-embedded
 _debpkgver=4.32.0-133
 _debpkgverarm=4.32.0-133
 pkgver=4.32.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Signalyst HQPlayer Embedded
  HQPlayer - the high-end upsampling multichannel software HD-audio player"
 arch=('x86_64' 'aarch64')
 url="http://www.signalyst.com/custom.html"
 license=('custom')
 depends=('alsa-lib' 'glibc' 'libusb-compat' 'flac' 'gcc-libs' 'libgmpris' 'glib2' 'rygel' 'zip' 'unzip' 'wavpack' 'gupnp' 'openmp' 'mpg123' 'lame')
+optdepends=('hqplayer-client')
 conflicts=('hqplayer-embedded-amd' 'hqplayer-embedded-rocm' 'hqplayer4')
 provides=('hqplayer')
 source=('hqplayerd.service'
         'hqplayerd_user.service'
-        'sysusers.d'
-        'tmpfiles.d'
         )
 source_x86_64=("https://www.signalyst.eu/bins/hqplayerd/focal/hqplayerd_"$_debpkgver"_amd64.deb")
 source_aarch64=("https://www.signalyst.eu/bins/hqplayerd/bullseye/hqplayerd_"$_debpkgverarm"_arm64.deb")
-sha256sums=('d46242c40660ddf877eff89e2459a76fe5fbecb5621fd727aad742d69cbf96d1'
-            '5d4194a704979b3ff92482e155769460906745a66e759142eba33a2226f9cb3a'
-            '911b813c6d6b4b88daab7c28566136112f1217dce7f890902fd0f46a519c50fc'
-            '353eb19a099092f1ee3b34b46a68e684b221003f221dc92e2c6e929311d0ff83')
+sha256sums=('9aa79c67c22924c02b2c43cacbd3fac21dd9abbd146819ce46fe2b34f0193ef0'
+            '5d4194a704979b3ff92482e155769460906745a66e759142eba33a2226f9cb3a')
 sha256sums_x86_64=('20f9e9b3aded45840ac3cbcf624de343a1cee56b4eb32fd7203131125e436582')
 sha256sums_aarch64=('faaafb80ea1cda27999a0e5a98b2f5571d027289b6138416fe5e56ce72c13c6c')
 install=${pkgname}.install
 
 package() {
-  cd "$srcdir"
   bsdtar xf data.tar.xz -C "$pkgdir"
-  install -Dm644 "$pkgdir/usr/share/doc/hqplayerd/copyright" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-  rm "$pkgdir/usr/share/doc/hqplayerd/copyright"
-  rm -rf "$pkgdir/lib"
   
+  install -Dm644 "$pkgdir/usr/share/doc/hqplayerd/copyright" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   install -Dm644 "hqplayerd_user.service" "$pkgdir/usr/lib/systemd/user/hqplayerd.service"
   install -Dm644 "hqplayerd.service" "$pkgdir/usr/lib/systemd/system/hqplayerd.service"
-  install -Dm644 tmpfiles.d             "${pkgdir}"/usr/lib/tmpfiles.d/hqplayer.conf
-  install -Dm644 sysusers.d             "${pkgdir}"/usr/lib/sysusers.d/hqplayer.conf
-  install -Dm644 "$pkgdir/etc/hqplayer/hqplayerd.xml" "$pkgdir/usr/share/doc/hqplayerd/hqplayerd.xml"
+  
+  rm -rf "$pkgdir/lib"
+  rm "$pkgdir/usr/share/doc/hqplayerd/copyright"
   cp "$pkgdir"/opt/hqplayerd/lib/* "$pkgdir"/usr/lib/
   rm -rf "$pkgdir/opt"
   rm -rf "$pkgdir/etc/modules-load.d"
diff --git a/hqplayer-embedded.install b/hqplayer-embedded.install
index 8a0782e2acaa..c6034fd0a14e 100644
--- a/hqplayer-embedded.install
+++ b/hqplayer-embedded.install
@@ -1,6 +1,7 @@
 post_install () {
-chown -R hqplayer:hqplayer /var/hqplayer
-chown -R hqplayer:hqplayer /etc/hqplayer
+mkdir -p /var/lib/hqplayer/home
+chown -R root:root /var/lib/hqplayer
+chown -R root:root /etc/hqplayer
 cd /usr/lib
 if [ ! -f "libgupnp-1.2.so.0" ]; then
 ln -s libgupnp-1.2.so.1 libgupnp-1.2.so.0
@@ -18,8 +19,9 @@ fi
 }
 
 post_upgrade() {
-chown -R hqplayer:hqplayer /var/hqplayer
-chown -R hqplayer:hqplayer /etc/hqplayer
+mkdir -p /var/lib/hqplayer/home
+chown -R root:root /var/lib/hqplayer
+chown -R root:root /etc/hqplayer
 cd /usr/lib
 if [ ! -f "libgupnp-1.2.so.0" ]; then
 ln -s libgupnp-1.2.so.1 libgupnp-1.2.so.0
diff --git a/hqplayerd.service b/hqplayerd.service
index f49c58c50e7f..ab629ab955bc 100644
--- a/hqplayerd.service
+++ b/hqplayerd.service
@@ -1,8 +1,10 @@
 [Unit]
 Description=HQPlayer Embedded daemon
-# if your distro uses systemd-networkd you may want to add
+# if your distro uses systemd-networkd you may want to replace
+# NetworkManager-wait-online.service
+# with
 # systemd-networkd-wait-online.service
-Requires=network-online.target sound.target systemd-udev-settle.service
+Requires=network-online.target sound.target systemd-udev-settle.service systemd-networkd-wait-online.service
 After=network-online.target sound.target systemd-udev-settle.service local-fs.target remote-fs.target
 
 [Service]
@@ -11,7 +13,6 @@ ExecStart=/usr/bin/hqplayerd
 Restart=always
 RestartSec=2
 EnvironmentFile=-/etc/default/hqplayerd
-User=hqplayer
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sysusers.d b/sysusers.d
deleted file mode 100644
index 4a026014bb9e..000000000000
--- a/sysusers.d
+++ /dev/null
@@ -1,2 +0,0 @@
-u hqplayer - -
-m hqplayer audio
diff --git a/tmpfiles.d b/tmpfiles.d
deleted file mode 100644
index be7c6163f07b..000000000000
--- a/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /var/hqplayer  0755 hqplayer hqplayer