[Pkg-libvirt-commits] [libvirt] 03/03: Rediff patches

[Guido Guenther]

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

agx pushed a commit to branch debian/sid
in repository libvirt.

commit 176ac95cd5730266bee300bea1b2347f096fb2b8
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Jan 9 21:05:39 2017 +0100

    Rediff patches
---
 debian/patches/AppArmor-policy-support-merged-usr.patch | 7 +++----
 debian/patches/apparmor-pass-attach_disconnected.patch  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/patches/AppArmor-policy-support-merged-usr.patch b/debian/patches/AppArmor-policy-support-merged-usr.patch
index 0b1b0de..1d4f998 100644
--- a/debian/patches/AppArmor-policy-support-merged-usr.patch
+++ b/debian/patches/AppArmor-policy-support-merged-usr.patch
@@ -1,6 +1,5 @@
 From: intrigeri <intrigeri at debian.org>
 Date: Sat, 3 Dec 2016 18:32:48 +0000
-Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=de79efdeb8558bbdb3677dbcaaebf7c50cb3bab4
 Subject: AppArmor policy: support merged-/usr.
 
 Acked-by: Christian Ehrhardt <christian.ehrhardt at canonical.co>
@@ -11,7 +10,7 @@ Acked-by: Christian Ehrhardt <christian.ehrhardt at canonical.co>
  3 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu
-index b8e4e1cb37..5256816562 100644
+index b8e4e1c..5256816 100644
 --- a/examples/apparmor/libvirt-qemu
 +++ b/examples/apparmor/libvirt-qemu
 @@ -137,12 +137,12 @@
@@ -32,7 +31,7 @@ index b8e4e1cb37..5256816562 100644
    # for usb access
    /dev/bus/usb/ r,
 diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-index a992119951..abf340d8bf 100644
+index a992119..abf340d 100644
 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 @@ -28,7 +28,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
@@ -45,7 +44,7 @@ index a992119951..abf340d8bf 100644
    /etc/apparmor.d/libvirt/* r,
    /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
 diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
-index 705d19eb13..60e66d005c 100644
+index e0ecfe9..5e2c3e4 100644
 --- a/examples/apparmor/usr.sbin.libvirtd
 +++ b/examples/apparmor/usr.sbin.libvirtd
 @@ -47,12 +47,12 @@
diff --git a/debian/patches/apparmor-pass-attach_disconnected.patch b/debian/patches/apparmor-pass-attach_disconnected.patch
index 9ad3aaf..2b32f17 100644
--- a/debian/patches/apparmor-pass-attach_disconnected.patch
+++ b/debian/patches/apparmor-pass-attach_disconnected.patch
@@ -18,7 +18,7 @@ Closes: #847370
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
-index 5e2c3e4ea..c40930bb8 100644
+index 5e2c3e4..c40930b 100644
 --- a/examples/apparmor/usr.sbin.libvirtd
 +++ b/examples/apparmor/usr.sbin.libvirtd
 @@ -2,7 +2,7 @@

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