[PATCH v2 2/5] apparmor: assume at least apparmor >= 3

[Daniel P . Berrangé via Devel]

From: Daniel P. Berrangé <berra...@redhat.com>

By assuming version 3, we can drop all the conditional version
substitutions from the profiles.

Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
---
 src/security/apparmor/libvirt-lxc.in                    | 2 --
 src/security/apparmor/libvirt-qemu.in                   | 4 ----
 src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in | 5 -----
 src/security/apparmor/usr.sbin.libvirtd.in              | 2 --
 src/security/apparmor/usr.sbin.virtqemud.in             | 2 --
 src/security/apparmor/usr.sbin.virtxend.in              | 2 --
 6 files changed, 17 deletions(-)

diff --git a/src/security/apparmor/libvirt-lxc.in 
b/src/security/apparmor/libvirt-lxc.in
index ffe4d8f21f..11005e7c21 100644
--- a/src/security/apparmor/libvirt-lxc.in
+++ b/src/security/apparmor/libvirt-lxc.in
@@ -117,6 +117,4 @@
   deny /sys/fs/cgroup?*{,/**} wklx,
   deny /sys/fs?*{,/**} wklx,
 
-@BEGIN_APPARMOR_3@
   include if exists <abstractions/libvirt-lxc.d>
-@END_APPARMOR_3@
diff --git a/src/security/apparmor/libvirt-qemu.in 
b/src/security/apparmor/libvirt-qemu.in
index c63077574e..e4aceacd70 100644
--- a/src/security/apparmor/libvirt-qemu.in
+++ b/src/security/apparmor/libvirt-qemu.in
@@ -190,7 +190,6 @@
   /usr/{lib,lib64}/libswtpm_libtpms.so mr,
   /usr/lib/@{multiarch}/libswtpm_libtpms.so mr,
 
-@BEGIN_APPARMOR_3@
   # support for passt network back-end
   /usr/bin/passt Cx -> passt,
 
@@ -206,7 +205,6 @@
 
     include if exists <abstractions/passt>
   }
-@END_APPARMOR_3@
 
   # for save and resume
   /{usr/,}bin/dash rmix,
@@ -281,6 +279,4 @@
   owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk,
   owner /var/lib/libvirt/qemu/nvram/*_VARS.ms.fd rwk,
 
-@BEGIN_APPARMOR_3@
   include if exists <abstractions/libvirt-qemu.d>
-@END_APPARMOR_3@
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 90a8b7072c..e209a8bff7 100644
--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -74,10 +74,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
   /**.[iI][sS][oO] r,
   /**/disk{,.*} r,
 
-@BEGIN_APPARMOR_3@
   include if exists <local/usr.lib.libvirt.virt-aa-helper>
-@END_APPARMOR_3@
-@BEGIN_APPARMOR_2@
-  #include <local/usr.lib.libvirt.virt-aa-helper>
-@END_APPARMOR_2@
 }
diff --git a/src/security/apparmor/usr.sbin.libvirtd.in 
b/src/security/apparmor/usr.sbin.libvirtd.in
index 3659ddc219..6267e4f737 100644
--- a/src/security/apparmor/usr.sbin.libvirtd.in
+++ b/src/security/apparmor/usr.sbin.libvirtd.in
@@ -144,7 +144,5 @@ profile libvirtd @sbindir@/libvirtd 
flags=(attach_disconnected) {
    /usr/{lib,lib64,lib/qemu,libexec,libexec/qemu}/qemu-bridge-helper rmix,
   }
 
-@BEGIN_APPARMOR_3@
   include if exists <local/usr.sbin.libvirtd>
-@END_APPARMOR_3@
 }
diff --git a/src/security/apparmor/usr.sbin.virtqemud.in 
b/src/security/apparmor/usr.sbin.virtqemud.in
index 86b23465b6..522c098af6 100644
--- a/src/security/apparmor/usr.sbin.virtqemud.in
+++ b/src/security/apparmor/usr.sbin.virtqemud.in
@@ -136,7 +136,5 @@ profile virtqemud @sbindir@/virtqemud 
flags=(attach_disconnected) {
    /usr/{lib,lib64,lib/qemu,libexec,libexec/qemu}/qemu-bridge-helper rmix,
   }
 
-@BEGIN_APPARMOR_3@
   include if exists <local/usr.sbin.virtqemud>
-@END_APPARMOR_3@
 }
diff --git a/src/security/apparmor/usr.sbin.virtxend.in 
b/src/security/apparmor/usr.sbin.virtxend.in
index 77fedce352..324a000391 100644
--- a/src/security/apparmor/usr.sbin.virtxend.in
+++ b/src/security/apparmor/usr.sbin.virtxend.in
@@ -55,7 +55,5 @@ profile virtxend @sbindir@/virtxend 
flags=(attach_disconnected) {
   /etc/libvirt/hooks/** rmix,
   /etc/xen/scripts/** rmix,
 
-@BEGIN_APPARMOR_3@
   include if exists <local/usr.sbin.virtxend>
-@END_APPARMOR_3@
 }
-- 
2.48.1