fix binary type detection

We need to use wss:// instead of ws:// to avoid security errors.

diff --git a/debian/control b/debian/control
index dcdc225d5008e4123f0dabc5a943620294fd0a6a..1a895c8841476fb88693d4ec1dd0ae5998a62c69 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: novnc-pve
 Section: web
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 7.0.0~)
+Build-Depends: debhelper (>= 7.0.0~), quilt
 Standards-Version: 3.8.3
 Homepage: https://github.com/kanaka/noVNC/
 

diff --git a/debian/patches/fix-websocket-binary-support-test.patch b/debian/patches/fix-websocket-binary-support-test.patch
new file mode 100644 (file)
index 0000000..c36c8b7
--- /dev/null
+++ b/debian/patches/fix-websocket-binary-support-test.patch
@@ -0,0 +1,13 @@
+Index: new/include/websock.js
+===================================================================
+--- new.orig/include/websock.js        2014-06-13 07:20:22.000000000 +0200
++++ new/include/websock.js     2014-06-18 14:12:20.000000000 +0200
+@@ -282,7 +282,7 @@
+     // TODO: this sucks, the property should exist on the prototype
+     // but it does not.
+     try {
+-        if (bt && ('binaryType' in (new WebSocket("ws://localhost:17523")))) {
++        if (bt && ('binaryType' in (new WebSocket("wss://localhost:17523")))) {
+             Util.Info("Detected binaryType support in WebSockets");
+             wsbt = true;
+         }

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..af4d599
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-websocket-binary-support-test.patch

diff --git a/debian/rules b/debian/rules
index 915f1dc51005edeeebaca7fef9462da070a1bfef..4929ed99d039eebfd432445976fe2cbd4256e856 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,4 +13,4 @@ build:
        make -C utils rebind.so
 
 %:
-       dh ${@}
+       dh ${@} --with quilt