diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2013-07-01 20:13:48 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2013-07-01 20:13:48 -0500 |
| commit | a1ecc814cdf66c5a2d7b92750cd1d927a05276ac (patch) | |
| tree | 10a8674d1319d6026e638471ca0eb58f9a0da12f /main | |
| parent | e095f1bd0bb9ff6dc8f1ceeff2277537bc3de153 (diff) | |
| download | aports-a1ecc814cdf66c5a2d7b92750cd1d927a05276ac.tar.bz2 aports-a1ecc814cdf66c5a2d7b92750cd1d927a05276ac.tar.xz | |
main/xen: fix plaintext websockets support
Diffstat (limited to 'main')
| -rw-r--r-- | main/xen/APKBUILD | 8 | ||||
| -rw-r--r-- | main/xen/qemu-xen-websocket.patch | 22 |
2 files changed, 21 insertions, 9 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index e787912599..cf005c05e7 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=xen pkgver=4.2.2 -pkgrel=7 +pkgrel=8 pkgdesc="Xen hypervisor" url="http://www.xen.org/" arch="x86 x86_64" @@ -167,7 +167,7 @@ e70b9128ffc2175cea314a533a7d8457 xsa56.patch 7475158130474ee062a4eb878259af61 xsa57.patch 7de2cd11c10d6a554f3c81e0688c38b7 xsa58-4.2.patch c1d1a415415b0192e5dae9032962bf61 fix-pod2man-choking.patch -b72ee3a59d4e4e4f9816c03e0128ccc1 qemu-xen-websocket.patch +af5c5e21e68ae27847e2307815c82f98 qemu-xen-websocket.patch 95d8af17bf844d41a015ff32aae51ba1 xenstored.initd b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd ed262f15fb880badb53575539468646c xenconsoled.initd @@ -197,7 +197,7 @@ a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d xsa56.patch b6a5106848541972519cc529859d9ff3083c79367276c7031560fa4ce6f9f770 xsa57.patch 194d6610fc38b767d643e5d58a1268f45921fb35e309b47aca6a388b861311c2 xsa58-4.2.patch b4e7d43364a06b2cb04527db3e9567524bc489fef475709fd8493ebf1e62406d fix-pod2man-choking.patch -1b658baa846a472bceb33457e6f2414711eeaa79819f9492ba978c3daf00dc8f qemu-xen-websocket.patch +cc4bf76be2c87ba089f9e330f3f18419a8399920319e04f6a97be463ce1bfa1e qemu-xen-websocket.patch 81d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381 xenstored.initd ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd 93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd @@ -227,7 +227,7 @@ b4f43095163146a29ae258575bb03bd45f5a315d3cca7434a0b88c18eb1b6e1cf17ef13b4ac428a0 5ccc1654d9f0270485495f9fc913e41663ddbda602ffe049e0a9c3247c6246690b7ec4165482f96921c5253a2a5205ca384048339996e611c07ab60a6a75cf6a xsa57.patch 60813c01f6bb909da8748919df4d0ffa923baf4b7b55287e0bec3389fb83020158225182e112941c9e126b4df57e7b8724f2a69d0c1fa9ce3b37c0bdf1a49da4 xsa58-4.2.patch ffb1113fcec0853b690c177655c7d1136388efdebf0d7f625b80481b98eadd3e9ef461442ced53e11acf0e347800a2b0a41e18b05065b5d04bffdd8a4e127cec fix-pod2man-choking.patch -a48337c7f687e6d2dff400e99e2f544361c5dcaf6a4c745892603c73087f7f9be48eccadf77baee3e106c01b749b335646ccb10b29272b2f5ca681d2514228f6 qemu-xen-websocket.patch +5da25a997c69d737b6a43f460d54e34dccf3c94751990969c93e674ab3aaa34ddd41c2b2a7988aaa68a22abf1508705336d9a9ae3637147b0cf9036b9909daf8 qemu-xen-websocket.patch 792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee xenstored.initd 100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd 12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd diff --git a/main/xen/qemu-xen-websocket.patch b/main/xen/qemu-xen-websocket.patch index 9d1b2e6dad..4e54d7e213 100644 --- a/main/xen/qemu-xen-websocket.patch +++ b/main/xen/qemu-xen-websocket.patch @@ -789,7 +789,7 @@ } return 0; -@@ -2944,6 +3069,30 @@ +@@ -2944,21 +3069,56 @@ vs->lsock = unix_listen(display+5, dpy+5, 256-5); } else { vs->lsock = inet_listen(display, dpy, 256, SOCK_STREAM, 5900); @@ -818,12 +818,24 @@ + } +#endif /* CONFIG_VNC_WS */ } - if (-1 == vs->lsock) { - g_free(dpy); -@@ -2954,11 +3103,20 @@ +- if (-1 == vs->lsock) { +- g_free(dpy); +- return -1; +- } else { +- g_free(vs->display); +- vs->display = dpy; ++ g_free(vs->display); ++ vs->display = dpy; ++ ++ qemu_set_fd_handler2(vs->lsock, NULL, vnc_listen_regular_read, NULL, vs); ++#ifdef CONFIG_VNC_WS ++ if (vs->websocket) { ++ qemu_set_fd_handler2(vs->lwebsock, NULL, vnc_listen_websocket_read, NULL, vs); } ++#endif } - return qemu_set_fd_handler2(vs->lsock, NULL, vnc_listen_read, NULL, vs); +- return qemu_set_fd_handler2(vs->lsock, NULL, vnc_listen_read, NULL, vs); ++ return 0; + +fail: + g_free(vs->display); |