rpms/xen/devel xen-qemu-vnc-authentication.patch, 1.3.2.1, 1.3.2.2 xen-qemu-vnc-x509-certs.patch, 1.1.2.1, 1.1.2.2 xen.spec, 1.194.2.5, 1.194.2.6
Daniel P. Berrange (berrange)
fedora-extras-commits at redhat.com
Mon Oct 29 21:24:29 UTC 2007
Author: berrange
Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26516
Modified Files:
Tag: private-berrange-xen-unstable
xen-qemu-vnc-authentication.patch
xen-qemu-vnc-x509-certs.patch xen.spec
Log Message:
Fix a couple of VNC auth bugs
xen-qemu-vnc-authentication.patch:
Index: xen-qemu-vnc-authentication.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-vnc-authentication.patch,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- xen-qemu-vnc-authentication.patch 29 Oct 2007 20:35:49 -0000 1.3.2.1
+++ xen-qemu-vnc-authentication.patch 29 Oct 2007 21:24:26 -0000 1.3.2.2
@@ -1,6 +1,6 @@
diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/configure xen-unstable.hg-16125.new/tools/ioemu/configure
--- xen-unstable.hg-16125.orig/tools/ioemu/configure 2007-10-19 09:51:31.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/ioemu/configure 2007-10-29 15:45:02.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/configure 2007-10-29 16:45:01.000000000 -0400
@@ -87,6 +87,7 @@ alsa="no"
fmod="no"
fmod_lib=""
@@ -71,7 +71,7 @@
rm -f $TMPO $TMPC $TMPE $TMPS
diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/d3des.c xen-unstable.hg-16125.new/tools/ioemu/d3des.c
--- xen-unstable.hg-16125.orig/tools/ioemu/d3des.c 1969-12-31 19:00:00.000000000 -0500
-+++ xen-unstable.hg-16125.new/tools/ioemu/d3des.c 2007-10-29 15:45:02.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/d3des.c 2007-10-29 16:45:01.000000000 -0400
@@ -0,0 +1,434 @@
+/*
+ * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -509,7 +509,7 @@
+ **********************************************************************/
diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/d3des.h xen-unstable.hg-16125.new/tools/ioemu/d3des.h
--- xen-unstable.hg-16125.orig/tools/ioemu/d3des.h 1969-12-31 19:00:00.000000000 -0500
-+++ xen-unstable.hg-16125.new/tools/ioemu/d3des.h 2007-10-29 15:45:02.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/d3des.h 2007-10-29 16:45:01.000000000 -0400
@@ -0,0 +1,51 @@
+/*
+ * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -563,8 +563,8 @@
+/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
+ ********************************************************************/
diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/Makefile.target xen-unstable.hg-16125.new/tools/ioemu/Makefile.target
---- xen-unstable.hg-16125.orig/tools/ioemu/Makefile.target 2007-10-29 15:44:44.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/ioemu/Makefile.target 2007-10-29 15:46:53.000000000 -0400
+--- xen-unstable.hg-16125.orig/tools/ioemu/Makefile.target 2007-10-29 16:44:22.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/Makefile.target 2007-10-29 16:45:01.000000000 -0400
@@ -387,6 +387,11 @@ SOUND_HW += fmopl.o adlib.o
endif
AUDIODRV+= wavcapture.o
@@ -597,7 +597,7 @@
sdlaudio.o: sdlaudio.c
diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/monitor.c xen-unstable.hg-16125.new/tools/ioemu/monitor.c
--- xen-unstable.hg-16125.orig/tools/ioemu/monitor.c 2007-10-19 09:51:31.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/ioemu/monitor.c 2007-10-29 15:45:02.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/monitor.c 2007-10-29 16:45:01.000000000 -0400
@@ -374,7 +374,7 @@ void do_eject(int force, const char *fil
eject_device(bs, force);
}
@@ -638,9 +638,29 @@
static void do_screen_dump(const char *filename)
{
vga_hw_screen_dump(filename);
+diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/vl.c xen-unstable.hg-16125.new/tools/ioemu/vl.c
+--- xen-unstable.hg-16125.orig/tools/ioemu/vl.c 2007-10-29 16:44:22.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/vl.c 2007-10-29 16:58:03.000000000 -0400
+@@ -7683,8 +7683,14 @@ int main(int argc, char **argv)
+ dumb_display_init(ds);
+ } else if (vnc_display != NULL || vncunused != 0) {
+ int vnc_display_port;
+- vnc_display_port = vnc_display_init(ds, vnc_display, vncunused);
+- if (vncviewer)
++ char password[20];
++ vnc_display_init(ds);
++ if (xenstore_read_vncpasswd(domid, password, sizeof(password)) < 0)
++ exit(0);
++ vnc_display_password(ds, password);
++ if ((vnc_display_port = vnc_display_open(ds, vnc_display, vncunused)) < 0)
++ exit (0);
++ if (vncviewer)
+ vnc_start_viewer(vnc_display_port);
+ xenstore_write_vncport(vnc_display_port);
+ } else {
diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/vl.h xen-unstable.hg-16125.new/tools/ioemu/vl.h
---- xen-unstable.hg-16125.orig/tools/ioemu/vl.h 2007-10-29 15:44:44.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/ioemu/vl.h 2007-10-29 15:47:52.000000000 -0400
+--- xen-unstable.hg-16125.orig/tools/ioemu/vl.h 2007-10-29 16:44:22.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/vl.h 2007-10-29 16:45:01.000000000 -0400
@@ -943,7 +943,10 @@ void sdl_display_init(DisplayState *ds,
void cocoa_display_init(DisplayState *ds, int full_screen);
@@ -653,9 +673,33 @@
void do_info_vnc(void);
int vnc_start_viewer(int port);
+diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/vnc-37 xen-unstable.hg-16125.new/tools/ioemu/vnc-37
+--- xen-unstable.hg-16125.orig/tools/ioemu/vnc-37 1969-12-31 19:00:00.000000000 -0500
++++ xen-unstable.hg-16125.new/tools/ioemu/vnc-37 2007-10-29 17:21:17.000000000 -0400
+@@ -0,0 +1,20 @@
++According to http://www.realvnc.com/docs/rfbproto.pdf section 6.2.1,
++when handling older clients, SecurityResult should not be sent.
++
++diff --git a/vnc.c b/vnc.c
++index 72c8d1c..8ae671a 100644
++--- a/vnc.c
+++++ b/vnc.c
++@@ -1775,7 +1775,10 @@ static int protocol_client_auth(VncState *vs, char *data, size_t len)
++ switch (vs->auth) {
++ case VNC_AUTH_NONE:
++ VNC_DEBUG("Accept auth none\n");
++- vnc_write_u32(vs, 0); /* Accept auth completion */
+++ if (vs->minor >= 8) {
+++ vnc_write_u32(vs, 0); /* Accept auth completion */
+++ vnc_flush(vs);
+++ }
++ vnc_read_when(vs, protocol_client_init, 1);
++ break;
++
++
diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/vnc.c xen-unstable.hg-16125.new/tools/ioemu/vnc.c
---- xen-unstable.hg-16125.orig/tools/ioemu/vnc.c 2007-10-29 15:44:44.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/ioemu/vnc.c 2007-10-29 16:24:50.000000000 -0400
+--- xen-unstable.hg-16125.orig/tools/ioemu/vnc.c 2007-10-29 16:44:22.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/vnc.c 2007-10-29 17:21:23.000000000 -0400
@@ -47,6 +47,28 @@
#include "vnc_keysym.h"
@@ -864,7 +908,7 @@
static void client_cut_text(VncState *vs, size_t len, char *text)
{
}
-@@ -1384,23 +1532,588 @@ static int protocol_client_init(VncState
+@@ -1384,23 +1532,591 @@ static int protocol_client_init(VncState
}
@@ -1368,7 +1412,10 @@
+ switch (vs->auth) {
+ case VNC_AUTH_NONE:
+ VNC_DEBUG("Accept auth none\n");
-+ vnc_write_u32(vs, 0); /* Accept auth completion */
++ if (vs->minor >= 8) {
++ vnc_write_u32(vs, 0); /* Accept auth completion */
++ vnc_flush(vs);
++ }
+ vnc_read_when(vs, protocol_client_init, 1);
+ break;
+
@@ -1461,7 +1508,7 @@
return 0;
}
-@@ -1413,9 +2126,10 @@ static void vnc_listen_read(void *opaque
+@@ -1413,9 +2129,10 @@ static void vnc_listen_read(void *opaque
vs->csock = accept(vs->lsock, (struct sockaddr *)&addr, &addrlen);
if (vs->csock != -1) {
@@ -1473,7 +1520,7 @@
vnc_flush(vs);
vnc_read_when(vs, protocol_version, 12);
framebuffer_set_updated(vs, 0, 0, vs->ds->width, vs->ds->height);
-@@ -1428,16 +2142,8 @@ static void vnc_listen_read(void *opaque
+@@ -1428,16 +2145,8 @@ static void vnc_listen_read(void *opaque
extern int parse_host_port(struct sockaddr_in *saddr, const char *str);
@@ -1491,7 +1538,7 @@
VncState *vs;
vs = qemu_mallocz(sizeof(VncState));
-@@ -1446,7 +2152,8 @@ int vnc_display_init(DisplayState *ds, c
+@@ -1446,7 +2155,8 @@ int vnc_display_init(DisplayState *ds, c
ds->opaque = vs;
vnc_state = vs;
@@ -1501,7 +1548,7 @@
vs->lsock = -1;
vs->csock = -1;
-@@ -1470,19 +2177,238 @@ int vnc_display_init(DisplayState *ds, c
+@@ -1470,19 +2180,238 @@ int vnc_display_init(DisplayState *ds, c
vs->ds->dpy_refresh = vnc_dpy_refresh;
vnc_dpy_resize(vs->ds, 640, 400);
@@ -1745,7 +1792,7 @@
}
uaddr.sun_family = AF_UNIX;
-@@ -1496,25 +2422,33 @@ int vnc_display_init(DisplayState *ds, c
+@@ -1496,25 +2425,33 @@ int vnc_display_init(DisplayState *ds, c
addr = (struct sockaddr *)&iaddr;
addrlen = sizeof(iaddr);
@@ -1788,7 +1835,7 @@
}
}
-@@ -1524,18 +2458,24 @@ int vnc_display_init(DisplayState *ds, c
+@@ -1524,18 +2461,24 @@ int vnc_display_init(DisplayState *ds, c
continue;
}
fprintf(stderr, "bind() failed\n");
@@ -1820,8 +1867,8 @@
return ntohs(iaddr.sin_port);
}
diff -rupN xen-unstable.hg-16125.orig/tools/ioemu/xenstore.c xen-unstable.hg-16125.new/tools/ioemu/xenstore.c
---- xen-unstable.hg-16125.orig/tools/ioemu/xenstore.c 2007-10-29 15:44:44.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/ioemu/xenstore.c 2007-10-29 16:07:00.000000000 -0400
+--- xen-unstable.hg-16125.orig/tools/ioemu/xenstore.c 2007-10-29 16:44:22.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/ioemu/xenstore.c 2007-10-29 16:45:01.000000000 -0400
@@ -505,6 +505,7 @@ int xenstore_read_vncpasswd(int domid, c
passwd = xs_read(xsh, XBT_NULL, buf, &len);
if (passwd == NULL) {
@@ -1831,8 +1878,8 @@
free(path);
return rc;
diff -rupN xen-unstable.hg-16125.orig/tools/python/xen/xend/image.py xen-unstable.hg-16125.new/tools/python/xen/xend/image.py
---- xen-unstable.hg-16125.orig/tools/python/xen/xend/image.py 2007-10-29 15:44:44.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/python/xen/xend/image.py 2007-10-29 16:04:35.000000000 -0400
+--- xen-unstable.hg-16125.orig/tools/python/xen/xend/image.py 2007-10-29 16:44:22.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/python/xen/xend/image.py 2007-10-29 16:45:01.000000000 -0400
@@ -31,6 +31,7 @@ from xen.xend.XendOptions import instanc
from xen.xend.xenstore.xstransact import xstransact
from xen.xend.xenstore.xswatch import xswatch
xen-qemu-vnc-x509-certs.patch:
Index: xen-qemu-vnc-x509-certs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-vnc-x509-certs.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- xen-qemu-vnc-x509-certs.patch 29 Oct 2007 20:35:49 -0000 1.1.2.1
+++ xen-qemu-vnc-x509-certs.patch 29 Oct 2007 21:24:26 -0000 1.1.2.2
@@ -1,6 +1,6 @@
diff -rupN xen-unstable.hg-16125.orig/tools/examples/xend-config.sxp xen-unstable.hg-16125.new/tools/examples/xend-config.sxp
---- xen-unstable.hg-16125.orig/tools/examples/xend-config.sxp 2007-10-29 15:44:44.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/examples/xend-config.sxp 2007-10-29 16:29:58.000000000 -0400
+--- xen-unstable.hg-16125.orig/tools/examples/xend-config.sxp 2007-10-29 16:44:22.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/examples/xend-config.sxp 2007-10-29 17:22:39.000000000 -0400
@@ -194,6 +194,36 @@
# Empty string is no authentication.
(vncpasswd '')
@@ -39,8 +39,8 @@
# when not specififed in VM's configuration
#(keymap 'en-us')
diff -rupN xen-unstable.hg-16125.orig/tools/python/xen/xend/image.py xen-unstable.hg-16125.new/tools/python/xen/xend/image.py
---- xen-unstable.hg-16125.orig/tools/python/xen/xend/image.py 2007-10-29 16:27:22.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/python/xen/xend/image.py 2007-10-29 16:27:42.000000000 -0400
+--- xen-unstable.hg-16125.orig/tools/python/xen/xend/image.py 2007-10-29 17:22:22.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/python/xen/xend/image.py 2007-10-29 17:23:06.000000000 -0400
@@ -17,7 +17,7 @@
#============================================================================
@@ -59,7 +59,7 @@
+ vncx509verify = XendOptions.instance().get_vnc_x509_verify()
+
+ if not os.path.exists(vncx509certdir):
-+ raise "VNC x509 certificate dir does not exist"
++ raise VmError("VNC x509 certificate dir %s does not exist" % vncx509certdir)
+
+ if vncx509verify:
+ vncopts = vncopts + ",tls,x509verify=%s" % vncx509certdir
@@ -72,7 +72,7 @@
vncdisplay = vnc_config.get('vncdisplay', 0)
diff -rupN xen-unstable.hg-16125.orig/tools/python/xen/xend/XendOptions.py xen-unstable.hg-16125.new/tools/python/xen/xend/XendOptions.py
--- xen-unstable.hg-16125.orig/tools/python/xen/xend/XendOptions.py 2007-10-19 09:51:32.000000000 -0400
-+++ xen-unstable.hg-16125.new/tools/python/xen/xend/XendOptions.py 2007-10-29 16:27:42.000000000 -0400
++++ xen-unstable.hg-16125.new/tools/python/xen/xend/XendOptions.py 2007-10-29 17:22:39.000000000 -0400
@@ -102,6 +102,15 @@ class XendOptions:
"""Default interface to listen for VNC connections on"""
xend_vnc_listen_default = '127.0.0.1'
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.194.2.5
retrieving revision 1.194.2.6
diff -u -r1.194.2.5 -r1.194.2.6
--- xen.spec 29 Oct 2007 20:35:49 -0000 1.194.2.5
+++ xen.spec 29 Oct 2007 21:24:26 -0000 1.194.2.6
@@ -5,7 +5,7 @@
Summary: Xen is a virtual machine monitor
Name: xen
Version: 3.1.1
-Release: 0%{?dist}.5unstable
+Release: 0%{?dist}.7unstable
Group: Development/Libraries
License: GPL
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
More information about the fedora-extras-commits
mailing list