[Pkg-libvirt-commits] [libvirt] 01/02: Rediff patches

[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-1
in repository libvirt.

commit ee7a90c4e0a2611e61d8bc8a4dc405e9f443ea1e
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Apr 7 09:00:06 2016 +0200

    Rediff patches
    
    Dropped apparmor-monitor-socket-moved.patch: fixed upstream
---
 debian/patches/apparmor-monitor-socket-moved.patch | 22 ----------------------
 debian/patches/series                              |  1 -
 ...-helper-apparmor-allow-usr-share-OVMF-too.patch |  2 +-
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/patches/apparmor-monitor-socket-moved.patch b/debian/patches/apparmor-monitor-socket-moved.patch
deleted file mode 100644
index 0becbd3..0000000
--- a/debian/patches/apparmor-monitor-socket-moved.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 4013245..347f5e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,4 @@ Allow-access-to-libnl-3-config-files.patch
 debian/apparmor_profiles_local_include.patch
 debian/libsystemd.patch
 virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
-apparmor-monitor-socket-moved.patch
 Link-xen-driver-against-libxl.patch
diff --git a/debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch b/debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
index e71f6bc..0594b39 100644
--- a/debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
+++ b/debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
@@ -24,7 +24,7 @@ index efb4873..9f996ab 100644
    # access PKI infrastructure
    /etc/pki/libvirt-vnc/** r,
 diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
-index a2d7226..9b47264 100644
+index 50d2a08..5e62daa 100644
 --- a/src/security/virt-aa-helper.c
 +++ b/src/security/virt-aa-helper.c
 @@ -570,6 +570,7 @@ valid_path(const char *path, const bool readonly)

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