libseccomp: fix ptest failures.
PATCH 1/4 libseccomp: fix ptest failures.
Fixes:
BusyBox v1.32.0 () multi-call binary.
Usage: dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N]
Don't use Busybox dd, not compatable. Use coreutils
Signed-off-by Armin Kuster <[email protected]>
--- recipes-security/libseccomp/libseccomp_2.5.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-security/libseccomp/libseccomp_2.5.0.bb +1 -1
@@ -45,4 +45,4 @@ do_install_ptest() { FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*" FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" -RDEPENDS_${PN}-ptest = "bash" +RDEPENDS_${PN}-ptest = "coreutils bash"
Signature · 1 line
2.17.1
PATCH 2/4 packagegroup-core-security-ptest: remove keyutils-ptest
Signed-off-by Armin Kuster <[email protected]>
--- recipes-core/packagegroup/packagegroup-core-security-ptest.bb | 1 - 1 file changed, 1 deletion(-)
recipes-core/packagegroup/packagegroup-core-security-ptest.bb +0 -1
@@ -17,7 +17,6 @@ SUMMARY_${PN} = "Security packages with ptests" RDEPENDS_${PN} = " \ ptest-runner \ samhain-standalone-ptest \ - keyutils-ptest \ libseccomp-ptest \ python3-scapy-ptest \ suricata-ptest \
Signature · 1 line
2.17.1
PATCH 3/4 security-test-image: simplify
In reply to akusterSigned-off-by Armin Kuster <[email protected]>
--- recipes-core/images/security-test-image.bb | 26 ++----------------- .../packagegroup-core-security.bb | 14 ++++++++++ 2 files changed, 16 insertions(+), 24 deletions(-)
recipes-core/images/security-test-image.bb +2 -24
@@ -1,33 +1,11 @@ DESCRIPTION = "A small image for testing meta-security packages" +require security-build-image.bb + IMAGE_FEATURES += "ssh-server-openssh" TEST_SUITES = "ssh ping ptest apparmor clamav samhain sssd tripwire checksec smack suricata" INSTALL_CLAMAV_CVD = "1" -IMAGE_INSTALL = "\ - packagegroup-base \ - packagegroup-core-boot \ - packagegroup-core-security-ptest \ - clamav \ - tripwire \ - checksec \ - suricata \ - samhain-standalone \ - ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd", "",d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor", "",d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack-test", "",d)} \ - os-release \ - " - - -IMAGE_LINGUAS ?= " " - -LICENSE = "MIT" - -inherit core-image - -export IMAGE_BASENAME = "security-test-image" - IMAGE_ROOTFS_EXTRA_SPACE = "5242880"
recipes-core/packagegroup/packagegroup-core-security.bb +14 -0
@@ -13,6 +13,7 @@ PACKAGES = "\ packagegroup-security-hardening \ packagegroup-security-ids \ packagegroup-security-mac \ + ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-security-ptest-packages", "", d)} \ " RDEPENDS_packagegroup-core-security = "\
@@ -22,6 +23,7 @@ RDEPENDS_packagegroup-core-security = "\ packagegroup-security-hardening \ packagegroup-security-ids \ packagegroup-security-mac \ + ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-security-ptest-packages", "", d)} \ " SUMMARY_packagegroup-security-utils = "Security utilities"
@@ -76,3 +78,15 @@ RDEPENDS_packagegroup-security-mac = " \ ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack", "",d)} \ " + +RDEPENDS_packagegroup-meta-security-ptest-packages = "\ + ptest-runner \ + samhain-standalone-ptest \ + libseccomp-ptest \ + python3-scapy-ptest \ + suricata-ptest \ + tripwire-ptest \ + python3-fail2ban-ptest \ + ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor-ptest", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack-ptest", "",d)} \ +"
Signature · 1 line
2.17.1
PATCH 4/4 packagegroup-core-security-ptest: remove
In reply to akusterSigned-off-by Armin Kuster <[email protected]>
--- .../packagegroup-core-security-ptest.bb | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 recipes-core/packagegroup/packagegroup-core-security-ptest.bb
recipes-core/packagegroup/packagegroup-core-security-ptest.bb deleted +0 -27
@@ -1,27 +0,0 @@ -DESCRIPTION = "Security ptest packagegroup" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit features_check - -REQUIRED_DISTRO_FEATURES = "ptest" - -PACKAGES = "\ - ${PN} \ - " - -ALLOW_EMPTY_${PN} = "1" - -SUMMARY_${PN} = "Security packages with ptests" -RDEPENDS_${PN} = " \ - ptest-runner \ - samhain-standalone-ptest \ - libseccomp-ptest \ - python3-scapy-ptest \ - suricata-ptest \ - tripwire-ptest \ - python3-fail2ban-ptest \ - ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor-ptest", "",d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack-ptest", "",d)} \ - "
Signature · 1 line
2.17.1