[Pkg-libvirt-commits] [libvirt] 04/06: Drop apparmor-Adjust-path-to-domain-monitor-socket.patch

[Guido Guenther]

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

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

commit 4dcd1f0a8cf57fd13fb1d87b4849e1781c28f782
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Sep 2 17:43:56 2015 +0200

    Drop apparmor-Adjust-path-to-domain-monitor-socket.patch
    
    applied upstream
---
 ...rmor-Adjust-path-to-domain-monitor-socket.patch | 23 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 24 deletions(-)

diff --git a/debian/patches/apparmor-Adjust-path-to-domain-monitor-socket.patch b/debian/patches/apparmor-Adjust-path-to-domain-monitor-socket.patch
deleted file mode 100644
index 4a9b7a1..0000000
--- a/debian/patches/apparmor-Adjust-path-to-domain-monitor-socket.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 29 Aug 2015 18:05:50 +0200
-Subject: apparmor: Adjust path to domain monitor socket
-
-f1f68ca33 moved the monitor socket to a per domain directory. Adjust the
-path accordingly.
----
- src/security/virt-aa-helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
-index a78c4c8..3f07dc8 100644
---- a/src/security/virt-aa-helper.c
-+++ b/src/security/virt-aa-helper.c
-@@ -1363,7 +1363,7 @@ main(int argc, char **argv)
-                 ctl->def->virtType == VIR_DOMAIN_VIRT_KVM) {
-                 virBufferAsprintf(&buf, "  \"%s/log/libvirt/**/%s.log\" w,\n",
-                                   LOCALSTATEDIR, ctl->def->name);
--                virBufferAsprintf(&buf, "  \"%s/lib/libvirt/**/%s.monitor\" rw,\n",
-+                virBufferAsprintf(&buf, "  \"%s/lib/libvirt/qemu/domain-%s/monitor.sock\" rw,\n",
-                                   LOCALSTATEDIR, ctl->def->name);
-                 virBufferAsprintf(&buf, "  \"%s/run/libvirt/**/%s.pid\" rwk,\n",
-                                   LOCALSTATEDIR, ctl->def->name);
diff --git a/debian/patches/series b/debian/patches/series
index ae39993..b9380c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@ Allow-access-to-libnl-3-config-files.patch
 debian/apparmor_profiles_local_include.patch
 debian/libsystemd.patch
 Disable-tests-affected-by-broken-libxml2.patch
-apparmor-Adjust-path-to-domain-monitor-socket.patch

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