Skip to contentSkip to conversation

openscap: update to 1.3.8

PATCH New Armin Kuster 1 participant 2 messages Jun 22, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 openscap: update to 1.3.8

Remediate service is now off by default. Only include if needed.

---
 .../{openscap_1.3.7.bb => openscap_1.3.8.bb}        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
 rename recipes-compliance/openscap/{openscap_1.3.7.bb => openscap_1.3.8.bb} (84%)
recipes-compliance/openscap/openscap_1.3.8.bb renamed from recipes-compliance/openscap/openscap_1.3.7.bb +9 -4
similarity index 84%
rename from recipes-compliance/openscap/openscap_1.3.7.bb
rename to recipes-compliance/openscap/openscap_1.3.8.bb
index a8757f3..ecc347c 100644
@@ -9,8 +9,8 @@ LICENSE = "LGPL-2.1-only"
 DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre  xmlsec1"
 DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native"
 
-#Jun 20th, 2023
-SRCREV = "c99fc854ff566fac9d130622fe9fd434484eb13d"
+#Jun 22th, 2023
+SRCREV = "a81c66d9bc36612dd1ca83a8c959a59e172eb4b9"
 SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https \
            "
 
@@ -25,6 +25,7 @@ PACKAGECONFIG[rpm] = "-DENABLE_OSCAP_UTIL_AS_RPM=ON, ,rpm, rpm"
 PACKAGECONFIG[gcrypt] = "-DWITH_CRYPTO=gcrypt, ,libgcrypt"
 PACKAGECONFIG[nss3] = "-DWITH_CRYPTO=nss3, ,nss"
 PACKAGECONFIG[selinux] = ", ,libselinux"
+PACKAGECONFIG[remdediate_service] = "-DENABLE_OSCAP_REMEDIATE_SERVICE=ON,-DENABLE_OSCAP_REMEDIATE_SERVICE=NO,"
 
 EXTRA_OECMAKE += "-DENABLE_PROBES_LINUX=ON -DENABLE_PROBES_UNIX=ON \
                   -DENABLE_PROBES_SOLARIS=OFF -DENABLE_PROBES_INDEPENDENT=ON \
@@ -47,7 +48,9 @@ do_configure:append:class-native () {
 
 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
+        if ${@bb.utils.contains('PACKAGECONFIG','remdediate_service','true','false',d)}; then
+            install -D -m 0644 ${B}/oscap-remediate.service ${D}${systemd_system_unitdir}/oscap-remediate.service
+        fi
     fi
 }
 
@@ -60,7 +63,9 @@ do_install:append:class-native () {
 
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "oscap-remediate.service"
+SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG','remdediate_service', 'oscap-remediate.service', '',d)}"
+SYSTEMD_AUTO_ENABLE = "disable"
+
 
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
 
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 packagegroup-core-security: add os-release

Exclude openscap and scap-security-guide if musl

Fix RDEPENDS list to include compliance packages.

---
 recipes-core/packagegroup/packagegroup-core-security.bb | 4 ++++
 1 file changed, 4 insertions(+)
recipes-core/packagegroup/packagegroup-core-security.bb +4 -0
index 8dcbbc7..494745b 100644
@@ -22,6 +22,7 @@ RDEPENDS:packagegroup-core-security = "\
     packagegroup-security-audit \
     packagegroup-security-ids  \
     packagegroup-security-mac  \
+    packagegroup-security-compliance  \
     ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-security-ptest-packages", "", d)} \
     "
 
@@ -97,8 +98,11 @@ RDEPENDS:packagegroup-security-compliance = " \
     lynis \
     openscap \
     scap-security-guide \
+    os-release \
     "
 
+RDEPENDS:packagegroup-security-compliance:remove:libc-musl = "openscap scap-security-guide"
+
 RDEPENDS:packagegroup-meta-security-ptest-packages = "\
     ptest-runner \
     samhain-standalone-ptest \
Signature · 1 line
2.34.1