76467be0e2
- update to AppArmor 2.7.0 beta1, for details see http://wiki.apparmor.net/index.php/ReleaseNotes_2_7 - removed lots of patches I pushed upstream - disabled apparmor-2.5.1-unified-build (patch to use automake, does not apply to 2.7 and probably won't be accepted upstream) - disabled build of tomcat_apparmor (doesn't build, deprecated upstream) - run spec-cleaner - remove *.la files - move usr.sbin.nscd profile back to apparmor-profiles package - Update patch apparmor-profiles-usr.sbin.dnsmasq to include /var/lib/libvirt/dnsmasq/*.leases (bnc#694197). OBS-URL: https://build.opensuse.org/request/show/82045 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=22
39 lines
1.2 KiB
Plaintext
39 lines
1.2 KiB
Plaintext
From: Jeff Mahoney <jeffm@suse.com>
|
|
Subject: apparmor-utils: Add Immunix::SubDomain alias
|
|
|
|
This patch adds an alias so that 'use Immunix::SubDomain;' works with older
|
|
code.
|
|
|
|
Acked-by: Jeff Mahoney <jeffm@suse.com>
|
|
|
|
Also patch utils/Makefile to actually install SubDomain.pm
|
|
|
|
The SubDomain compat module is only needed by openSUSE, therefore this patch
|
|
will not be upstreamed.
|
|
|
|
Signed-off-by: Christian Boltz <apparmor@cboltz.de>
|
|
---
|
|
|
|
utils/Immunix/SubDomain.pm | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
--- /dev/null
|
|
+++ b/utils/Immunix/SubDomain.pm
|
|
@@ -0,0 +1,5 @@
|
|
+# Use of Immunix::SubDomain is deprecated.
|
|
+# Use Immunix::AppArmor directly instead.
|
|
+use Immunix::AppArmor;
|
|
+*Immunix::SubDomain:: = *Immunix::AppArmor::;
|
|
+1;
|
|
--- a/utils/Makefile 2011-05-27 21:08:50.000000000 +0200
|
|
+++ b/utils/Makefile 2011-09-10 17:57:55.000000000 +0200
|
|
@@ -31,7 +31,7 @@ PERLTOOLS = aa-genprof aa-logprof aa-aut
|
|
aa-unconfined aa-notify aa-disable
|
|
TOOLS = ${PERLTOOLS} aa-decode aa-status
|
|
MODULES = ${MODDIR}/AppArmor.pm ${MODDIR}/Repository.pm \
|
|
- ${MODDIR}/Config.pm ${MODDIR}/Severity.pm
|
|
+ ${MODDIR}/Config.pm ${MODDIR}/Severity.pm ${MODDIR}/SubDomain.pm
|
|
|
|
MANPAGES = ${TOOLS:=.8} logprof.conf.5
|
|
|