From 064f75b35a14f3bd6e99ce65a7f7609b973036d5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 27 Jun 2020 00:14:46 -0500 Subject: meta-security: subtree update:95fe86eb98..7831969f8c Alexander Kanavin (1): apparmor: pull in coreutils/findutils only when not using systemd as init manager Armin Kuster (7): tpm2-tools: update to 4.1.3 tpm2-tss: update to 2.4.1 tpm2-tss-engine: add branch to SRC_URI & update to tip tpm2-pkcs11: update 1.2.0 libtpm: update to 0.7.2 openscap: update to 1.3.3 tpm2-tcti-uefi: drop patch no longer needed Jeremy Puhlman (2): clamav: resolve multilib issues tripwire: Remove makefiles from the man directories. Kai Kang (1): sssd: disable build secrets Signed-off-by: Andrew Geissler Change-Id: I1e19d2563541504bcf89f1f70c680bd7e7e62d6c --- .../recipes-openscap/openscap/openscap_1.3.1.bb | 9 --------- .../recipes-openscap/openscap/openscap_1.3.3.bb | 9 +++++++++ .../recipes-openscap/openscap/openscap_git.bb | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb create mode 100644 meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb (limited to 'meta-security/meta-security-compliance/recipes-openscap') diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb deleted file mode 100644 index ad29efdad..000000000 --- a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMARRY = "NIST Certified SCAP 1.2 toolkit" - -require openscap.inc - -SRCREV = "3a4c635691380fa990a226acc8558db35d7ebabc" -SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3 \ -" - -DEFAULT_PREFERENCE = "-1" diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb new file mode 100644 index 000000000..51fa9ee2a --- /dev/null +++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb @@ -0,0 +1,9 @@ +SUMARRY = "NIST Certified SCAP 1.2 toolkit" + +require openscap.inc + +SRCREV = "0cb55c55af6be9934d6fd0caf4563b206f289732" +SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3 \ +" + +DEFAULT_PREFERENCE = "-1" diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_git.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_git.bb index 963d3dec9..73a4729bf 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_git.bb +++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_git.bb @@ -5,8 +5,8 @@ SUMARRY = "NIST Certified SCAP 1.2 toolkit with OE changes" include openscap.inc -SRCREV = "4bbdb46ff651f809d5b38ca08d769790c4bfff90" +SRCREV = "a85943eee400fdbe59234d1c4a02d8cf710c4625" SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3 \ " -PV = "1.3.1+git${SRCPV}" +PV = "1.3.3+git${SRCPV}" -- cgit v1.2.3