apparmor: update to 2.13.2
PATCH 1/4 apparmor: update to 2.13.2
Drop patch included in update:
tool-paths.patch
---
.../{apparmor_2.12.bb => apparmor_2.13.2.bb} | 12 ++++--
recipes-mac/AppArmor/files/tool-paths.patch | 37 -------------------
2 files changed, 9 insertions(+), 40 deletions(-)
rename recipes-mac/AppArmor/{apparmor_2.12.bb => apparmor_2.13.2.bb} (91%)
delete mode 100644 recipes-mac/AppArmor/files/tool-paths.patchrecipes-mac/AppArmor/apparmor_2.13.2.bb renamed from recipes-mac/AppArmor/apparmor_2.12.bb +9 -3
@@ -17,7 +17,6 @@ SRC_URI = " \ http://archive.ubuntu.com/ubuntu/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://disable_perl_h_check.patch \ file://crosscompile_perl_bindings.patch \ - file://tool-paths.patch \ file://apparmor.rc \ file://functions \ file://apparmor \
@@ -25,8 +24,8 @@ SRC_URI = " \ file://run-ptest \ " -SRC_URI[md5sum] = "49054f58042f8e51ea92cc866575a833" -SRC_URI[sha256sum] = "8a2b0cd083faa4d0640f579024be3a629faa7db3b99540798a1a050e2eaba056" +SRC_URI[md5sum] = "2439b35266b5a3a461b0a2dba6e863c3" +SRC_URI[sha256sum] = "844def9926dfda5c7858428d06e44afc80573f9706458b6e7282edbb40b11a30" PARALLEL_MAKE = ""
@@ -60,6 +59,13 @@ do_configure() { } do_compile () { + # Fixes: + # | sed -ie 's///g' Makefile.perl + # | sed: -e expression #1, char 0: no previous regular expression + #| Makefile:478: recipe for target 'Makefile.perl' failed + sed -i "s@sed -ie 's///g' Makefile.perl@@" ${S}/libraries/libapparmor/swig/perl/Makefile + + oe_runmake -C ${B}/libraries/libapparmor oe_runmake -C ${B}/binutils oe_runmake -C ${B}/utils
recipes-mac/AppArmor/files/tool-paths.patch deleted +0 -37
@@ -1,37 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From e7edd937adcbf1b3c8d38a31de5bacb2029b1965 Mon Sep 17 00:00:00 2001 -From: John Johansen <[email protected]> -Date: Thu, 4 Oct 2018 23:15:28 -0700 -Subject: [PATCH] parser: fix Makefile hardcoded paths to flex and bison - -The hardcoded paths for flex and python can break builds on systems -where those tools are stored in an alternate location. Use which -to lookup where flex and bison are available. - -This fixes issue #4 - -Signed-off-by: John Johansen <[email protected]> ---- - parser/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/parser/Makefile b/parser/Makefile -index 4d370c36..015c218d 100644 ---- a/parser/Makefile -+++ b/parser/Makefile -@@ -27,9 +27,9 @@ INSTALL_CONFDIR=${DESTDIR}${CONFDIR} - LOCALEDIR=/usr/share/locale - MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 - --YACC := /usr/bin/bison -+YACC := bison - YFLAGS := -d --LEX := /usr/bin/flex -+LEX := flex - LEXFLAGS = -B -v - WARNINGS = -Wall - EXTRA_WARNINGS = -Wsign-compare -Wmissing-field-initializers -Wformat-security -Wunused-parameter --- -2.11.0
Signature · 1 line
2.17.1
PATCH 2/4 apparmor: add basic runtime test
--- lib/oeqa/runtime/cases/apparmor.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 lib/oeqa/runtime/cases/apparmor.py
lib/oeqa/runtime/cases/apparmor.py new file +27 -0
@@ -0,0 +1,27 @@ +# Copyright (C) 2019 Armin Kuster <[email protected]> +# +import re + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.runtime.decorator.package import OEHasPackage + + +class ApparmorTest(OERuntimeTestCase): + + @OEHasPackage(['apparmor']) + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_apparmor_help(self): + status, output = self.target.run('aa-status --help') + msg = ('apparmor command does not work as expected. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 0, msg = msg) + + @OETestDepends(['apparmor.ApparmorTest.test_apparmor_help']) + def test_apparmor_aa_status(self): + status, output = self.target.run('aa-status') + match = re.search('apparmor module is loaded.', output) + if not match: + msg = ('aa-status failed. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 0, msg = msg)
Signature · 1 line
2.17.1
PATCH 3/4 linux-yocto: make bbappend version neutral
In reply to Armin Kusterupdate apparmor configs
---
recipes-kernel/linux/linux-yocto/apparmor.cfg | 12 +++++++-----
.../linux/linux-yocto/apparmor_on_boot.cfg | 1 +
...nux-yocto_4.%.bbappend => linux-yocto_%.bbappend} | 1 +
3 files changed, 9 insertions(+), 5 deletions(-)
create mode 100644 recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg
rename recipes-kernel/linux/{linux-yocto_4.%.bbappend => linux-yocto_%.bbappend} (78%)recipes-kernel/linux/linux-yocto/apparmor.cfg +7 -5
@@ -1,13 +1,15 @@ CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y # CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_PATH=y # CONFIG_SECURITY_SELINUX is not set CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set CONFIG_INTEGRITY_AUDIT=y -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_AUDIT_GENERIC=y
recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg new file +1 -0
@@ -0,0 +1 @@ +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
recipes-kernel/linux/linux-yocto_%.bbappend renamed from recipes-kernel/linux/linux-yocto_4.%.bbappend +1 -0
@@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "\ ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor_on_boot.cfg', '', d)} \ " SRC_URI += "\
Signature · 1 line
2.17.1
Re: [meta-security][PATCH 3/4] linux-yocto: make bbappend version neutral
Quoted 42 lines · Armin Kuster
update apparmor configs
Signed-off-by Armin Kuster <[email protected]>--- recipes-kernel/linux/linux-yocto/apparmor.cfg | 12 +++++++----- .../linux/linux-yocto/apparmor_on_boot.cfg | 1 + ...nux-yocto_4.%.bbappend => linux-yocto_%.bbappend} | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg rename recipes-kernel/linux/{linux-yocto_4.%.bbappend => linux-yocto_%.bbappend} (78%)recipes-kernel/linux/linux-yocto/apparmor.cfg +7
-5@@ -1,13 +1,15 @@ CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y # CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_PATH=y # CONFIG_SECURITY_SELINUX is not set CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set CONFIG_INTEGRITY_AUDIT=y -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_AUDIT_GENERIC=yrecipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg new file +0
-0
recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg line 1
Quoted 2 lines
recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg new file +1
-0@@ -0,0 +1 @@ +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
This and some of the other touched options are removed in kernel 5.1, replaced with a different CONFIG_LSM mechanism.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: [meta-security][PATCH 3/4] linux-yocto: make bbappend version neutral
Quoted 39 lines · Adrian Bunk
Quoted 38 lines · Armin Kuster
update apparmor configs
Signed-off-by Armin Kuster <[email protected]>--- recipes-kernel/linux/linux-yocto/apparmor.cfg | 12 +++++++----- .../linux/linux-yocto/apparmor_on_boot.cfg | 1 + ...nux-yocto_4.%.bbappend => linux-yocto_%.bbappend} | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg rename recipes-kernel/linux/{linux-yocto_4.%.bbappend => linux-yocto_%.bbappend} (78%)recipes-kernel/linux/linux-yocto/apparmor.cfg +7
-5@@ -1,13 +1,15 @@ CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y # CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_PATH=y # CONFIG_SECURITY_SELINUX is not set CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set CONFIG_INTEGRITY_AUDIT=y -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_AUDIT_GENERIC=yrecipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg new file +0
-0
Quoted 8 lines
recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg line 1
Quoted 6 lines
index 0000000..fc35740
recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg new file +1
-0@@ -0,0 +1 @@ +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1This and some of the other touched options are removed in kernel 5.1, replaced with a different
CONFIG_LSMmechanism.
Ah, 5.1... good point.. .
At some point I really should get these in the kernel-cache.
thanks for the review.
- armin
Quoted 4 lines
cu
Adrian
PATCH 4/4 linux-stable: add support for stable kernel bbappends
In reply to Armin Kuster--- recipes-kernel/linux/linux-stable/apparmor.cfg | 15 +++++++++++++++ .../linux/linux-stable/apparmor_on_boot.cfg | 1 + .../linux/linux-stable/smack-default-lsm.cfg | 2 ++ recipes-kernel/linux/linux-stable/smack.cfg | 8 ++++++++ recipes-kernel/linux/linux-stable_%.bbappend | 11 +++++++++++ 5 files changed, 37 insertions(+) create mode 100644 recipes-kernel/linux/linux-stable/apparmor.cfg create mode 100644 recipes-kernel/linux/linux-stable/apparmor_on_boot.cfg create mode 100644 recipes-kernel/linux/linux-stable/smack-default-lsm.cfg create mode 100644 recipes-kernel/linux/linux-stable/smack.cfg create mode 100644 recipes-kernel/linux/linux-stable_%.bbappend
recipes-kernel/linux/linux-stable/apparmor.cfg new file +15 -0
@@ -0,0 +1,15 @@ +CONFIG_AUDIT=y +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_SECURITY_SELINUX is not set +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set +CONFIG_INTEGRITY_AUDIT=y +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_AUDIT_GENERIC=y
recipes-kernel/linux/linux-stable/apparmor_on_boot.cfg new file +1 -0
@@ -0,0 +1 @@ +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
recipes-kernel/linux/linux-stable/smack-default-lsm.cfg new file +2 -0
@@ -0,0 +1,2 @@ +CONFIG_DEFAULT_SECURITY="smack" +CONFIG_DEFAULT_SECURITY_SMACK=y
recipes-kernel/linux/linux-stable/smack.cfg new file +8 -0
@@ -0,0 +1,8 @@ +CONFIG_IP_NF_SECURITY=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_SECURITY=y +CONFIG_SECURITY_SMACK=y +CONFIG_TMPFS_XATTR=y
recipes-kernel/linux/linux-stable_%.bbappend new file +11 -0
@@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor_on_boot.cfg', '', d)} \ +" + +SRC_URI += "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack.cfg', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack-default-lsm.cfg', '', d)} \ +"
Signature · 1 line
2.17.1
Re: [meta-security][PATCH 4/4] linux-stable: add support for stable kernel bbappends
not goint to work.
dropping
Quoted 81 lines · Armin Kuster
Signed-off-by Armin Kuster <[email protected]>--- recipes-kernel/linux/linux-stable/apparmor.cfg | 15 +++++++++++++++ .../linux/linux-stable/apparmor_on_boot.cfg | 1 + .../linux/linux-stable/smack-default-lsm.cfg | 2 ++ recipes-kernel/linux/linux-stable/smack.cfg | 8 ++++++++ recipes-kernel/linux/linux-stable_%.bbappend | 11 +++++++++++ 5 files changed, 37 insertions(+) create mode 100644 recipes-kernel/linux/linux-stable/apparmor.cfg create mode 100644 recipes-kernel/linux/linux-stable/apparmor_on_boot.cfg create mode 100644 recipes-kernel/linux/linux-stable/smack-default-lsm.cfg create mode 100644 recipes-kernel/linux/linux-stable/smack.cfg create mode 100644 recipes-kernel/linux/linux-stable_%.bbappendrecipes-kernel/linux/linux-stable/apparmor.cfg new file +15
-0@@ -0,0 +1,15 @@ +CONFIG_AUDIT=y +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_SECURITY_SELINUX is not set +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set +CONFIG_INTEGRITY_AUDIT=y +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_AUDIT_GENERIC=yrecipes-kernel/linux/linux-stable/apparmor_on_boot.cfg new file +1
-0@@ -0,0 +1 @@ +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1recipes-kernel/linux/linux-stable/smack-default-lsm.cfg new file +2
-0@@ -0,0 +1,2 @@ +CONFIG_DEFAULT_SECURITY="smack" +CONFIG_DEFAULT_SECURITY_SMACK=yrecipes-kernel/linux/linux-stable/smack.cfg new file +8
-0@@ -0,0 +1,8 @@ +CONFIG_IP_NF_SECURITY=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_SECURITY=y +CONFIG_SECURITY_SMACK=y +CONFIG_TMPFS_XATTR=yrecipes-kernel/linux/linux-stable_%.bbappend new file +11
-0@@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor_on_boot.cfg', '', d)} \ +" + +SRC_URI += "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack.cfg', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack-default-lsm.cfg', '', d)} \ +"