[pve-devel] r5454 - pve-qemu-kvm/pve2/debian/patches

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jan 28 06:28:42 CET 2011


Author: dietmar
Date: 2011-01-28 06:28:42 +0100 (Fri, 28 Jan 2011)
New Revision: 5454

Modified:
   pve-qemu-kvm/pve2/debian/patches/pve-auth.patch
   pve-qemu-kvm/pve2/debian/patches/series
Log:
remove old vncticket code - no longer needed


Modified: pve-qemu-kvm/pve2/debian/patches/pve-auth.patch
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/pve-auth.patch	2011-01-28 05:22:35 UTC (rev 5453)
+++ pve-qemu-kvm/pve2/debian/patches/pve-auth.patch	2011-01-28 05:28:42 UTC (rev 5454)
@@ -1,7 +1,7 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c	2011-01-21 10:40:22.000000000 +0100
-+++ new/ui/vnc.c	2011-01-27 13:00:03.000000000 +0100
+--- new.orig/ui/vnc.c	2011-01-28 06:26:40.000000000 +0100
++++ new/ui/vnc.c	2011-01-28 06:27:22.000000000 +0100
 @@ -31,6 +31,8 @@
  #include "qemu-timer.h"
  #include "acl.h"
@@ -47,7 +47,7 @@
 +	return p;
 +}
 +
-+int 
++int
 +pve_auth_verify(const char *username, const char *passwd)
 +{
 +	struct sockaddr_in server;
@@ -136,7 +136,25 @@
  static VncDisplay *vnc_display; /* needed for info vnc */
  static DisplayChangeListener *dcl;
  
-@@ -2545,7 +2665,7 @@
+@@ -1825,7 +1945,7 @@
+ static void set_pixel_conversion(VncState *vs)
+ {
+     if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
+-        (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) && 
++        (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) &&
+         !memcmp(&(vs->clientds.pf), &(vs->ds->surface->pf), sizeof(PixelFormat))) {
+         vs->write_pixels = vnc_write_pixels_copy;
+         vnc_hextile_set_pixel_conversion(vs, 0);
+@@ -1911,7 +2031,7 @@
+         vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
+         vnc_write_u8(vs, 0);
+         vnc_write_u16(vs, 1); /* number of rects */
+-        vnc_framebuffer_update(vs, 0, 0, ds_get_width(vs->ds), 
++        vnc_framebuffer_update(vs, 0, 0, ds_get_width(vs->ds),
+                                ds_get_height(vs->ds), VNC_ENCODING_WMVi);
+         pixel_format_message(vs);
+         vnc_unlock_output(vs);
+@@ -2541,7 +2661,7 @@
  char *vnc_display_local_addr(DisplayState *ds)
  {
      VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
@@ -145,7 +163,7 @@
      return vnc_socket_local_addr("%s:%s", vs->lsock);
  }
  
-@@ -2592,6 +2712,7 @@
+@@ -2588,6 +2708,7 @@
              tls = 1; /* Require TLS */
          } else if (strncmp(options, "x509", 4) == 0) {
              char *start, *end;
@@ -153,7 +171,7 @@
              x509 = 1; /* Require x509 certificates */
              if (strncmp(options, "x509verify", 10) == 0)
                  vs->tls.x509verify = 1; /* ...and verify client certs */
-@@ -2614,10 +2735,12 @@
+@@ -2610,10 +2731,12 @@
                  }
                  qemu_free(path);
              } else {
@@ -170,7 +188,7 @@
              }
  #endif
          } else if (strncmp(options, "acl", 3) == 0) {
-@@ -2666,10 +2789,10 @@
+@@ -2662,10 +2785,10 @@
              vs->auth = VNC_AUTH_VENCRYPT;
              if (x509) {
                  VNC_DEBUG("Initializing VNC server with x509 password auth\n");
@@ -185,8 +203,8 @@
  #endif /* CONFIG_VNC_TLS */
 Index: new/ui/vnc-auth-vencrypt.c
 ===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c	2011-01-17 06:19:06.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c	2011-01-21 11:50:01.000000000 +0100
+--- new.orig/ui/vnc-auth-vencrypt.c	2011-01-28 06:26:16.000000000 +0100
++++ new/ui/vnc-auth-vencrypt.c	2011-01-28 06:26:48.000000000 +0100
 @@ -26,6 +26,96 @@
  
  #include "vnc.h"
@@ -299,9 +317,9 @@
         VNC_DEBUG("Start TLS auth VNC\n");
 Index: new/ui/vnc.h
 ===================================================================
---- new.orig/ui/vnc.h	2011-01-21 10:40:22.000000000 +0100
-+++ new/ui/vnc.h	2011-01-21 10:40:22.000000000 +0100
-@@ -217,6 +217,8 @@
+--- new.orig/ui/vnc.h	2011-01-28 06:26:17.000000000 +0100
++++ new/ui/vnc.h	2011-01-28 06:26:48.000000000 +0100
+@@ -216,6 +216,8 @@
  
      char challenge[VNC_AUTH_CHALLENGE_SIZE];
  #ifdef CONFIG_VNC_TLS
@@ -312,8 +330,8 @@
  #ifdef CONFIG_VNC_SASL
 Index: new/ui/vnc-tls.c
 ===================================================================
---- new.orig/ui/vnc-tls.c	2011-01-21 11:24:14.000000000 +0100
-+++ new/ui/vnc-tls.c	2011-01-21 12:55:25.000000000 +0100
+--- new.orig/ui/vnc-tls.c	2011-01-28 06:26:16.000000000 +0100
++++ new/ui/vnc-tls.c	2011-01-28 06:26:48.000000000 +0100
 @@ -291,6 +291,14 @@
      static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0};
      static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0};
@@ -370,8 +388,8 @@
                                 const char *certdir)
 Index: new/ui/vnc-tls.h
 ===================================================================
---- new.orig/ui/vnc-tls.h	2011-01-21 11:38:31.000000000 +0100
-+++ new/ui/vnc-tls.h	2011-01-21 11:38:38.000000000 +0100
+--- new.orig/ui/vnc-tls.h	2011-01-28 06:26:16.000000000 +0100
++++ new/ui/vnc-tls.h	2011-01-28 06:26:48.000000000 +0100
 @@ -68,6 +68,8 @@
  
  int vnc_tls_validate_certificate(VncState *vs);

Modified: pve-qemu-kvm/pve2/debian/patches/series
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/series	2011-01-28 05:22:35 UTC (rev 5453)
+++ pve-qemu-kvm/pve2/debian/patches/series	2011-01-28 05:28:42 UTC (rev 5454)
@@ -1,6 +1,5 @@
 adjust-path.diff
 fairsched.diff
-vncticket.diff
 keymap.diff
 live-migration-fixes.diff
 enable-ksm.diff



More information about the pve-devel mailing list