update & revision

7 files changed, 104 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e86c1970fac1..cd1c69d63cb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,28 @@
-# Generated by mksrcinfo v8
-# Mon Mar 19 19:51:09 UTC 2018
 pkgbase = bubbleupnpserver
-	pkgdesc = Stream content to Android devices over the Internet – requires UPNP/DNLA backend e.g. Mediatomb
-	pkgver = 0.9.30
+	pkgdesc = Stream content to Android devices over the Internet, requires UPNP/DNLA backend e.g. miniDLNA, Gerbera, Mediatomb
+	pkgver = 0.9.u38
 	pkgrel = 1
 	url = http://www.bubblesoftapps.com/bubbleupnpserver/
-	install = bubbleupnpserver.install
 	arch = any
-	license = custom:bubbleupnpserver
-	makedepends = unzip
-	depends = java-runtime>=7
-	depends = ffmpeg
-	backup = etc/conf.d/bubbleupnpserver
+	license = custom:BubbleUPnP Server EULA
+	depends = java-runtime-headless
+	optdepends = ffmpeg: for transcoding
+	backup = etc/conf.d/bubbleupnpserver.config
 	backup = var/lib/bubbleupnp/configuration.xml
-	source = http://www.bubblesoftapps.com/bubbleupnpserver/BubbleUPnPServer-distrib.zip
+	source = launch.sh
 	source = bubbleupnpserver.service
-	source = service_config
-	source = sysuser.conf
-	sha256sums = 5053f208f9c61090f512a61069de8255f973a3d2abb55293f75fe9d831fe1b60
-	sha256sums = a5992d91512469eca0a20634165f90ca8105107801fbd3fec60b45824ef311fb
+	source = bubbleupnpserver.config
+	source = bubbleupnpserver
+	source = https://bubblesoftapps.com/bubbleupnpserver/core/bcprov-jdk16-146.jar
+	source = https://bubblesoftapps.com/bubbleupnpserver/core/BubbleUPnPServerLauncher.jar
+	source = bubbleupnpserver-LICENCE.txt::https://bubblesoftapps.com/bubbleupnpserver/core/LICENCE.txt
+	sha256sums = 7df801995e65a79eb5140814ca80c4caeee7e1282b69acff9e74201cbaafdaf3
+	sha256sums = b99d60122343959f2118f6f74968e105d63e8ca2c8ff71efc120415378b1175a
 	sha256sums = 61bf63a84b839b85c0fdf0210310c94242bbb6e1aa69bf0d6c46efa013b52ae5
-	sha256sums = fd764bb4c785ab0e2481d26f4f30656ba756949afa8ed949234e722ded87bf04
+	sha256sums = 105bfe44a43d141457bf87ef89c76a5be57f54cdb3493ae3af99c8ad6a938c36
+	sha256sums = d0ae14598f9c528d2ab7bb8ed00e785a5440f692712cd362d69328aba25efb57
+	sha256sums = 75f31ca14d65f0e077283d15e5715636ea74c7faa0e200c5dd34e6ca50b9a06c
+	sha256sums = 69420fd34964ad7404efd9f19fad969f608660af85850fb90d343f2fc6eb9b48
 
 pkgname = bubbleupnpserver
 
diff --git a/PKGBUILD b/PKGBUILD
index 11c457ff74af..96dc7fa0b204 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,45 @@
-# Maintainer: Dave Blair <mail@dave-blair.de>
+# Maintainer: Lolix
+# Contributor: TilmanV
+# Contributor: Dave Blair <mail@dave-blair.de>
 # Contributor: Nick Bair <njbair at gmail dot com>
+
 pkgname=bubbleupnpserver
-pkgver=0.9.30
+pkgver=0.9.u38
 pkgrel=1
-pkgdesc="Stream content to Android devices over the Internet – requires UPNP/DNLA backend e.g. Mediatomb"
-arch=('any')
+pkgdesc="Stream content to Android devices over the Internet, requires UPNP/DNLA backend e.g. miniDLNA, Gerbera, Mediatomb"
+arch=(any)
 url="http://www.bubblesoftapps.com/bubbleupnpserver/"
-license=('custom:bubbleupnpserver')
-depends=('java-runtime>=7' 'ffmpeg')
-makedepends=('unzip')
-install=${pkgname}.install
+license=('custom:BubbleUPnP Server EULA')
+depends=('java-runtime-headless')
+optdepends=('ffmpeg: for transcoding')
+# http://www.bubblesoftapps.com/bubbleupnpserver2/docs/changelog.html
 source=(
-"http://www.bubblesoftapps.com/bubbleupnpserver/BubbleUPnPServer-distrib.zip"
-"bubbleupnpserver.service"
-"service_config"
-"sysuser.conf"
+        launch.sh
+        bubbleupnpserver.service
+        bubbleupnpserver.config
+        bubbleupnpserver
+        "https://bubblesoftapps.com/bubbleupnpserver/core/bcprov-jdk16-146.jar"
+        "https://bubblesoftapps.com/bubbleupnpserver/core/BubbleUPnPServerLauncher.jar"
+        "${pkgname}-LICENCE.txt::https://bubblesoftapps.com/bubbleupnpserver/core/LICENCE.txt"
 )
-sha256sums=('5053f208f9c61090f512a61069de8255f973a3d2abb55293f75fe9d831fe1b60'
-            'a5992d91512469eca0a20634165f90ca8105107801fbd3fec60b45824ef311fb'
+sha256sums=('7df801995e65a79eb5140814ca80c4caeee7e1282b69acff9e74201cbaafdaf3'
+            'b99d60122343959f2118f6f74968e105d63e8ca2c8ff71efc120415378b1175a'
             '61bf63a84b839b85c0fdf0210310c94242bbb6e1aa69bf0d6c46efa013b52ae5'
-            'fd764bb4c785ab0e2481d26f4f30656ba756949afa8ed949234e722ded87bf04'
-)
-backup=("etc/conf.d/bubbleupnpserver" "var/lib/bubbleupnp/configuration.xml")
-build() {
-  cd ${srcdir}
-  unzip -qfo "${srcdir}/BubbleUPnPServer-distrib.zip" -d ${srcdir}
-
-}
+            '105bfe44a43d141457bf87ef89c76a5be57f54cdb3493ae3af99c8ad6a938c36'
+            'd0ae14598f9c528d2ab7bb8ed00e785a5440f692712cd362d69328aba25efb57'
+            '75f31ca14d65f0e077283d15e5715636ea74c7faa0e200c5dd34e6ca50b9a06c'
+            '69420fd34964ad7404efd9f19fad969f608660af85850fb90d343f2fc6eb9b48')
+backup=("etc/conf.d/bubbleupnpserver.config" "var/lib/bubbleupnp/configuration.xml")
 
 package() {
-  install -D -m644 ${srcdir}/LICENCE.txt                      ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  install -D -m644 ${srcdir}/bcprov-jdk16-146.jar             ${pkgdir}/usr/share/${pkgname}/bcprov-jdk16-146.jar 
-  install -D -m644 ${srcdir}/BubbleUPnPServerLauncher.jar     ${pkgdir}/usr/share/${pkgname}/BubbleUPnPServerLauncher.jar 
-  install -D -m755 ${srcdir}/launch.sh                        ${pkgdir}/usr/share/${pkgname}/launch.sh
-  install -D -m644 ${srcdir}/bubbleupnpserver.service         ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -D -m644 ${srcdir}/service_config		      ${pkgdir}/etc/conf.d/bubbleupnpserver
-  install -D -m644 ${srcdir}/sysuser.conf                     ${pkgdir}/usr/lib/sysusers.d/bubbleupnpserver.conf
+
+  install -d "${pkgdir}"/var/lib/bubbleupnp
+
+  install -D -m644 "${srcdir}"/bcprov-jdk16-146.jar           "${pkgdir}"/usr/share/${pkgname}/bcprov-jdk16-146.jar
+  install -D -m644 "${srcdir}"/BubbleUPnPServerLauncher.jar   "${pkgdir}"/usr/share/${pkgname}/BubbleUPnPServerLauncher.jar
+  install -D -m755 "${srcdir}"/launch.sh                      "${pkgdir}"/usr/share/${pkgname}/launch.sh
+  install -D -m644 "${srcdir}"/bubbleupnpserver.service       "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
+  install -D -m644 "${srcdir}"/bubbleupnpserver.config        "${pkgdir}"/etc/conf.d/bubbleupnpserver.config
+  install -D -m644 "${srcdir}"/bubbleupnpserver               "${pkgdir}"/etc/default/bubbleupnpserver
+  install -D -m644 "${srcdir}"/${pkgname}-LICENCE.txt         "${pkgdir}"/usr/share/licenses/${pkgname}/LICENCE.txt
 }
diff --git a/bubbleupnpserver b/bubbleupnpserver
new file mode 100644
index 000000000000..568eb505775b
--- /dev/null
+++ b/bubbleupnpserver
@@ -0,0 +1,41 @@
+# Defaults for bubbleupnpserver initscript
+# sourced by /etc/init/bubbleupnpserver.conf
+
+#
+# This is a POSIX shell fragment
+#
+
+
+#
+# User under which to run BubbleUPnP Server
+#
+# It is OK to run BubbleUPnP Server with an unpriviledged user 
+# as long as you do not use http or https ports < 1024
+#
+# if not running as root, for auto-update to work, you will have
+# to make the install dir (/usr/share/bubbleupnpserver) and its files writable
+# by the user defined here
+
+USER="root"
+
+
+#
+# DATA dir is where all data files aer stored:
+#    configuration, logs, image cache, OpenHome Playlists
+#
+
+if [ "${USER}" = "root" ]; then
+     DATADIR=/root/.bubbleupnpserver
+else 
+     DATADIR="/home/${USER}/.bubbleupnpserver"
+fi 
+
+
+#
+# HTTP and HTTPS port used by BubbleUPnP Server
+# NOTE you need to run the server as root user if using ports < 1024 
+#
+
+HTTP_PORT=58050
+HTTPS_PORT=58051
+
diff --git a/service_config b/bubbleupnpserver.config
index 2acc6e8f1bc5..2acc6e8f1bc5 100644
--- a/service_config
+++ b/bubbleupnpserver.config
diff --git a/bubbleupnpserver.install b/bubbleupnpserver.install
deleted file mode 100644
index 9ed8d6a3cf27..000000000000
--- a/bubbleupnpserver.install
+++ /dev/null
@@ -1,60 +0,0 @@
-ownership() {
-    systemd-sysusers bubbleupnpserver.conf
-
-    [ -e var/lib/bubbleupnp ] || mkdir /var/lib/bubbleupnp
-    chown bubbleupnp:bubbleupnp /var/lib/bubbleupnp
-    chown bubbleupnp:bubbleupnp /usr/share/bubbleupnpserver/    
-}
-
-post_install() {
-	
-
-	echo "
-========================================================================
-
-To complete the configuration once the service has been started, point
-your web browser to:
-	http://localhost:58050
-	        - or -
-	https://localhost:58051
-
-Full documentation is available at:
-	http://www.bubblesoftapps.com/bubbleupnpserver/
-
-========================================================================
-"
-ownership
-}
-
-post_upgrade() {
-
-	echo "
-
-========================================================================
-
-If you're upgrading from 0.9.27-1 or prior you may want to look at these
-important changes:
-
-- The server is no longer running as root
-- The working directory is now /var/lib/bubbleupnp
-  - You must move your config to this directory
-
-=========================================================================
-
-If BubbleUPnP is already running, you need to restart it to finish the
-upgrade.
-
-To restart BubbleUPnP:
-	# systemctl restart bubbleupnpserver
-
-Full documentation is available at:
-	http://www.bubblesoftapps.com/bubbleupnpserver/
-
-========================================================================
-"
-ownership
-}
-
-post_remove() {
-rm -rf /usr/share/bubbleupnpserver
-}
diff --git a/bubbleupnpserver.service b/bubbleupnpserver.service
index 74ef4232af0e..2d516f1b4106 100644
--- a/bubbleupnpserver.service
+++ b/bubbleupnpserver.service
@@ -1,14 +1,15 @@
 [Unit]
 Description=BubbleUPnP Server
-Wants=network.target
-After=network.target
+Requires=network-online.target
+After=network-online.target
+
 
 [Service]
 User=bubbleupnp
 Group=bubbleupnp
 WorkingDirectory=/var/lib/bubbleupnp
 EnvironmentFile=-/etc/conf.d/bubbleupnpserver
-ExecStart=/usr/share/bubbleupnpserver/launch.sh -dataDir /var/lib/bubbleupnp ${RUN_ARGS}
+ExecStart=/usr/share/bubbleupnpserver/launch.sh
 SuccessExitStatus=1 2 SIGKILL
 
 [Install]
diff --git a/launch.sh b/launch.sh
new file mode 100644
index 000000000000..bc548fdf4b93
--- /dev/null
+++ b/launch.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# -Xss256k: thread stack size. 256K reduces per-thread memory usage and may prevent "java.lang.OutOfMemoryError: unable to create new native thread" on some systems
+# -Djava.awt.headless=true: required for image transcoding to work on headless systems (eg no X-Window libraries)
+
+exec java -Xss256k -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding="UTF-8" -jar /usr/share/bubbleupnpserver/BubbleUPnPServerLauncher.jar $*