summaryrefslogtreecommitdiff
path: root/meta-security/meta-security-compliance/recipes-openscap
diff options
context:
space:
mode:
Diffstat (limited to 'meta-security/meta-security-compliance/recipes-openscap')
-rw-r--r--meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.3.bb9
-rw-r--r--meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.7.bb19
-rw-r--r--meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_git.bb2
3 files changed, 21 insertions, 9 deletions
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
deleted file mode 100644
index 192b00860f..0000000000
--- a/meta-security/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/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.7.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.7.bb
new file mode 100644
index 0000000000..cfe93f0253
--- /dev/null
+++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.3.7.bb
@@ -0,0 +1,19 @@
+SUMARRY = "NIST Certified SCAP 1.2 toolkit"
+
+DEPENDS:append = " xmlsec1"
+
+require openscap.inc
+
+inherit systemd
+
+SRCREV = "55efbfda0f617e05862ab6ed4862e10dbee52b03"
+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
+}
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 a18cbd1f6e..3543e110c0 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
@@ -10,3 +10,5 @@ SRC_URI = "git://github.com/akuster/openscap.git;branch=oe-1.3;protocol=https \
"
PV = "1.3.3+git${SRCPV}"
+
+DEFAULT_PREFERENCE = "-1"