[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] patches: Refresh debian/apparmor_profiles_local_include.patch

[Guido Günther]

Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
32e0f3e8 by Andrea Bolognani at 2021-01-14T23:43:51+01:00
patches: Refresh debian/apparmor_profiles_local_include.patch

The patch was apparently modified using an external tool, and
so it needs to be refreshed before it can roundtrip cleanly
through gbp pq.

Gbp-Dch: Ignore

- - - - -


1 changed file:

- debian/patches/debian/apparmor_profiles_local_include.patch


Changes:

=====================================
debian/patches/debian/apparmor_profiles_local_include.patch
=====================================
@@ -4,22 +4,50 @@ Subject: apparmor_profiles_local_include
 
 Include local apparmor profile
 ---
+ src/security/apparmor/libvirt-lxc                       | 3 +++
+ src/security/apparmor/libvirt-qemu                      | 3 +++
  src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in | 1 +
  src/security/apparmor/usr.sbin.libvirtd.in              | 3 +++
- 2 files changed, 4 insertions(+)
+ 4 files changed, 10 insertions(+)
 
+diff --git a/src/security/apparmor/libvirt-lxc b/src/security/apparmor/libvirt-lxc
+index e556f2a..9d28353 100644
+--- a/src/security/apparmor/libvirt-lxc
++++ b/src/security/apparmor/libvirt-lxc
+@@ -112,3 +112,6 @@
+   deny /sys/fs/cgrou[^p]*{,/**} wklx,
+   deny /sys/fs/cgroup?*{,/**} wklx,
+   deny /sys/fs?*{,/**} wklx,
++
++  # Site-specific additions and overrides. See local/README for details..
++  #include <local/abstractions/libvirt-lxc>
+diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
+index a03e9e2..f055b63 100644
+--- a/src/security/apparmor/libvirt-qemu
++++ b/src/security/apparmor/libvirt-qemu
+@@ -242,3 +242,6 @@
+   # /sys/bus/nd/devices
+   / r, # harmless on any lsb compliant system
+   /sys/bus/nd/devices/{,**/} r,
++
++  # Site-specific additions and overrides. See local/README for details..
++  #include <local/abstractions/libvirt-qemu>
+diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+index dd18c8a..be8b9ee 100644
 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
 +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-@@ -69,5 +69,6 @@ profile virt-aa-helper @libexecdir@/virt
+@@ -69,5 +69,6 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
    /**.[iI][sS][oO] r,
    /**/disk{,.*} r,
  
 +  # Site-specific additions and overrides. See local/README for details..
    #include <local/usr.lib.libvirt.virt-aa-helper>
  }
+diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in
+index bf4563e..d48cd36 100644
 --- a/src/security/apparmor/usr.sbin.libvirtd.in
 +++ b/src/security/apparmor/usr.sbin.libvirtd.in
-@@ -134,4 +134,7 @@ profile libvirtd @sbindir@/libvirtd flag
+@@ -134,4 +134,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {
  
     /usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix,
    }
@@ -27,21 +55,3 @@ Include local apparmor profile
 +  # Site-specific additions and overrides. See local/README for details..
 +  #include <local/usr.sbin.libvirtd>
  }
---- a/src/security/apparmor/libvirt-qemu
-+++ b/src/security/apparmor/libvirt-qemu
-@@ -242,3 +242,6 @@
-   # /sys/bus/nd/devices
-   / r, # harmless on any lsb compliant system
-   /sys/bus/nd/devices/{,**/} r,
-+
-+  # Site-specific additions and overrides. See local/README for details..
-+  #include <local/abstractions/libvirt-qemu>
---- a/src/security/apparmor/libvirt-lxc
-+++ b/src/security/apparmor/libvirt-lxc
-@@ -112,3 +112,6 @@
-   deny /sys/fs/cgrou[^p]*{,/**} wklx,
-   deny /sys/fs/cgroup?*{,/**} wklx,
-   deny /sys/fs?*{,/**} wklx,
-+
-+  # Site-specific additions and overrides. See local/README for details..
-+  #include <local/abstractions/libvirt-lxc>



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/32e0f3e8e604ed76f7ba3400144538786a71774a

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/32e0f3e8e604ed76f7ba3400144538786a71774a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20210115/b1bdb79c/attachment-0001.html>