[meta-security][PATCH 1/2] samhain: Update to 4.4.10

[meta-security][PATCH 1/2] samhain: Update to 4.4.10

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 recipes-ids/samhain/samhain.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
index 8967d72..2788bc3 100644
--- a/recipes-ids/samhain/samhain.inc
+++ b/recipes-ids/samhain/samhain.inc
@@ -3,7 +3,7 @@ HOMEPAGE    = "http://www.la-samhna.de/samhain/"
 LICENSE     = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PV = "4.4.9"
+PV = "4.4.10"
 
 SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
            file://${INITSCRIPT_NAME}.init \
@@ -21,7 +21,7 @@ SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
            file://samhain-fix-initializer-element-is-not-constant.patch \
            "
 
-SRC_URI[sha256sum] = "dd85bf2f90db3ce616a09608e650f3707a4d69aa1e1fe718f8b359ce0aafc198"
+SRC_URI[sha256sum] = "ae6ee8eff3cb111b7fc14a57bcc258443dd0bcf1bfacfdf229935ed053c1ce3d"
 
 UPSTREAM_CHECK_URI = "https://www.la-samhna.de/samhain/archive.html"
 UPSTREAM_CHECK_REGEX = "samhain_signed-(?P<pver>(\d+(\.\d+)+))\.tar"
-- 
2.25.1

[meta-security][PATCH 2/2] layer.conf: Insert addpylib declaration

[Armin Kuster]

Yocto mickledore introduced the addpylib directive for explicitly adding
layer paths to the PYTHONPATH.

Standalone OEQA test suite discovery does not require this directive but
it is required to import test cases from other layers, e.g. to extend
and modify the test cases.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 conf/layer.conf                          | 1 +
 meta-integrity/conf/layer.conf           | 2 ++
 meta-security-compliance/conf/layer.conf | 2 ++
 meta-security-isafw/conf/layer.conf      | 2 ++
 meta-tpm/conf/layer.conf                 | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index b5a74f1..334a945 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -28,3 +28,4 @@ INHERIT += "sanity-meta-security"
 
 QB_KERNEL_CMDLINE_APPEND = " ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', 'apparmor=1 security=apparmor', '', d)}"
 
+addpylib ${LAYERDIR}/lib oeqa
diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf
index b273b5b..0622a5f 100644
--- a/meta-integrity/conf/layer.conf
+++ b/meta-integrity/conf/layer.conf
@@ -33,3 +33,5 @@ INHERIT += "sanity-meta-integrity"
 BBFILES_DYNAMIC += " \
 networking-layer:${LAYERDIR}/dynamic-layers/meta-networking/recipes-*/*/*.bbappend \
 "
+
+addpylib ${LAYERDIR}/lib oeqa
diff --git a/meta-security-compliance/conf/layer.conf b/meta-security-compliance/conf/layer.conf
index 82409a6..cb33c2c 100644
--- a/meta-security-compliance/conf/layer.conf
+++ b/meta-security-compliance/conf/layer.conf
@@ -13,3 +13,5 @@ LAYERSERIES_COMPAT_scanners-layer = "mickledore"
 LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python"
 
 BBLAYERS_LAYERINDEX_NAME_scanners-layer = "meta-security-compliance"
+
+addpylib ${LAYERDIR}/lib oeqa
diff --git a/meta-security-isafw/conf/layer.conf b/meta-security-isafw/conf/layer.conf
index 550cced..fca5868 100644
--- a/meta-security-isafw/conf/layer.conf
+++ b/meta-security-isafw/conf/layer.conf
@@ -15,3 +15,5 @@ LAYERVERSION_security-isafw = "1"
 LAYERDEPENDS_security-isafw = "core"
 
 LAYERSERIES_COMPAT_security-isafw = "mickledore"
+
+addpylib ${LAYERDIR}/lib oeqa
diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf
index 12bd6b7..3b199f7 100644
--- a/meta-tpm/conf/layer.conf
+++ b/meta-tpm/conf/layer.conf
@@ -24,3 +24,5 @@ INHERIT += "sanity-meta-tpm"
 BBFILES_DYNAMIC += " \
 networking-layer:${LAYERDIR}/dynamic-layers/meta-networking/recipes-*/*/*.bbappend \
 "
+
+addpylib ${LAYERDIR}/lib oeqa
-- 
2.25.1