diff options
| author | allgdante <allan.garret@gmail.com> | 2020-03-22 19:02:59 +0000 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-25 19:32:48 +0000 |
| commit | df84a53bb4d1aeec3e64a317b7cde3ddb6b0b152 (patch) | |
| tree | c47996b441e44b2c7ab0521d97fc3ee7a0fc9672 /testing/apparmor/0008-Fix-profile-loading-in-busybox.patch | |
| parent | 469f955a495fa668727ab77df4ef0752cc3e3e1e (diff) | |
| download | aports-df84a53bb4d1aeec3e64a317b7cde3ddb6b0b152.tar.bz2 aports-df84a53bb4d1aeec3e64a317b7cde3ddb6b0b152.tar.xz | |
testing/apparmor: upgrade to 2.13.4
Diffstat (limited to 'testing/apparmor/0008-Fix-profile-loading-in-busybox.patch')
| -rw-r--r-- | testing/apparmor/0008-Fix-profile-loading-in-busybox.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/testing/apparmor/0008-Fix-profile-loading-in-busybox.patch b/testing/apparmor/0008-Fix-profile-loading-in-busybox.patch new file mode 100644 index 0000000000..37d5f12a81 --- /dev/null +++ b/testing/apparmor/0008-Fix-profile-loading-in-busybox.patch @@ -0,0 +1,27 @@ +From 2a6a482eac7c6290d2e4349ff4bae1b9a749497f Mon Sep 17 00:00:00 2001 +From: allgdante <allan.garret@gmail.com> +Date: Sun, 22 Mar 2020 17:30:20 +0000 +Subject: [PATCH 08/12] Fix profile loading in busybox + +Just apply the patch present in +https://gitlab.com/apparmor/apparmor/-/issues/80 +--- + parser/rc.apparmor.functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions +index 22e8367f..8c1c57c5 100644 +--- a/parser/rc.apparmor.functions ++++ b/parser/rc.apparmor.functions +@@ -140,7 +140,7 @@ force_complain() { + local profile=$1 + + # if profile not in complain mode +- if ! egrep -q "^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+{" $profile ; then ++ if ! egrep -q '^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+\{' $profile ; then + local link="${PROFILE_DIR}/force-complain/`basename ${profile}`" + if [ -e "$link" ] ; then + aa_log_warning_msg "found $link, forcing complain mode" +-- +2.25.2 + |