Update to version 0.7.2

4 files changed, 28 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 274110cf62de..428d019957e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = supysonic
 	pkgdesc = A Python implementation of the Subsonic server API.
-	pkgver = 0.6.3
+	pkgver = 0.7.2
 	pkgrel = 1
 	url = https://github.com/spl0k/supysonic
 	install = supysonic.install
@@ -24,18 +24,19 @@ pkgbase = supysonic
 	optdepends = mod_wsgi: Apache WSGI module
 	optdepends = postgresql: PostgreSQL database
 	optdepends = python-psycopg2: PostgreSQL database support
+	optdepends = python-waitress: pure-Python WSGI server
 	backup = etc/supysonic
-	source = supysonic-0.6.3.tar.gz::https://github.com/spl0k/supysonic/archive/0.6.3.tar.gz
+	source = supysonic-0.7.2.tar.gz::https://github.com/spl0k/supysonic/archive/0.7.2.tar.gz
 	source = supysonic.ini
 	source = supysonic.sysusers
 	source = supysonic.tmpfiles
 	source = supysonic-daemon.service
-	source = apache-wsgi.conf
-	sha256sums = f4ca5814e491a406161f144ff8b7222fdbfbef77688bb1d593af835a9f9f5898
+	source = supysonic-waitress.service
+	sha256sums = f30c8e05a10d286db73f242e5899ec548a189c296687acd88c9f29e296f15647
 	sha256sums = e8a10b2be1c3b6757cee8928f2e585351da9e9b6eadfa68c8905913108a26b80
 	sha256sums = b4b723d30fb45f86a15ec218910cd3935aac4546d5e2f9a1e1bc79cccfb98480
 	sha256sums = 430eba10de5381a425074b89d0a46fb770be5112b26e81ac6a2b55765675cb13
 	sha256sums = a5222df6f6c15fafc7e20ccc97c365bbb29112a60d58c9a31129e581f482819b
-	sha256sums = 153b01e713b8520036d6d25b3e5cee36498772c0d696078324996570046a1a11
+	sha256sums = d069e06ffab02a1d1e98991b8bd74f17ef71ca12e9bf7019fe7c81aacee4e587
 
 pkgname = supysonic
diff --git a/PKGBUILD b/PKGBUILD
index b7a2dec732bf..c2b9a06ea2ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Robert Sprunk <arch-aur@sprunk.me>
 # Contributor: Bryn Edwards <bryn.edwards@gmail.com>
 pkgname=supysonic
-pkgver=0.6.3
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="A Python implementation of the Subsonic server API."
 arch=('any')
@@ -28,30 +28,23 @@ optdepends=('ffmpeg: Transcoder support'
             'python-mysqlclient: MySQL compatible database support'
             'mod_wsgi: Apache WSGI module'
             'postgresql: PostgreSQL database'
-            'python-psycopg2: PostgreSQL database support')
+            'python-psycopg2: PostgreSQL database support'
+            'python-waitress: pure-Python WSGI server')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/spl0k/$pkgname/archive/$pkgver.tar.gz"
         "$pkgname.ini"
         "$pkgname.sysusers"
         "$pkgname.tmpfiles"
         "$pkgname-daemon.service"
-        "apache-wsgi.conf")
-sha256sums=('f4ca5814e491a406161f144ff8b7222fdbfbef77688bb1d593af835a9f9f5898'
+        "$pkgname-waitress.service")
+sha256sums=('f30c8e05a10d286db73f242e5899ec548a189c296687acd88c9f29e296f15647'
             'e8a10b2be1c3b6757cee8928f2e585351da9e9b6eadfa68c8905913108a26b80'
             'b4b723d30fb45f86a15ec218910cd3935aac4546d5e2f9a1e1bc79cccfb98480'
             '430eba10de5381a425074b89d0a46fb770be5112b26e81ac6a2b55765675cb13'
             'a5222df6f6c15fafc7e20ccc97c365bbb29112a60d58c9a31129e581f482819b'
-            '153b01e713b8520036d6d25b3e5cee36498772c0d696078324996570046a1a11')
+            'd069e06ffab02a1d1e98991b8bd74f17ef71ca12e9bf7019fe7c81aacee4e587')
 backup=("etc/$pkgname")
 install=$pkgname.install
 
-prepare() {
-  cd $pkgname-$pkgver
-  cp cgi-bin/server.py $pkgname/server.py
-  cp "cgi-bin/$pkgname.wsgi" $pkgname/wsgi.py
-  cp "cgi-bin/$pkgname.fcgi" $pkgname/fcgi.py
-  cp "cgi-bin/$pkgname.cgi" $pkgname/cgi.py
-}
-
 build() {
   cd $pkgname-$pkgver
   python setup.py build
@@ -63,17 +56,18 @@ package() {
 
   install -Dm664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm664 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
-  install -m664 -t "$pkgdir/usr/share/doc/$pkgname" docs/*.md
+  #install -m664 -t "$pkgdir/usr/share/doc/$pkgname" docs/*.md
   # TODO generate man page from docs/man
   install -dm644 "$pkgdir/var/lib/$pkgname"
 
   cd $srcdir
   install -Dm664 "$pkgname.ini" "$pkgdir/etc/$pkgname"
-  install -Dm664 "apache-wsgi.conf" "$pkgdir/usr/share/doc/$pkgname/apache-wsgi.conf"
   install -Dm664 "$srcdir/$pkgname.sysusers" \
     "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
   install -Dm664 "$srcdir/$pkgname.tmpfiles" \
     "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
   install -Dm664 "$srcdir/$pkgname-daemon.service" \
     "$pkgdir/usr/lib/systemd/system/$pkgname-daemon.service"
+  install -Dm664 "$srcdir/$pkgname-waitress.service" \
+    "$pkgdir/usr/lib/systemd/system/$pkgname-waitress.service"
 }
diff --git a/apache-wsgi.conf b/apache-wsgi.conf
deleted file mode 100644
index 9adc045aa4ae..000000000000
--- a/apache-wsgi.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-WSGIDaemonProcess supysonic home=/var/lib/supysonic user=supysonic group=supysonic
-WSGIProcessGroup supysonic
-WSGIApplicationGroup %{GLOBAL}
-WSGIScriptAlias /supysonic /usr/lib/python3.8/site-packages/supysonic/wsgi.py
-<Directory /usr/lib/python3.8/site-packages/supysonic>
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    Require all granted
-</Directory>
\ No newline at end of file
diff --git a/supysonic-waitress.service b/supysonic-waitress.service
new file mode 100644
index 000000000000..2a06e7dd414b
--- /dev/null
+++ b/supysonic-waitress.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Supysonic Daemon
+;After=mariadb.service
+;After=postgresql.service
+
+[Service]
+User=supysonic
+Group=supysonic
+WorkingDirectory=/var/lib/supysonic
+ExecStart=/usr/bin/waitress-serve --port=9342 --url-prefix=supysonic --call supysonic.web:create_application
+
+[Install]
+WantedBy=multi-user.target