refresh and enable debian/patches/pve-auth.patch

diff --git a/debian/patches/pve-auth.patch b/debian/patches/pve-auth.patch
index a59cacfb7d69ff6fb089c65f634cd7f764817d85..bf39a51adcddff155fac16bdde0e9ff8550ce6a4 100644 (file)
--- a/debian/patches/pve-auth.patch
+++ b/debian/patches/pve-auth.patch
@@ -1,8 +1,8 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c  2013-11-26 11:44:21.000000000 +0100
-+++ new/ui/vnc.c       2013-11-26 11:44:30.000000000 +0100
-@@ -43,6 +43,125 @@
+--- new.orig/ui/vnc.c  2014-05-05 06:55:26.000000000 +0200
++++ new/ui/vnc.c       2014-05-05 07:24:10.000000000 +0200
+@@ -44,6 +44,125 @@
  #include "vnc_keysym.h"
  #include "d3des.h"
  
@@ -128,7 +128,7 @@ Index: new/ui/vnc.c
  static VncDisplay *vnc_display; /* needed for info vnc */
  
  static int vnc_cursor_define(VncState *vs);
-@@ -3155,6 +3274,7 @@
+@@ -3125,6 +3244,7 @@
              tls = 1; /* Require TLS */
          } else if (strncmp(options, "x509", 4) == 0) {
              char *start, *end;
@@ -136,7 +136,7 @@ Index: new/ui/vnc.c
              x509 = 1; /* Require x509 certificates */
              if (strncmp(options, "x509verify", 10) == 0)
                  vs->tls.x509verify = 1; /* ...and verify client certs */
-@@ -3175,8 +3295,10 @@
+@@ -3145,8 +3265,10 @@
                  }
                  g_free(path);
              } else {
@@ -149,7 +149,7 @@ Index: new/ui/vnc.c
              }
  #endif
  #if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
-@@ -3240,10 +3362,10 @@
+@@ -3219,10 +3341,10 @@
              vs->auth = VNC_AUTH_VENCRYPT;
              if (x509) {
                  VNC_DEBUG("Initializing VNC server with x509 password auth\n");
@@ -164,8 +164,8 @@ Index: new/ui/vnc.c
  #endif /* CONFIG_VNC_TLS */
 Index: new/ui/vnc-auth-vencrypt.c
 ===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c    2013-11-26 10:50:23.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c 2013-11-26 11:47:41.000000000 +0100
+--- new.orig/ui/vnc-auth-vencrypt.c    2014-05-05 06:55:26.000000000 +0200
++++ new/ui/vnc-auth-vencrypt.c 2014-05-05 07:24:10.000000000 +0200
 @@ -26,6 +26,107 @@
  
  #include "vnc.h"
@@ -289,9 +289,9 @@ Index: new/ui/vnc-auth-vencrypt.c
         VNC_DEBUG("Start TLS auth VNC\n");
 Index: new/ui/vnc.h
 ===================================================================
---- new.orig/ui/vnc.h  2013-11-26 10:50:23.000000000 +0100
-+++ new/ui/vnc.h       2013-11-26 11:44:30.000000000 +0100
-@@ -270,6 +270,8 @@
+--- new.orig/ui/vnc.h  2014-05-05 06:55:26.000000000 +0200
++++ new/ui/vnc.h       2014-05-05 07:24:10.000000000 +0200
+@@ -279,6 +279,8 @@
      char challenge[VNC_AUTH_CHALLENGE_SIZE];
  #ifdef CONFIG_VNC_TLS
      int subauth; /* Used by VeNCrypt */
@@ -300,7 +300,7 @@ Index: new/ui/vnc.h
      VncStateTLS tls;
  #endif
  #ifdef CONFIG_VNC_SASL
-@@ -585,4 +587,6 @@
+@@ -594,4 +596,6 @@
  int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
  void vnc_zrle_clear(VncState *vs);
  
@@ -309,8 +309,8 @@ Index: new/ui/vnc.h
  #endif /* __QEMU_VNC_H */
 Index: new/ui/vnc-tls.c
 ===================================================================
---- new.orig/ui/vnc-tls.c      2013-11-26 10:50:23.000000000 +0100
-+++ new/ui/vnc-tls.c   2013-11-26 11:44:30.000000000 +0100
+--- new.orig/ui/vnc-tls.c      2014-05-05 06:55:26.000000000 +0200
++++ new/ui/vnc-tls.c   2014-05-05 07:24:10.000000000 +0200
 @@ -302,6 +302,14 @@
  
  static int vnc_set_gnutls_priority(gnutls_session_t s, int x509)
@@ -365,8 +365,8 @@ Index: new/ui/vnc-tls.c
                                 const char *certdir)
 Index: new/ui/vnc-tls.h
 ===================================================================
---- new.orig/ui/vnc-tls.h      2013-11-26 10:50:23.000000000 +0100
-+++ new/ui/vnc-tls.h   2013-11-26 11:44:30.000000000 +0100
+--- new.orig/ui/vnc-tls.h      2014-05-05 06:55:26.000000000 +0200
++++ new/ui/vnc-tls.h   2014-05-05 07:24:10.000000000 +0200
 @@ -68,6 +68,8 @@
  
  int vnc_tls_validate_certificate(VncState *vs);
@@ -378,9 +378,9 @@ Index: new/ui/vnc-tls.h
  
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2013-11-26 11:44:20.000000000 +0100
-+++ new/vl.c   2013-11-26 11:44:30.000000000 +0100
-@@ -3566,6 +3566,7 @@
+--- new.orig/vl.c      2014-05-05 07:13:45.000000000 +0200
++++ new/vl.c   2014-05-05 07:24:10.000000000 +0200
+@@ -3690,6 +3690,7 @@
                    fprintf(stderr, "Invalid ID\n");
                    exit(1);
                }
@@ -390,9 +390,9 @@ Index: new/vl.c
                  cpuunits = atoi(optarg);
 Index: new/include/ui/console.h
 ===================================================================
---- new.orig/include/ui/console.h      2013-11-26 10:50:22.000000000 +0100
-+++ new/include/ui/console.h   2013-11-26 11:44:30.000000000 +0100
-@@ -312,6 +312,7 @@
+--- new.orig/include/ui/console.h      2014-05-05 06:55:26.000000000 +0200
++++ new/include/ui/console.h   2014-05-05 07:24:10.000000000 +0200
+@@ -319,6 +319,7 @@
  void cocoa_display_init(DisplayState *ds, int full_screen);
  
  /* vnc.c */

diff --git a/debian/patches/series b/debian/patches/series
index daea5ffa65d42b75d6789afe9940df6917e56ff3..7e7d1c61057670f887cb873386f03231d69382c2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,7 @@ adjust-path.diff
 fairsched.diff
 # TODO adopt patches for qemu 2.0
 #keymap.diff
-#pve-auth.patch
+pve-auth.patch
 #vencrypt-auth-plain.patch
 #fix-qemu-img-snapshot-removal.patch
 #enable-kvm-by-default.patch