2011-03-25 09:04:51 +01:00
|
|
|
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>
|
2011-09-14 13:56:46 +02:00
|
|
|
|
|
|
|
|
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>
|
2011-03-25 09:04:51 +01:00
|
|
|
---
|
|
|
|
|
|
|
|
|
|
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;
|
2011-09-14 13:56:46 +02:00
|
|
|
--- 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
|
2012-05-08 22:39:34 +02:00
|
|
|
aa-unconfined aa-notify aa-disable aa-exec
|
2011-09-14 13:56:46 +02:00
|
|
|
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
|
2012-06-02 23:50:07 +02:00
|
|
|
PYTOOLS = aa-easyprof
|
|
|
|
|
PYSETUP = python-tools-setup.py
|
2011-09-14 13:56:46 +02:00
|
|
|
|
