[meta-security][PATCH 1/3] sssd: only include when pam in DISTRO_FEATURES

[meta-security][PATCH 1/3] sssd: only include when pam in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 recipes-security/sssd/sssd_1.16.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-security/sssd/sssd_1.16.0.bb b/recipes-security/sssd/sssd_1.16.0.bb
index e41a38e..ff5b618 100644
--- a/recipes-security/sssd/sssd_1.16.0.bb
+++ b/recipes-security/sssd/sssd_1.16.0.bb
@@ -14,7 +14,9 @@ SRC_URI = "https://releases.pagure.org/SSSD/${BPN}/${BP}.tar.gz\
 SRC_URI[md5sum] = "f721ace2ebfa6744cfea55e3ecd2d82f"
 SRC_URI[sha256sum] = "c581a6e5365cef87fca419c0c9563cf15eadbb682863d648d85ffcded7a3940f"
 
-inherit autotools pkgconfig gettext update-rc.d python-dir
+inherit autotools pkgconfig gettext update-rc.d python-dir distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "pam"
 
 CACHED_CONFIGUREVARS = "ac_cv_member_struct_ldap_conncb_lc_arg=no \
     ac_cv_path_NSUPDATE=${bindir} \
-- 
2.7.4

[meta-security][PATCH 2/3] clamav: update LLVM version to match core

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 recipes-security/clamav/clamav_0.99.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-security/clamav/clamav_0.99.3.bb b/recipes-security/clamav/clamav_0.99.3.bb
index dc26277..043fa21 100644
--- a/recipes-security/clamav/clamav_0.99.3.bb
+++ b/recipes-security/clamav/clamav_0.99.3.bb
@@ -35,7 +35,7 @@ GID = "clamav"
 # as defined below
 
 CLAMAV_LLVM ?= "oellvm"
-CLAMAV_LLVM_RELEASE ?= "5.0"
+CLAMAV_LLVM_RELEASE ?= "6.0"
 
 PACKAGECONFIG ?= "ncurses openssl bz2 zlib ${CLAMAV_LLVM}"
 PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
-- 
2.7.4

[meta-security][PATCH 3/3] meta-security: remove depened on other security layers

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 conf/layer.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 04605a1..efc426e 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,6 +12,3 @@ BBFILE_PRIORITY_security = "6"
 LAYERSERIES_COMPAT_security = "sumo"
 
 LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python"
-LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "tpm", "tpm-layer", "",d)}"
-LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "tpm2", "tpm-layer", "",d)}"
-LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "vtpm", "tpm-layer meta-filesystems", "",d)}"
-- 
2.7.4