Removed .install file, replaced with sysusers and tmpfiles entries. Fixed checksum.

4 files changed, 31 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3c6e2b8fe95..fe1b789ef7aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = airsonic
 	pkgdesc = A free, web-based media streamer and jukebox.
 	pkgver = 10.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Airsonic/airsonic/
-	install = airsonic.install
 	arch = any
 	license = GPL3
 	depends = java-runtime-headless
@@ -12,9 +11,13 @@ pkgbase = airsonic
 	source = https://github.com/airsonic/airsonic/releases/download/v10.2.1/airsonic.war
 	source = https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic.service
 	source = https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic-systemd-env
+	source = airsonic.sysusers
+	source = airsonic.tmpfiles
 	sha256sums = 9bd4e9651df1a15278fb6414d011bd5a45c037857e84eaeb1375b26c717a5ebe
-	sha256sums = d24c07f9f585fc00fd564290cc7b7035d7f27ff7183f13c3fa4e6e23490e9531
+	sha256sums = 497624d9028e8234886283d97bab217da3acaac97f09afbd98365fccb002d8ae
 	sha256sums = 059a43fe100d95aaaae8091d1c312f4d3a2a2b4edc1969358dd7be35f6525930
+	sha256sums = 25af0b92b247df928db5ac8fec3fb4fa2cdc717e649729d5e0c059a5b81e058e
+	sha256sums = 952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963
 
 pkgname = airsonic
 
diff --git a/PKGBUILD b/PKGBUILD
index c91b1399ca1e..b37fa8cda62b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=airsonic
 pkgver=10.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A free, web-based media streamer and jukebox."
 arch=('any')
 url="https://github.com/Airsonic/airsonic/"
@@ -10,27 +10,38 @@ license=('GPL3')
 depends=('java-runtime-headless')
 backup=('etc/airsonic/airsonic.conf')
 noextract=(airsonic.war)
-install=$pkgname.install
 source=(https://github.com/airsonic/airsonic/releases/download/v${pkgver}/airsonic.war
         https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic.service
         https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic-systemd-env
-        )
+        "${pkgname}.sysusers"
+        "${pkgname}.tmpfiles")
 
 package() {
   cd ${srcdir}
-  mkdir -p $pkgdir/var/lib/airsonic
-  mkdir -p $pkgdir/var/lib/airsonic/playlists
-  mkdir -p $pkgdir/usr/lib/systemd/system
-  mkdir -p $pkgdir/etc/airsonic
-  cp airsonic.war $pkgdir/var/lib/airsonic
+  mkdir -p ${pkgdir}/var/lib/airsonic
+  mkdir -p ${pkgdir}/var/lib/airsonic/playlists
+  mkdir -p ${pkgdir}/usr/lib/systemd/system
+  mkdir -p ${pkgdir}/etc/airsonic
+  cp airsonic.war ${pkgdir}/var/lib/airsonic
+
+  sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' airsonic-systemd-env  
+  cp airsonic-systemd-env ${pkgdir}/etc/airsonic/airsonic.conf
+  
   sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' airsonic.service
   sed -i 's/\/etc\/sysconfig\/airsonic/\/etc\/airsonic\/airsonic.conf/' airsonic.service
-  cp $srcdir/airsonic.service $pkgdir/usr/lib/systemd/system
-  sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' airsonic-systemd-env  
-  cp airsonic-systemd-env $pkgdir/etc/airsonic/airsonic.conf
+  
+  # Fix memory allocation JAVA
+  sed -i 's/MemoryDenyWriteExecute=yes/#MemoryDenyWriteExecute=yes/' airsonic.service  
+  
+  install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  
 }
 
 sha256sums=('9bd4e9651df1a15278fb6414d011bd5a45c037857e84eaeb1375b26c717a5ebe'
-            'd24c07f9f585fc00fd564290cc7b7035d7f27ff7183f13c3fa4e6e23490e9531'
+            '497624d9028e8234886283d97bab217da3acaac97f09afbd98365fccb002d8ae'
             '059a43fe100d95aaaae8091d1c312f4d3a2a2b4edc1969358dd7be35f6525930'
+            '25af0b92b247df928db5ac8fec3fb4fa2cdc717e649729d5e0c059a5b81e058e'
+            '952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963'
             )
diff --git a/airsonic.sysusers b/airsonic.sysusers
new file mode 100644
index 000000000000..3558d7cd2cd6
--- /dev/null
+++ b/airsonic.sysusers
@@ -0,0 +1 @@
+u airsonic - "Airsonic user" /var/lib/airsonic
diff --git a/airsonic.tmpfiles b/airsonic.tmpfiles
new file mode 100644
index 000000000000..e351362b76be
--- /dev/null
+++ b/airsonic.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/airsonic 0755 airsonic airsonic