fscrypt: add distro_check on pam
PATCH 1/9 fscrypt: add distro_check on pam
Signed-off-by Armin Kuster <[email protected]>
--- recipes-security/fscrypt/fscrypt_1.0.0.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
recipes-security/fscrypt/fscrypt_1.0.0.bb +7 -5
@@ -8,19 +8,19 @@ SECTION = "base" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -BBCLASSEXTEND = "native nativesdk" - # fscrypt depends on go and libpam DEPENDS += "go-native libpam" SRCREV = "92b1e9a8670ccd3916a7d24a06cab1e4c9815bc4" SRC_URI = "git://github.com/google/fscrypt.git;branch=master;protocol=https" + GO_IMPORT = "import" -S = "${WORKDIR}/git" +inherit go goarch features_check -inherit go -inherit goarch +REQUIRED_DISTRO_FEATURES = "pam" + +S = "${WORKDIR}/git" do_compile() { export GOARCH=${TARGET_GOARCH}
@@ -47,3 +47,5 @@ do_install() { install -d ${D}/${bindir} install ${S}/src/${GO_IMPORT}/bin/fscrypt ${D}/${bindir}/fscrypt } + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
PATCH 2/9 meta-security: move perl and python recipes to dynamic layers structure
Signed-off-by Armin Kuster <[email protected]>
---
.../recipes-scanners}/checksecurity/checksecurity_2.0.15.bb | 0
.../files/check-setuid-use-more-portable-find-args.patch | 0
.../recipes-scanners}/checksecurity/files/setuid-log-folder.patch | 0
.../meta-perl/recipes-security}/bastille/bastille_3.2.1.bb | 0
.../meta-perl/recipes-security}/bastille/files/API.pm | 0
.../recipes-security}/bastille/files/AccountPermission.pm | 0
.../meta-perl/recipes-security}/bastille/files/FileContent.pm | 0
.../meta-perl/recipes-security}/bastille/files/HPSpecific.pm | 0
.../meta-perl/recipes-security}/bastille/files/Miscellaneous.pm | 0
.../meta-perl/recipes-security}/bastille/files/ServiceAdmin.pm | 0
.../bastille/files/accept_os_flag_in_backend.patch | 0
.../recipes-security}/bastille/files/allow_os_with_assess.patch | 0
.../recipes-security}/bastille/files/call_output_config.patch | 0
.../meta-perl/recipes-security}/bastille/files/config | 0
.../recipes-security}/bastille/files/do_not_apply_config.patch | 0
.../recipes-security}/bastille/files/edit_usage_message.patch | 0
.../recipes-security}/bastille/files/find_existing_config.patch | 0
.../bastille/files/fix_missing_use_directives.patch | 0
.../recipes-security}/bastille/files/fix_number_of_modules.patch | 0
.../recipes-security}/bastille/files/fix_version_parse.patch | 0
.../recipes-security}/bastille/files/fixed_defined_warnings.patch | 0
.../bastille/files/organize_distro_discovery.patch | 0
.../bastille/files/remove_questions_text_file_references.patch | 0
.../recipes-security}/bastille/files/set_required_questions.py | 0
.../recipes-security}/bastille/files/simplify_B_place.patch | 0
.../bastille/files/upgrade_options_processing.patch | 0
.../meta-perl/recipes-security}/nikto/files/location.patch | 0
.../meta-perl/recipes-security}/nikto/nikto_2.1.6.bb | 0
.../fail2ban/files/0001-To-fix-build-error-of-xrang.patch | 0
.../meta-python/recipes-security}/fail2ban/files/initd | 0
.../meta-python/recipes-security}/fail2ban/files/run-ptest | 0
.../recipes-security}/fail2ban/python3-fail2ban_0.11.2.bb | 0
.../recipes-security}/mfa/python3-privacyidea_3.6.2.bb | 0
.../recipes-security}/python/python3-oauth2client_4.1.3.bb | 0
34 files changed, 0 insertions(+), 0 deletions(-)
rename {recipes-scanners => dynamic-layers/meta-perl/recipes-scanners}/checksecurity/checksecurity_2.0.15.bb (100%)
rename {recipes-scanners => dynamic-layers/meta-perl/recipes-scanners}/checksecurity/files/check-setuid-use-more-portable-find-args.patch (100%)
rename {recipes-scanners => dynamic-layers/meta-perl/recipes-scanners}/checksecurity/files/setuid-log-folder.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/bastille_3.2.1.bb (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/API.pm (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/AccountPermission.pm (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/FileContent.pm (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/HPSpecific.pm (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/Miscellaneous.pm (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/ServiceAdmin.pm (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/accept_os_flag_in_backend.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/allow_os_with_assess.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/call_output_config.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/config (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/do_not_apply_config.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/edit_usage_message.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/find_existing_config.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/fix_missing_use_directives.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/fix_number_of_modules.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/fix_version_parse.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/fixed_defined_warnings.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/organize_distro_discovery.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/remove_questions_text_file_references.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/set_required_questions.py (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/simplify_B_place.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/bastille/files/upgrade_options_processing.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/nikto/files/location.patch (100%)
rename {recipes-security => dynamic-layers/meta-perl/recipes-security}/nikto/nikto_2.1.6.bb (100%)
rename {recipes-security => dynamic-layers/meta-python/recipes-security}/fail2ban/files/0001-To-fix-build-error-of-xrang.patch (100%)
rename {recipes-security => dynamic-layers/meta-python/recipes-security}/fail2ban/files/initd (100%)
rename {recipes-security => dynamic-layers/meta-python/recipes-security}/fail2ban/files/run-ptest (100%)
rename {recipes-security => dynamic-layers/meta-python/recipes-security}/fail2ban/python3-fail2ban_0.11.2.bb (100%)
rename {recipes-security => dynamic-layers/meta-python/recipes-security}/mfa/python3-privacyidea_3.6.2.bb (100%)
rename {recipes-python => dynamic-layers/meta-python/recipes-security}/python/python3-oauth2client_4.1.3.bb (100%)dynamic-layers/meta-perl/recipes-scanners/checksecurity/checksecurity_2.0.15.bb renamed from recipes-scanners/checksecurity/checksecurity_2.0.15.bb +0 -0
dynamic-layers/meta-perl/recipes-scanners/checksecurity/files/check-setuid-use-more-portable-find-args.patch renamed from recipes-scanners/checksecurity/files/check-setuid-use-more-portable-find-args.patch +0 -0
dynamic-layers/meta-perl/recipes-scanners/checksecurity/files/setuid-log-folder.patch renamed from recipes-scanners/checksecurity/files/setuid-log-folder.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb renamed from recipes-security/bastille/bastille_3.2.1.bb +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/API.pm renamed from recipes-security/bastille/files/API.pm +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/AccountPermission.pm renamed from recipes-security/bastille/files/AccountPermission.pm +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/FileContent.pm renamed from recipes-security/bastille/files/FileContent.pm +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/HPSpecific.pm renamed from recipes-security/bastille/files/HPSpecific.pm +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/Miscellaneous.pm renamed from recipes-security/bastille/files/Miscellaneous.pm +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/ServiceAdmin.pm renamed from recipes-security/bastille/files/ServiceAdmin.pm +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/accept_os_flag_in_backend.patch renamed from recipes-security/bastille/files/accept_os_flag_in_backend.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/allow_os_with_assess.patch renamed from recipes-security/bastille/files/allow_os_with_assess.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/call_output_config.patch renamed from recipes-security/bastille/files/call_output_config.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/config renamed from recipes-security/bastille/files/config +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/do_not_apply_config.patch renamed from recipes-security/bastille/files/do_not_apply_config.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/edit_usage_message.patch renamed from recipes-security/bastille/files/edit_usage_message.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/find_existing_config.patch renamed from recipes-security/bastille/files/find_existing_config.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/fix_missing_use_directives.patch renamed from recipes-security/bastille/files/fix_missing_use_directives.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/fix_number_of_modules.patch renamed from recipes-security/bastille/files/fix_number_of_modules.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/fix_version_parse.patch renamed from recipes-security/bastille/files/fix_version_parse.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/fixed_defined_warnings.patch renamed from recipes-security/bastille/files/fixed_defined_warnings.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/organize_distro_discovery.patch renamed from recipes-security/bastille/files/organize_distro_discovery.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/remove_questions_text_file_references.patch renamed from recipes-security/bastille/files/remove_questions_text_file_references.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/set_required_questions.py renamed from recipes-security/bastille/files/set_required_questions.py +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/simplify_B_place.patch renamed from recipes-security/bastille/files/simplify_B_place.patch +0 -0
dynamic-layers/meta-perl/recipes-security/bastille/files/upgrade_options_processing.patch renamed from recipes-security/bastille/files/upgrade_options_processing.patch +0 -0
dynamic-layers/meta-perl/recipes-security/nikto/files/location.patch renamed from recipes-security/nikto/files/location.patch +0 -0
dynamic-layers/meta-perl/recipes-security/nikto/nikto_2.1.6.bb renamed from recipes-security/nikto/nikto_2.1.6.bb +0 -0
dynamic-layers/meta-python/recipes-security/fail2ban/files/0001-To-fix-build-error-of-xrang.patch renamed from recipes-security/fail2ban/files/0001-To-fix-build-error-of-xrang.patch +0 -0
dynamic-layers/meta-python/recipes-security/fail2ban/files/initd renamed from recipes-security/fail2ban/files/initd +0 -0
dynamic-layers/meta-python/recipes-security/fail2ban/files/run-ptest renamed from recipes-security/fail2ban/files/run-ptest +0 -0
dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb renamed from recipes-security/fail2ban/python3-fail2ban_0.11.2.bb +0 -0
dynamic-layers/meta-python/recipes-security/mfa/python3-privacyidea_3.6.2.bb renamed from recipes-security/mfa/python3-privacyidea_3.6.2.bb +0 -0
dynamic-layers/meta-python/recipes-security/python/python3-oauth2client_4.1.3.bb renamed from recipes-python/python/python3-oauth2client_4.1.3.bb +0 -0
Signature · 1 line
2.25.1
PATCH 3/9 packagegroup-core-security: remove pkgs
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- .../packagegroup/packagegroup-core-security.bb | 12 ------------ 1 file changed, 12 deletions(-)
recipes-core/packagegroup/packagegroup-core-security.bb +0 -12
@@ -10,7 +10,6 @@ PACKAGES = "\ packagegroup-security-utils \ packagegroup-security-scanners \ packagegroup-security-audit \ - packagegroup-security-hardening \ packagegroup-security-ids \ packagegroup-security-mac \ ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-security-ptest-packages", "", d)} \
@@ -20,7 +19,6 @@ RDEPENDS:packagegroup-core-security = "\ packagegroup-security-utils \ packagegroup-security-scanners \ packagegroup-security-audit \ - packagegroup-security-hardening \ packagegroup-security-ids \ packagegroup-security-mac \ ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-security-ptest-packages", "", d)} \
@@ -35,8 +33,6 @@ RDEPENDS:packagegroup-security-utils = "\ keyutils \ nmap \ pinentry \ - python3-privacyidea \ - python3-fail2ban \ softhsm \ sshguard \ ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 ", "", " libseccomp",d)} \
@@ -47,8 +43,6 @@ RDEPENDS:packagegroup-security-utils = "\ SUMMARY:packagegroup-security-scanners = "Security scanners" RDEPENDS:packagegroup-security-scanners = "\ isic \ - nikto \ - checksecurity \ ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 riscv64", "", " clamav clamav-daemon clamav-freshclam",d)} \ " RDEPENDS:packagegroup-security-scanners:remove:libc-musl = "clamav clamav-daemon clamav-freshclam"
@@ -59,11 +53,6 @@ RDEPENDS:packagegroup-security-audit = " \ redhat-security \ " -SUMMARY:packagegroup-security-hardening = "Security Hardening tools" -RDEPENDS:packagegroup-security-hardening = " \ - bastille \ - " - SUMMARY:packagegroup-security-ids = "Security Intrusion Detection systems" RDEPENDS:packagegroup-security-ids = " \ samhain-standalone \
@@ -92,7 +81,6 @@ RDEPENDS:packagegroup-meta-security-ptest-packages = "\ ptest-runner \ samhain-standalone-ptest \ ${@bb.utils.contains("BBLAYERS", "meta-rust", "suricata-ptest","", d)} \ - python3-fail2ban-ptest \ ${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack-ptest", "",d)} \ "
Signature · 1 line
2.25.1
PATCH 4/9 packagegroup-core-security: add perl pkgs grps
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- .../packagegroup-core-security.bbappend | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 dynamic-layers/meta-perl/recipes-core/packagegroup/packagegroup-core-security.bbappend
dynamic-layers/meta-perl/recipes-core/packagegroup/packagegroup-core-security.bbappend new file +18 -0
@@ -0,0 +1,18 @@ + + +PACKAGES += "\ + packagegroup-security-hardening \ + " +RDEPENDS:packagegroup-core-security += "\ + packagegroup-security-hardening \ + " + +SUMMARY:packagegroup-security-hardening = "Security Hardening tools" +RDEPENDS:packagegroup-security-hardening = " \ + bastille \ + " + +RDEPENDS:packagegroup-security-scanners += "\ + nikto \ + checksecurity \ + "
Signature · 1 line
2.25.1
PATCH 5/9 packagegroup-core-security: add dynamic python pkgs
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- .../packagegroup/packagegroup-core-security.bbappend | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 dynamic-layers/meta-python/recipes-core/packagegroup/packagegroup-core-security.bbappend
dynamic-layers/meta-python/recipes-core/packagegroup/packagegroup-core-security.bbappend new file +10 -0
@@ -0,0 +1,10 @@ + + +RDEPENDS:packagegroup-security-utils += "\ + python3-privacyidea \ + python3-fail2ban \ + " + +RDEPENDS:packagegroup-meta-security-ptest-packages += "\ + python3-fail2ban-ptest \ + "
Signature · 1 line
2.25.1
PATCH 6/9 arpwatch: add postfix to pkg config
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- recipes-scanners/arpwatch/arpwatch_3.1.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
recipes-scanners/arpwatch/arpwatch_3.1.bb +7 -3
@@ -3,7 +3,7 @@ LICENSE = "BSD-4-Clause" HOME_PAGE = "http://ee.lbl.gov/" LIC_FILES_CHKSUM = "file://configure;md5=74ca964ed34fda7b46c6fe3e50bded9d" -DEPENDS += "libpcap postfix" +DEPENDS += "libpcap" SRC_URI = "https://ee.lbl.gov/downloads/arpwatch/${BP}.tar.gz \ file://arpwatch.conf \
@@ -21,7 +21,11 @@ ARPWATCH_GID ?= "arpwatch" APRWATCH_FROM ?= "root " ARPWATH_REPLY ?= "${ARPWATCH_UID}" -EXTRA_OECONF = " --srcdir=${S} --with-watcher=email=${APRWATCH_FROM} --with-watchee=email=${ARPWATH_REPLY}" +PACKAGECONFIG ??= "" + +PACKACONFIG[email] = "-with-watcher=email=${APRWATCH_FROM} --with-watchee=email=${ARPWATH_REPLY}, , postfix, postfix postfix-cfg" + +EXTRA_OECONF:append = " --srcdir=${S}" CONFIGUREOPTS = " --build=${BUILD_SYS} \ --host=${HOST_SYS} \
@@ -76,4 +80,4 @@ CONFFILE_FILES = "${sysconfdir}/${PN}.conf" FILES:${PN} = "${bindir} ${sbindir} ${prefix}/etc/rc.d \ ${sysconfdir} /var/lib/arpwatch" -RDEPENDS:${PN} = "libpcap postfix postfix-cfg" +RDEPENDS:${PN} = "libpcap"
Signature · 1 line
2.25.1
PATCH 7/9 suricata: drop nfnetlink from pkg config
In reply to Armin Kusternfnetlink has a layer dependancy to meta-networking.
Signed-off-by Armin Kuster <[email protected]>
--- recipes-ids/suricata/suricata_6.0.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-ids/suricata/suricata_6.0.4.bb +2 -1
@@ -121,7 +121,8 @@ CARGO_SRC_DIR = "rust" B = "${S}" -PACKAGECONFIG ??= "jansson file pcre yaml python pcap cap-ng net nfnetlink nss nspr " +# nfnetlink has a dependancy to meta-networking +PACKAGECONFIG ??= "jansson file pcre yaml python pcap cap-ng net nss nspr " PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}" PACKAGECONFIG[pcre] = "--with-libpcre-includes=${STAGING_INCDIR} --with-libpcre-libraries=${STAGING_LIBDIR}, ,libpcre ,"
Signature · 1 line
2.25.1
PATCH 8/9 packagegroup-core-security.bb: fix suricata inclusion
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- recipes-core/packagegroup/packagegroup-core-security.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-core/packagegroup/packagegroup-core-security.bb +1 -1
@@ -56,7 +56,7 @@ RDEPENDS:packagegroup-security-audit = " \ SUMMARY:packagegroup-security-ids = "Security Intrusion Detection systems" RDEPENDS:packagegroup-security-ids = " \ samhain-standalone \ - ${@bb.utils.contains("BBLAYERS", "meta-rust", "suricata","", d)} \ + suricata \ ossec-hids \ aide \ "
Signature · 1 line
2.25.1
PATCH 9/9 layer.conf: fix up layer dependancies.
In reply to Armin Kusterreorg pkgs so the we only need meta-oe
Signed-off-by Armin Kuster <[email protected]>
--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +1 -1
@@ -11,7 +11,7 @@ BBFILE_PRIORITY_security = "8" LAYERSERIES_COMPAT_security = "kirkstone" -LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python" +LAYERDEPENDS_security = "core openembedded-layer" # Sanity check for meta-security layer. # Setting SKIP_META_SECURITY_SANITY_CHECK to "1" would skip the bbappend files check.
Signature · 1 line
2.25.1