don't #include ubuntu-helpers in the abstractions. This can only be included

once in policy, otherwise you will get an error regarding multiple definitions
for sanitized_helper
This commit is contained in:
Jamie Strandboge 2012-01-11 09:00:35 +01:00
parent b0ef4d2b6a
commit 7887d5906d
12 changed files with 39 additions and 14 deletions

View file

@ -2,7 +2,10 @@
#
# abstraction for allowing graphical bittorrent clients in Ubuntu
#
#include <abstractions/ubuntu-helpers>
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
/usr/bin/azureus Cxr -> sanitized_helper,
/usr/bin/bitstormlite Cxr -> sanitized_helper,
/usr/bin/btmaketorrentgui Cxr -> sanitized_helper,

View file

@ -2,8 +2,10 @@
#
# abstraction for allowing access to graphical browsers in Ubuntu
#
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
#include <abstractions/ubuntu-helpers>
/usr/bin/arora Cx -> sanitized_helper,
/usr/bin/conkeror Cx -> sanitized_helper,
/usr/bin/dillo Cx -> sanitized_helper,

View file

@ -1,5 +1,7 @@
# vim:syntax=apparmor
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
#include <abstractions/kde>
#include <abstractions/ubuntu-helpers>
/usr/bin/kde4-config Cx -> sanitized_helper,

View file

@ -1,7 +1,9 @@
# vim:syntax=apparmor
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
#include <abstractions/X>
#include <abstractions/ubuntu-helpers>
# Pulseaudio
/usr/bin/pulseaudio ixr,

View file

@ -1,6 +1,7 @@
# vim:syntax=apparmor
#include <abstractions/ubuntu-helpers>
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
# Openoffice.org
/usr/bin/ooffice Cxr -> sanitized_helper,

View file

@ -1,7 +1,9 @@
# vim:syntax=apparmor
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
# Text editors (It's All Text [https://addons.mozilla.org/en-US/firefox/addon/4125])
#include <abstractions/ubuntu-helpers>
/usr/bin/emacsclient.emacs-snapshot Cxr -> sanitized_helper,
/usr/bin/emacsclient.emacs22 Cxr -> sanitized_helper,
/usr/bin/emacs-snapshot-gtk Cxr -> sanitized_helper,

View file

@ -1,6 +1,7 @@
# vim:syntax=apparmor
#include <abstractions/ubuntu-helpers>
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
# Apport
/usr/bin/apport-bug Cx -> sanitized_helper,

View file

@ -6,8 +6,10 @@
#
# #include <abstractions/ubuntu-gnome-terminal>
#
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
#include <abstractions/ubuntu-helpers>
/usr/bin/elinks Cx -> sanitized_helper,
/usr/bin/links Cx -> sanitized_helper,
/usr/bin/lynx.cur Cx -> sanitized_helper,

View file

@ -6,8 +6,10 @@
#
# #include <abstractions/ubuntu-gnome-terminal>
#
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
#include <abstractions/ubuntu-helpers>
/usr/bin/alpine Cx -> sanitized_helper,
/usr/bin/citadel Cx -> sanitized_helper,
/usr/bin/cone Cx -> sanitized_helper,

View file

@ -2,8 +2,10 @@
#
# abstraction for allowing graphical email clients in Ubuntu
#
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
#include <abstractions/ubuntu-helpers>
/usr/bin/anjal Cx -> sanitized_helper,
/usr/bin/balsa Cx -> sanitized_helper,
/usr/bin/claws-mail Cx -> sanitized_helper,

View file

@ -2,6 +2,9 @@
#
# abstraction for allowing graphical news feed readers in Ubuntu
#
#include <abstractions/ubuntu-helpers>
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
/usr/bin/akregator Cxr -> sanitized_helper,
/usr/bin/liferea-add-feed Cxr -> sanitized_helper,

View file

@ -2,7 +2,10 @@
#
# abstraction for allowing access to media players in Ubuntu
#
#include <abstractions/ubuntu-helpers>
# Users of this abstraction need to #include the ubuntu-helpers abstraction
# in the toplevel profile. Eg:
# #include <abstractions/ubuntu-helpers>
/usr/bin/amarok Cxr -> sanitized_helper,
/usr/bin/audacious2 Cxr -> sanitized_helper,
/usr/bin/audacity Cxr -> sanitized_helper,