Merge branch 'cboltz-exoopen-local' into 'master'

Add #include if exists <*.d> to new abstractions

See merge request apparmor/apparmor!453

Acked-by: Seth Arnold <seth.arnold@canonical.com>
(cherry picked from commit 962f1e7a7b)
Signed-off-by: John Johansen <john.johansen@canonical.com>

profiles/apparmor.d/abstractions/exo-open

@@ -69,3 +69,5 @@
   owner @{PROC}/@{pid}/fd/ r,
   owner @{HOME}/.config/xfce4/helpers.rc r,
 
+  # Include additions to the abstraction
+  #include if exists <abstractions/exo-open.d>

profiles/apparmor.d/abstractions/gio-open

@@ -53,3 +53,5 @@
   owner @{HOME}/.local/share/applications/{,*.desktop} r,
   owner @{PROC}/@{pid}/fd/ r,
 
+  # Include additions to the abstraction
+  #include if exists <abstractions/gio-open.d>

profiles/apparmor.d/abstractions/gvfs-open

@@ -41,3 +41,5 @@
   /usr/bin/gvfs-open r,
   /{,usr/}bin/dash mr,
 
+  # Include additions to the abstraction
+  #include if exists <abstractions/gvfs-open.d>

profiles/apparmor.d/abstractions/kde-open5

@@ -100,3 +100,5 @@
   owner /{,var/}run/user/[0-9]*/kioclient*slave-socket lrw -> /{,var/}/run/user/[0-9]/#[0-9]*, # for KIO::Slave::holdSlave(QString const&, QUrl const&) () from libKF5KIOCore.so (not 100% sure)
   owner @{HOME}/.cache/kio_http/ rw,
 
+  # Include additions to the abstraction
+  #include if exists <abstractions/kde-open5.d>

profiles/apparmor.d/abstractions/xdg-open

@@ -80,3 +80,5 @@
 
   owner @{HOME}/.local/share/applications/{,*.desktop} r,
 
+  # Include additions to the abstraction
+  #include if exists <abstractions/xdg-open.d>