[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] Revert "apparmor: add local include for libvirt-qemu"

[Guido Günther]

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


Commits:
2edbedf3 by Guido Günther at 2019-04-11T10:28:32Z
Revert "apparmor: add local include for libvirt-qemu"

apparmor_profiles_local_include.patch does not apply

This reverts commit d748243756a95f0860859c73351d352e2375fe43.

- - - - -


2 changed files:

- debian/libvirt-daemon-system.postinst
- debian/patches/debian/apparmor_profiles_local_include.patch


Changes:

=====================================
debian/libvirt-daemon-system.postinst
=====================================
@@ -147,21 +147,6 @@ esac
 
 db_stop
 
-# dh_apparmor can't work with dir/file profile filenames, also we don't want
-# the reload section of dh_apparmor - just the install of an empty include
-if [ "$1" = "configure" ]; then
-    APP_PROFILE="/etc/apparmor.d/abstractions/libvirt-qemu"
-    if [ -f "$APP_PROFILE" ]; then
-        # Add the local/ include
-        LOCAL_APP_PROFILE="/etc/apparmor.d/local/abstractions/libvirt-qemu"
-
-        test -e "$LOCAL_APP_PROFILE" || {
-            mkdir -p `dirname "$LOCAL_APP_PROFILE"`
-            install --mode 644 /dev/null "$LOCAL_APP_PROFILE"
-        }
-    fi
-fi
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 


=====================================
debian/patches/debian/apparmor_profiles_local_include.patch
=====================================
@@ -31,12 +31,3 @@ index 29f9936..a66452b 100644
 +  # Site-specific additions and overrides. See local/README for details.
 +  #include <local/usr.sbin.libvirtd>
  }
---- a/examples/apparmor/libvirt-qemu
-+++ b/examples/apparmor/libvirt-qemu
-@@ -226,3 +226,6 @@
-   # required for sasl GSSAPI plugin
-   /etc/gss/mech.d/ r,
-   /etc/gss/mech.d/* r,
-+
-+  # Site-specific additions and overrides. See local/README for details.
-+  #include <local/abstractions/libvirt-qemu>



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/commit/2edbedf3dc1b46d07a1013f86d848294e0708e43

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/commit/2edbedf3dc1b46d07a1013f86d848294e0708e43
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/20190411/d2cddebd/attachment-0001.html>