X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=d6d2c60bd342a9e7470db9c6ed93e98b803b160d;hp=c31da453600910c9ad34df44c1de47531008e47f;hb=77fa38b0152ac1eb78b8ef467bc4eb8bf1fc6875;hpb=7470b860cfb9847023a18a90d640e4ed229e6310 diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index c31da45..d6d2c60 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-5.1.0.orig/src/qemu/qemu_command.c libvirt-5.1.0/src/qemu/qemu_command.c ---- libvirt-5.1.0.orig/src/qemu/qemu_command.c 2019-03-23 11:41:18.269000000 +0100 -+++ libvirt-5.1.0/src/qemu/qemu_command.c 2019-03-23 11:41:44.602000000 +0100 -@@ -8155,6 +8155,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD +diff -urp libvirt-5.3.0.orig/src/qemu/qemu_command.c libvirt-5.3.0/src/qemu/qemu_command.c +--- libvirt-5.3.0.orig/src/qemu/qemu_command.c 2019-05-06 14:10:01.332000000 +0200 ++++ libvirt-5.3.0/src/qemu/qemu_command.c 2019-05-06 14:10:36.653000000 +0200 +@@ -8306,6 +8306,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -12,9 +12,9 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu_command.c libvirt-5.1.0/src/qemu/qemu } virCommandAddArg(cmd, "-vnc"); -diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf ---- libvirt-5.1.0.orig/src/qemu/qemu.conf 2019-03-23 11:41:18.271000000 +0100 -+++ libvirt-5.1.0/src/qemu/qemu.conf 2019-03-23 11:41:44.602000000 +0100 +diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf +--- libvirt-5.3.0.orig/src/qemu/qemu.conf 2019-05-06 14:10:01.334000000 +0200 ++++ libvirt-5.3.0/src/qemu/qemu.conf 2019-05-06 14:10:36.653000000 +0200 @@ -141,6 +141,15 @@ #vnc_sasl = 1 @@ -31,9 +31,9 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf # The default SASL configuration file is located in /etc/sasl/ # When running libvirtd unprivileged, it may be desirable to # override the configs in this location. Set this parameter to -diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_conf.c ---- libvirt-5.1.0.orig/src/qemu/qemu_conf.c 2019-03-23 11:41:18.270000000 +0100 -+++ libvirt-5.1.0/src/qemu/qemu_conf.c 2019-03-23 11:47:01.904000000 +0100 +diff -urp libvirt-5.3.0.orig/src/qemu/qemu_conf.c libvirt-5.3.0/src/qemu/qemu_conf.c +--- libvirt-5.3.0.orig/src/qemu/qemu_conf.c 2019-05-06 14:10:01.332000000 +0200 ++++ libvirt-5.3.0/src/qemu/qemu_conf.c 2019-05-06 14:10:36.654000000 +0200 @@ -471,6 +471,8 @@ virQEMUDriverConfigLoadVNCEntry(virQEMUD return -1; if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0) @@ -43,9 +43,9 @@ diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.c libvirt-5.1.0/src/qemu/qemu_co return 0; } -diff -urp libvirt-5.1.0.orig/src/qemu/qemu_conf.h libvirt-5.1.0/src/qemu/qemu_conf.h ---- libvirt-5.1.0.orig/src/qemu/qemu_conf.h 2019-03-23 11:41:18.270000000 +0100 -+++ libvirt-5.1.0/src/qemu/qemu_conf.h 2019-03-23 11:41:44.603000000 +0100 +diff -urp libvirt-5.3.0.orig/src/qemu/qemu_conf.h libvirt-5.3.0/src/qemu/qemu_conf.h +--- libvirt-5.3.0.orig/src/qemu/qemu_conf.h 2019-05-06 14:10:01.332000000 +0200 ++++ libvirt-5.3.0/src/qemu/qemu_conf.h 2019-05-06 14:10:36.654000000 +0200 @@ -124,6 +124,7 @@ struct _virQEMUDriverConfig { bool vncTLSx509verify; bool vncTLSx509verifyPresent;