Hello,
as decided in the meeting:
Install extra profiles in /usr/share/apparmor/extra-profiles/ instead
of /etc/apparmor/profiles/extras/, and update the path at various
places.
Also update the mailinglist address in extra-profiles README and
recommend cp instead of mv.
Note: if you want to have a symlink
/etc/apparmor/profiles/extras -> /usr/share/apparmor/extra-profiles/
for backward compability, you'll have to create it yourself (for example
in the .spec file)
This also fixes https://bugzilla.novell.com/show_bug.cgi?id=713647
Regards,
Christian Boltz
--
[Fontlinge für Linux 0.0.2] Warte nur ab, die 0.0.3 funktioniert sogar,
wenn man nicht "ratti" heisst. ;-) [Ratti]
Install extra profiles in /usr/share/apparmor/extra-profiles/ instead of
/etc/apparmor/profiles/extras/, and update the path at various places.
Also update the mailinglist address in extra-profiles README and
recommend cp instead of mv.
Note: if you want to have a symlink
/etc/apparmor/profiles/extras -> /usr/share/apparmor/extra-profiles/
for backward compability, you'll have to create it yourself (for example
in the .spec file)
This also fixes https://bugzilla.novell.com/show_bug.cgi?id=713647
=== modified file 'profiles/Makefile'
--- profiles/Makefile 2012-01-03 22:41:07 +0000
+++ profiles/Makefile 2012-09-25 21:50:42 +0000
@@ -33,7 +33,7 @@
DESTDIR=/
PROFILES_DEST=${DESTDIR}/etc/apparmor.d
-EXTRAS_DEST=${DESTDIR}/etc/apparmor/profiles/extras/
+EXTRAS_DEST=${DESTDIR}/usr/share/apparmor/extra-profiles/
PROFILES_SOURCE=./apparmor.d
EXTRAS_SOURCE=./apparmor/profiles/extras/
SUBDIRS_MUST_BE_SKIPPED=${PROFILES_SOURCE}/abstractions ${PROFILES_SOURCE}/apache2.d ${PROFILES_SOURCE}/program-chunks ${PROFILES_SOURCE}/tunables ${PROFILES_SOURCE}/local
=== modified file 'profiles/apparmor-profiles.spec.in'
--- profiles/apparmor-profiles.spec.in 2010-12-20 20:29:10 +0000
+++ profiles/apparmor-profiles.spec.in 2012-09-25 22:40:27 +0000
@@ -35,7 +35,7 @@
Provides: subdomain-profiles
# hrm, still need to enumerate each directory in these paths in files :(
-%define extras_dir %{_sysconfdir}/apparmor/profiles/extras/
+%define extras_dir /usr/share/apparmor/extra-profiles/
%define profiles_dir %{_sysconfdir}/apparmor.d/
%description
=== modified file 'profiles/apparmor/profiles/extras/README'
--- profiles/apparmor/profiles/extras/README 2007-05-16 18:51:46 +0000
+++ profiles/apparmor/profiles/extras/README 2012-09-25 21:59:53 +0000
@@ -12,9 +12,9 @@
To use, for example, the postfix profiles, we recommend running commands
such as:
- # cd /etc/apparmor/profiles/extras
- # mv *postfix* usr.sbin.post* /etc/apparmor.d/
- # mv usr.bin.procmail usr.sbin.sendmail /etc/apparmor.d/
+ # cd /usr/share/apparmor/extra-profiles/
+ # cp *postfix* usr.sbin.post* /etc/apparmor.d/
+ # cp usr.bin.procmail usr.sbin.sendmail /etc/apparmor.d/
# aa-complain /etc/apparmor.d/*postfix*
# aa-complain /etc/apparmor.d/usr.sbin.post*
# aa-complain /etc/apparmor.d/usr.bin.procmail
@@ -39,7 +39,7 @@
Feedback on these unsupported profiles is welcomed; any
contributions for this directory should be clearly licensed
-- we recommend using the GPL. Please mail suggestions or
-modifications to the [email protected] mail list:
-http://forge.novell.com/mailman/listinfo/apparmor-general
+modifications to the [email protected] mail list:
+https://lists.ubuntu.com/mailman/listinfo/apparmor
Thanks
=== modified file 'utils/Immunix/AppArmor.pm'
--- utils/Immunix/AppArmor.pm 2012-04-24 18:00:18 +0000
+++ utils/Immunix/AppArmor.pm 2012-09-25 22:03:06 +0000
@@ -6782,7 +6782,7 @@
unless (-d $profiledir) { fatal_error "Can't find AppArmor profiles."; }
$extraprofiledir = find_first_dir($cfg->{settings}{inactive_profiledir}) ||
-"/etc/apparmor/profiles/extras/";
+"/usr/share/apparmor/extra-profiles/";
$parser = find_first_file($cfg->{settings}{parser}) || "/sbin/apparmor_parser";
unless (-x $parser) { fatal_error "Can't find apparmor_parser."; }
=== modified file 'utils/logprof.conf'
--- utils/logprof.conf 2011-08-18 23:17:22 +0000
+++ utils/logprof.conf 2012-09-25 22:03:35 +0000
@@ -10,7 +10,7 @@
[settings]
profiledir = /etc/apparmor.d /etc/subdomain.d
- inactive_profiledir = /usr/share/doc/apparmor-profiles/extras
+ inactive_profiledir = /usr/share/apparmor/extra-profiles
logfiles = /var/log/audit/audit.log /var/log/syslog /var/log/messages
parser = /sbin/apparmor_parser /sbin/subdomain_parser
=== modified file 'utils/vim/apparmor.vim.in'
--- utils/vim/apparmor.vim.in 2012-06-05 19:18:30 +0000
+++ utils/vim/apparmor.vim.in 2012-09-25 22:16:22 +0000
@@ -27,8 +27,8 @@
" stick this file into ~/.vim/syntax/ and add these commands into your .vimrc
" to have vim automagically use this syntax file for these directories:
"
-" autocmd BufNewFile,BufRead /etc/apparmor.d/* set syntax=apparmor
-" autocmd BufNewFile,BufRead /etc/apparmor/profiles/* set syntax=apparmor
+" autocmd BufNewFile,BufRead /etc/apparmor.d/* set syntax=apparmor
+" autocmd BufNewFile,BufRead /usr/share/apparmor/extra-profiles/* set syntax=apparmor
" profiles are case sensitive
syntax case match
--
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
