diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2013-09-08 13:34:33 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2013-09-08 13:34:53 +0000 |
| commit | 12e4869ec50f6b79188f971e1908441b3ae8ad4c (patch) | |
| tree | e81577fd1239fce93398bb1287c07349141369ca | |
| parent | 06486755943480bb707d811e7b380321d7b95f8e (diff) | |
| download | aports-12e4869ec50f6b79188f971e1908441b3ae8ad4c.tar.bz2 aports-12e4869ec50f6b79188f971e1908441b3ae8ad4c.tar.xz | |
main/xen: fix up qemu-xen-websocket patch
| -rw-r--r-- | main/xen/APKBUILD | 6 | ||||
| -rw-r--r-- | main/xen/qemu-xen-websocket.patch | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index f330e0ce8f..468deee1f8 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -187,7 +187,7 @@ ed7d0399c6ca6aeee479da5d8f807fe0 xsa41b.patch 2f3dd7bdc59d104370066d6582725575 xsa41c.patch b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch 2651e5c42934bc5d37bae1fdeb7aa0c4 fix-pod2man-choking.patch -2b5e6af003ca8246701a3673d2d2292f qemu-xen-websocket.patch +a4097e06a7e000ed00f4607db014d277 qemu-xen-websocket.patch 35bdea1d4e3ae2565edc7e40906efdd5 qemu-xen-tls-websockets.patch a90c36642f0701a8aaa4ebe4dde430f5 xenstored.initd b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd @@ -209,7 +209,7 @@ a0c225d716d343fe041b63e3940900c5b3573ed3bcfc5b7c2d52ea2861c3fc28 docs-Fix-gener 683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914 xsa41c.patch dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patch b58bc9c048d05856f1a7571c60afd0bab72493cc6aa402c15a5f5dc85483fa7e fix-pod2man-choking.patch -0ed31a9f92662c38ac6ec75280387304816703441fcc4721003f9c2347507893 qemu-xen-websocket.patch +e9f6c482fc449e0b540657a8988ad31f2e680b8933e50e6486687a52f6a9ed04 qemu-xen-websocket.patch 435dd428d83acdfde58888532a1cece1e9075b2a2460fe3f6cd33c7d400f2715 qemu-xen-tls-websockets.patch 868c77d689ae54b7041da169bfaa01868503337d4105a071eb771f4ec5a0543d xenstored.initd ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd @@ -231,7 +231,7 @@ bda9105793f2327e1317991762120d0668af0e964076b18c9fdbfd509984b2e88d85df95702c46b2 36b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9 xsa41c.patch 31dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 xsa48-4.2.patch dd8f016b36719e0f96ce3c9c7098d4047ee2d36e7147f3c35a730253eec2f64100f7702430f5e637727dc7c3a20b1762270ffce2291b2046e08028da14d4c7e6 fix-pod2man-choking.patch -442b6e6ed771e58226cd541d0ee0e2eafc9442ef77236a86e02d594eaeb1abb725895d44b8ed8a04d64280bd4c61b7ca91b0fdd448647f59ba5d0fdc82f85cc9 qemu-xen-websocket.patch +45f1da45f3ff937d0a626e37c130d76f5b97f49a57ddeb11ef2a8e850c04c32c819a3dfcef501eb3784db5fe7b39c88230063e56aa6e5197fd9c7b7d424fff77 qemu-xen-websocket.patch 11eaccc346440ff285552f204d491e3b31bda1665c3219ecae3061b5d55db9dec885af0c031fa19c67e87bbe238002b1911bbd5bfea2f2ba0d61e6b3d0c952c9 qemu-xen-tls-websockets.patch 880584e0866b1efcf3b7a934f07072ec84c13c782e3e7a15848d38ba8af50259d46db037dca1e037b15274989f2c22acd1134954dd60c59f4ee693b417d03e0d xenstored.initd 100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd diff --git a/main/xen/qemu-xen-websocket.patch b/main/xen/qemu-xen-websocket.patch index 02bb805dac..aa6446e86d 100644 --- a/main/xen/qemu-xen-websocket.patch +++ b/main/xen/qemu-xen-websocket.patch @@ -533,6 +533,15 @@ static void vnc_init_timer(VncDisplay *vd); static void vnc_remove_timer(VncDisplay *vd); +@@ -486,7 +485,7 @@ + return buffer->offset == 0; + } + +-static uint8_t *buffer_end(Buffer *buffer) ++uint8_t *buffer_end(Buffer *buffer) + { + return buffer->buffer + buffer->offset; + } @@ -510,6 +509,13 @@ buffer->offset += len; } @@ -837,10 +846,10 @@ + if (vs->websocket) { + if (vs->ws_display) { + vs->lwebsock = inet_listen(vs->ws_display, NULL, 256, -+ SOCK_STREAM, 0); ++ SOCK_STREAM, 0, errp); + } else { + vs->lwebsock = inet_listen(vs->display, NULL, 256, -+ SOCK_STREAM, 5700); ++ SOCK_STREAM, 5700, errp); + } + + if (vs->lwebsock < 0) { |