[Pkg-libvirt-commits] [libvirt] 08/09: apparmor: qemu monitor socket moved

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.3.3_rc1-1
in repository libvirt.

commit 4e4d9ba3fb413e7be34096ef51067e905efeba6d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Mar 31 15:46:31 2016 +0200

    apparmor: qemu monitor socket moved
    
    so allow this path too
---
 debian/patches/apparmor-monitor-socket-moved.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/apparmor-monitor-socket-moved.patch b/debian/patches/apparmor-monitor-socket-moved.patch
new file mode 100644
index 0000000..0becbd3
--- /dev/null
+++ b/debian/patches/apparmor-monitor-socket-moved.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 31 Mar 2016 15:44:59 +0200
+Subject: apparmor: monitor socket moved
+
+This is not perfect since we should insert the domain id as well.
+---
+ src/security/virt-aa-helper.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
+index 9b47264..303255b 100644
+--- a/src/security/virt-aa-helper.c
++++ b/src/security/virt-aa-helper.c
+@@ -1367,6 +1367,8 @@ main(int argc, char **argv)
+                                   LOCALSTATEDIR, ctl->def->name);
+                 virBufferAsprintf(&buf, "  \"%s/lib/libvirt/qemu/domain-%s/monitor.sock\" rw,\n",
+                                   LOCALSTATEDIR, ctl->def->name);
++                virBufferAsprintf(&buf, "  \"%s/lib/libvirt/qemu/domain-*-%.*s/monitor.sock\" rw,\n",
++                                  LOCALSTATEDIR, 20, ctl->def->name);
+                 virBufferAsprintf(&buf, "  \"%s/run/libvirt/**/%s.pid\" rwk,\n",
+                                   LOCALSTATEDIR, ctl->def->name);
+                 virBufferAsprintf(&buf, "  \"/run/libvirt/**/%s.pid\" rwk,\n",
diff --git a/debian/patches/series b/debian/patches/series
index 347f5e3..d6f4b72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ debian/apparmor_profiles_local_include.patch
 debian/libsystemd.patch
 virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
 Link-xen-driver-against-libxl.patch
+apparmor-monitor-socket-moved.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git