From 0d47c43dcec2f0118229924bc1f4a0458d4752e6 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 17 Sep 2023 14:35:57 -0400 Subject: openscap: update to 1.3.9 Signed-off-by: Armin Kuster --- ...keLists.txt-make-2-variables-configurable.patch | 37 ---------- recipes-compliance/openscap/openscap_1.3.8.bb | 78 ---------------------- recipes-compliance/openscap/openscap_1.3.9.bb | 76 +++++++++++++++++++++ 3 files changed, 76 insertions(+), 115 deletions(-) delete mode 100644 recipes-compliance/openscap/files/0003-CMakeLists.txt-make-2-variables-configurable.patch delete mode 100644 recipes-compliance/openscap/openscap_1.3.8.bb create mode 100644 recipes-compliance/openscap/openscap_1.3.9.bb diff --git a/recipes-compliance/openscap/files/0003-CMakeLists.txt-make-2-variables-configurable.patch b/recipes-compliance/openscap/files/0003-CMakeLists.txt-make-2-variables-configurable.patch deleted file mode 100644 index 953b0d9..0000000 --- a/recipes-compliance/openscap/files/0003-CMakeLists.txt-make-2-variables-configurable.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f99c3f1f516a84d33794f8e3da59adea1a12ef54 Mon Sep 17 00:00:00 2001 -From: Kai Kang -Date: Tue, 20 Jun 2023 22:42:51 +0800 -Subject: [PATCH] CMakeLists.txt: make 2 variables configurable - -Variables PREFERRED_PYTHON_PATH and PYTHON3_PATH are set with -${PYTHON_EXECUTABLE}. For cross compile, ${PYTHON_EXECUTABLE} may point -to other path rather than standard dir such as /usr/bin. Then the -generated library file contains such path which should NOT. Update to -make variables PREFERRED_PYTHON_PATH and PYTHON3_PATH configurable to -avoid such issue. - -Upstream-Status: Submitted [https://github.com/OpenSCAP/openscap/pull/1990] - -Signed-off-by: Kai Kang ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5db014e77..74628cdd4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -125,8 +125,8 @@ endif() - find_package(PythonInterp 3) - find_package(PythonLibs 3) - --set(PREFERRED_PYTHON_PATH "${PYTHON_EXECUTABLE}") --set(PYTHON3_PATH "${PYTHON_EXECUTABLE}") -+set(PREFERRED_PYTHON_PATH "${PYTHON_EXECUTABLE}" CACHE PATH "Path to preferred Python") -+set(PYTHON3_PATH "${PYTHON_EXECUTABLE}" CACHE PATH "Path to Python3") - - find_package(RPM) - if(RPM_FOUND) --- -2.34.1 - diff --git a/recipes-compliance/openscap/openscap_1.3.8.bb b/recipes-compliance/openscap/openscap_1.3.8.bb deleted file mode 100644 index 5abd5a6..0000000 --- a/recipes-compliance/openscap/openscap_1.3.8.bb +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (C) 2017 - 2023 Armin Kuster -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMARRY = "NIST Certified SCAP 1.2 toolkit" -HOME_URL = "https://www.open-scap.org/tools/openscap-base/" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -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 22th, 2023 -SRCREV = "a81c66d9bc36612dd1ca83a8c959a59e172eb4b9" -SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https \ - file://0003-CMakeLists.txt-make-2-variables-configurable.patch \ - " - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig python3native python3targetconfig perlnative systemd - -PACKAGECONFIG ?= "python3 rpm perl gcrypt ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" -PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=ON, ,python3, python3" -PACKAGECONFIG[perl] = "-DENABLE_PERL=ON, ,perl, perl" -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 \ - -DENABLE_OSCAP_UTIL=ON -DENABLE_OSCAP_UTIL_SSH=ON \ - -DENABLE_OSCAP_UTIL_DOCKER=OFF -DENABLE_OSCAP_UTIL_CHROOT=OFF \ - -DENABLE_OSCAP_UTIL_PODMAN=OFF -DENABLE_OSCAP_UTIL_VM=OFF \ - -DENABLE_PROBES_WINDOWS=OFF -DENABLE_VALGRIND=OFF \ - -DENABLE_SCE=ON -DENABLE_MITRE=OFF -DENABLE_TESTS=OFF \ - -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_SKIP_RPATH=ON \ - -DPREFERRED_PYTHON_PATH=${bindir}/python3 \ - -DPYTHON3_PATH=${bindir}/python3 \ - " - -STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source" -STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" - -do_configure:append:class-native () { - sed -i 's:OSCAP_DEFAULT_CPE_PATH.*$:OSCAP_DEFAULT_CPE_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe":' ${B}/config.h - sed -i 's:OSCAP_DEFAULT_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${B}/config.h - sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${B}/config.h -} - -do_install:append () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - 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 -} - -do_install:class-native[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}" -do_install:append:class-native () { - oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native} - install -d $oscapdir - cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir -} - - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG','remdediate_service', 'oscap-remediate.service', '',d)}" -SYSTEMD_AUTO_ENABLE = "disable" - - -FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" - - -RDEPENDS:${PN} = "libxml2 python3-core libgcc bash" -RDEPENDS:${PN}-class-target = "libxml2 python3-core libgcc bash os-release" -BBCLASSEXTEND = "native" diff --git a/recipes-compliance/openscap/openscap_1.3.9.bb b/recipes-compliance/openscap/openscap_1.3.9.bb new file mode 100644 index 0000000..97261df --- /dev/null +++ b/recipes-compliance/openscap/openscap_1.3.9.bb @@ -0,0 +1,76 @@ +# Copyright (C) 2017 - 2023 Armin Kuster +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMARRY = "NIST Certified SCAP 1.2 toolkit" +HOME_URL = "https://www.open-scap.org/tools/openscap-base/" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +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 22th, 2023 +SRCREV = "9b3e7563575f7e5b419f8a09999b40f30e3e7c29" +SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig python3native python3targetconfig perlnative systemd + +PACKAGECONFIG ?= "python3 rpm perl gcrypt ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG[python3] = "-DENABLE_PYTHON3=ON, ,python3, python3" +PACKAGECONFIG[perl] = "-DENABLE_PERL=ON, ,perl, perl" +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 \ + -DENABLE_OSCAP_UTIL=ON -DENABLE_OSCAP_UTIL_SSH=ON \ + -DENABLE_OSCAP_UTIL_DOCKER=OFF -DENABLE_OSCAP_UTIL_CHROOT=OFF \ + -DENABLE_OSCAP_UTIL_PODMAN=OFF -DENABLE_OSCAP_UTIL_VM=OFF \ + -DENABLE_PROBES_WINDOWS=OFF -DENABLE_VALGRIND=OFF \ + -DENABLE_SCE=ON -DENABLE_MITRE=OFF -DENABLE_TESTS=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_SKIP_RPATH=ON \ + -DPREFERRED_PYTHON_PATH=${bindir}/python3 \ + -DPYTHON3_PATH=${bindir}/python3 \ + " + +STAGING_OSCAP_DIR = "${TMPDIR}/work-shared/${MACHINE}/oscap-source" +STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" + +do_configure:append:class-native () { + sed -i 's:OSCAP_DEFAULT_CPE_PATH.*$:OSCAP_DEFAULT_CPE_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe":' ${B}/config.h + sed -i 's:OSCAP_DEFAULT_SCHEMA_PATH.*$:OSCAP_DEFAULT_SCHEMA_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas":' ${B}/config.h + sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${B}/config.h +} + +do_install:append () { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + 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 +} + +do_install:class-native[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}" +do_install:append:class-native () { + oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native} + install -d $oscapdir + cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir +} + + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG','remdediate_service', 'oscap-remediate.service', '',d)}" +SYSTEMD_AUTO_ENABLE = "disable" + + +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" + + +RDEPENDS:${PN} = "libxml2 python3-core libgcc bash" +RDEPENDS:${PN}-class-target = "libxml2 python3-core libgcc bash os-release" +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf