Version 2.2.0-1

4 files changed, 35 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f42d5f80558..c3eeda3ebad8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Apr 25 16:36:54 UTC 2019
+# Thu Aug  8 13:56:55 UTC 2019
 pkgbase = threema-web
 	pkgdesc = The Threema Web client, packaged to run locally on port 4242
-	pkgver = 2.1.7
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = https://github.com/threema-ch/threema-web
 	install = threema-web.install
@@ -12,12 +12,14 @@ pkgbase = threema-web
 	provides = threema-web
 	conflicts = threema-web-git
 	options = !strip
-	source = https://github.com/threema-ch/threema-web/releases/download/v2.1.7/threema-web-2.1.7-gh.tar.gz
-	source = https://github.com/threema-ch/threema-web/releases/download/v2.1.7/threema-web-2.1.7-gh.tar.gz.asc
+	source = https://github.com/threema-ch/threema-web/releases/download/v2.2.0/threema-web-2.2.0-gh.tar.gz
+	source = https://github.com/threema-ch/threema-web/releases/download/v2.2.0/threema-web-2.2.0-gh.tar.gz.asc
 	source = threema-web.service
-	sha256sums = ce3176132e9192caa09610b1ae0e0d0dbc87b943e8aed10b3f299f0c7e1437ed
+	source = launch.py
+	sha256sums = 372c670e1bd8c862cfcb7140cff33f0004803c4d014eec648857d9327357d9c1
 	sha256sums = SKIP
-	sha256sums = 6cb24b36278ef9d5b57d056d5b8428f82b94cb92f7ffc0ef4bc3eb5278488514
+	sha256sums = 1fbf9c4af5548138f75b00d2bd3de462c658db0c14e9897d09b79f8aa235db9e
+	sha256sums = 0968289ce31f750834b8f495951e1a29a2971d38e9d4d20213bb2a1f174a2fb1
 
 pkgname = threema-web
 
diff --git a/PKGBUILD b/PKGBUILD
index 2939739e3ee4..c95d32b5f7f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 #   curl https://keybase.io/threema/pgp_keys.asc | gpg --import
 #   gpg --lsign E7ADD9914E260E8B35DFB50665FDE935573ACDA6
 pkgname=threema-web
-pkgver=2.1.7
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="The Threema Web client, packaged to run locally on port 4242"
 arch=('any')
@@ -21,11 +21,13 @@ source=(
     "https://github.com/threema-ch/threema-web/releases/download/v${pkgver}/threema-web-${pkgver}-gh.tar.gz"
     "https://github.com/threema-ch/threema-web/releases/download/v${pkgver}/threema-web-${pkgver}-gh.tar.gz.asc"
     "threema-web.service"
+    "launch.py"
 )
 sha256sums=(
-    'ce3176132e9192caa09610b1ae0e0d0dbc87b943e8aed10b3f299f0c7e1437ed'
-    'SKIP'  # PGP signature
-    '6cb24b36278ef9d5b57d056d5b8428f82b94cb92f7ffc0ef4bc3eb5278488514'
+    '372c670e1bd8c862cfcb7140cff33f0004803c4d014eec648857d9327357d9c1'
+    'SKIP'
+    '1fbf9c4af5548138f75b00d2bd3de462c658db0c14e9897d09b79f8aa235db9e'
+    '0968289ce31f750834b8f495951e1a29a2971d38e9d4d20213bb2a1f174a2fb1'
 )
 install=threema-web.install
 
@@ -47,9 +49,12 @@ package() {
   chown -R root:http ${pkgdir}/opt/threema-web
   find "${pkgdir}/opt/threema-web" -type f -exec chmod 640 {} \;
   find "${pkgdir}/opt/threema-web" -type d -exec chmod 750 {} \;
+  install -Dm644 -o root -g http "${srcdir}/launch.py" "${pkgdir}/opt/threema-web/"
+
+  # Install launcher
 
   # Install service file
-  install -Dm640 -o root -g root ${srcdir}/threema-web.service "${pkgdir}/etc/systemd/system/"
+  install -Dm640 -o root -g root "${srcdir}/threema-web.service" "${pkgdir}/etc/systemd/system/"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/launch.py b/launch.py
new file mode 100644
index 000000000000..7b35a72ca6e9
--- /dev/null
+++ b/launch.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+from http import server
+
+PORT = 4242
+
+
+class WasmAwareRequestHandler(server.SimpleHTTPRequestHandler):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.extensions_map['.wasm'] = 'application/wasm'
+
+
+httpd = server.HTTPServer(('localhost', PORT), WasmAwareRequestHandler)
+print('Starting server on port %d' % PORT)
+httpd.serve_forever()
diff --git a/threema-web.service b/threema-web.service
index c9dd0871f486..cdc63e1a0769 100644
--- a/threema-web.service
+++ b/threema-web.service
@@ -5,7 +5,7 @@ Description=Serve Threema Web on localhost port 4242.
 Type=simple
 User=http
 Group=http
-ExecStart=/usr/bin/env python3 -m http.server -b 127.0.0.1 4242
+ExecStart=/usr/bin/env python3 /opt/threema-web/launch.py
 WorkingDirectory=/opt/threema-web
 Restart=on-failure
 RestartSec=3