From c2c1a76b8d6d57d0109a745f1580823c85248077 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Mon, 14 Nov 2022 08:01:32 -0500 Subject: openscap: update to 1.3.6 Signed-off-by: Armin Kuster --- .../recipes-openscap/openscap/openscap_1.3.3.bb | 9 --------- .../recipes-openscap/openscap/openscap_1.3.6.bb | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 9 deletions(-) delete mode 100644 meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb create mode 100644 meta-security-compliance/recipes-openscap/openscap/openscap_1.3.6.bb diff --git a/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb b/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb deleted file mode 100644 index 192b008..0000000 --- a/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMARRY = "NIST Certified SCAP 1.2 toolkit" - -require openscap.inc - -SRCREV = "0cb55c55af6be9934d6fd0caf4563b206f289732" -SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https \ -" - -DEFAULT_PREFERENCE = "-1" diff --git a/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.6.bb b/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.6.bb new file mode 100644 index 0000000..306a0f9 --- /dev/null +++ b/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.6.bb @@ -0,0 +1,21 @@ +SUMARRY = "NIST Certified SCAP 1.2 toolkit" + +DEPENDS:append = " xmlsec1" + +require openscap.inc + +inherit systemd + +SRCREV = "d10c40e43e1c627912374b8fbdfa1a84967fcc92" +SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "oscap-remediate.service" + +do_install:append () { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -D -m 0644 ${B}/oscap-remediate.service ${D}${systemd_system_unitdir}/oscap-remediate.service + fi +} + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3-54-g00ecf