diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-16 21:23:15 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-16 21:23:15 +0300 |
| commit | 49fa52db6f9e5aff2bb2e47b3474c0b9e550aee0 (patch) | |
| tree | 3295d279449e2de514580703e5722fe44d4b2e68 /meta-security | |
| parent | ce36968c2b3e76c3cfc899efaac506dca20b899a (diff) | |
| download | openbmc-49fa52db6f9e5aff2bb2e47b3474c0b9e550aee0.tar.xz | |
meta-security: subtree update:400eade386..c55721b15e
Armin Kuster (2):
suricata: fix compile issue
checksec: add missing rdepends to readelf
Change-Id: Ib50c6bd74004c9cb0241bc70f8df5d90f45f5afe
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security')
| -rw-r--r-- | meta-security/lib/oeqa/runtime/cases/checksec.py | 1 | ||||
| -rw-r--r-- | meta-security/recipes-ids/suricata/suricata_4.1.5.bb | 3 | ||||
| -rw-r--r-- | meta-security/recipes-security/checksec/checksec_2.1.0.bb | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/meta-security/lib/oeqa/runtime/cases/checksec.py b/meta-security/lib/oeqa/runtime/cases/checksec.py index ff6d2f319..e46744c63 100644 --- a/meta-security/lib/oeqa/runtime/cases/checksec.py +++ b/meta-security/lib/oeqa/runtime/cases/checksec.py @@ -24,6 +24,7 @@ class CheckSecTest(OERuntimeTestCase): self.assertEqual(status, 0, msg = msg) @OETestDepends(['checksec.CheckSecTest.test_checksec_xml']) + @OEHasPackage(['binutils']) def test_checksec_fortify(self): status, output = self.target.run('checksec --fortify-proc 1') match = re.search('FORTIFY_SOURCE support:', output) diff --git a/meta-security/recipes-ids/suricata/suricata_4.1.5.bb b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb index cda1c870f..e15a9a337 100644 --- a/meta-security/recipes-ids/suricata/suricata_4.1.5.bb +++ b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb @@ -52,9 +52,6 @@ do_install_append () { oe_runmake install-conf DESTDIR=${D} - # mimic move of downloaded rules to e_sysconfrulesdir - cp -rf ${WORKDIR}/rules ${D}${sysconfdir}/suricata - oe_runmake install-rules DESTDIR=${D} install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles diff --git a/meta-security/recipes-security/checksec/checksec_2.1.0.bb b/meta-security/recipes-security/checksec/checksec_2.1.0.bb index 5c6528e48..b67c98bb6 100644 --- a/meta-security/recipes-security/checksec/checksec_2.1.0.bb +++ b/meta-security/recipes-security/checksec/checksec_2.1.0.bb @@ -16,4 +16,4 @@ do_install() { install -m 0755 ${S}/checksec ${D}${bindir} } -RDEPENDS_${PN} = "bash openssl-bin" +RDEPENDS_${PN} = "bash openssl-bin binutils" |