update spice-use-pve-certs.patch for 1.7

diff --git a/debian/patches/spice-use-pve-certs.patch b/debian/patches/spice-use-pve-certs.patch
index 69031f6ff7104126dc281bf66e0cce656b4928fc..7a2bc1be88cdc60c6e44676fa7c5e202947db146 100644 (file)
--- a/debian/patches/spice-use-pve-certs.patch
+++ b/debian/patches/spice-use-pve-certs.patch
@@ -1,25 +1,22 @@
 Index: new/ui/spice-core.c
 ===================================================================
---- new.orig/ui/spice-core.c   2013-07-23 09:49:39.000000000 +0200
-+++ new/ui/spice-core.c        2013-07-23 09:56:56.000000000 +0200
-@@ -669,33 +669,38 @@
+--- new.orig/ui/spice-core.c   2013-11-27 11:43:08.000000000 +0100
++++ new/ui/spice-core.c        2013-11-27 11:46:26.000000000 +0100
+@@ -672,32 +672,35 @@
  
      if (tls_port) {
          x509_dir = qemu_opt_get(opts, "x509-dir");
 -        if (NULL == x509_dir) {
 -            x509_dir = ".";
-+        if (x509_dir) {
-+            len = strlen(x509_dir) + 32;
-         }
--        len = strlen(x509_dir) + 32;
+-        }
  
          str = qemu_opt_get(opts, "x509-key-file");
          if (str) {
              x509_key_file = g_strdup(str);
 -        } else {
 +        } else if (x509_dir) {
-             x509_key_file = g_malloc(len);
-             snprintf(x509_key_file, len, "%s/%s", x509_dir, X509_SERVER_KEY_FILE);
+             x509_key_file = g_strdup_printf("%s/%s", x509_dir,
+                                             X509_SERVER_KEY_FILE);
 +        } else {
 +            x509_key_file = g_strdup("/etc/pve/local/pve-ssl.key");
          }
@@ -29,8 +26,8 @@ Index: new/ui/spice-core.c
              x509_cert_file = g_strdup(str);
 -        } else {
 +        } else if (x509_dir) {
-             x509_cert_file = g_malloc(len);
-             snprintf(x509_cert_file, len, "%s/%s", x509_dir, X509_SERVER_CERT_FILE);
+             x509_cert_file = g_strdup_printf("%s/%s", x509_dir,
+                                              X509_SERVER_CERT_FILE);
 +        } else {
 +            x509_cert_file = g_strdup("/etc/pve/local/pve-ssl.pem");
          }
@@ -40,8 +37,8 @@ Index: new/ui/spice-core.c
              x509_cacert_file = g_strdup(str);
 -        } else {
 +        } else if (x509_dir) {
-             x509_cacert_file = g_malloc(len);
-             snprintf(x509_cacert_file, len, "%s/%s", x509_dir, X509_CA_CERT_FILE);
+             x509_cacert_file = g_strdup_printf("%s/%s", x509_dir,
+                                                X509_CA_CERT_FILE);
 +        } else {
 +            x509_cacert_file = g_strdup("/etc/pve/pve-root-ca.pem");
          }