scap-security-guide_git: drop oe version
PATCH 1/1 scap-security-guide_git: drop oe version
This is un-maintained so dropping this version
Signed-off-by Armin Kuster <[email protected]>
--- ...ng-of-the-remediation-functions-file.patch | 39 ------------- ...c-file-check-tests-in-installed-OS-d.patch | 46 --------------- ...ated-instance-of-element.getchildren.patch | 43 -------------- ...is_openembedded-Update-pattern-match.patch | 30 ---------- ...g-openembedded-from-ssg-constants.py.patch | 34 ----------- ...-fix-when-greedy-regex-ate-the-whole.patch | 35 ----------- ...-fix-deprecated-getiterator-function.patch | 58 ------------------- ...etchildren-and-getiterator-functions.patch | 57 ------------------ .../scap-security-guide.inc | 35 ----------- .../scap-security-guide_git.bb | 18 ------ 10 files changed, 395 deletions(-) delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-fix-deprecated-instance-of-element.getchildren.patch delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-installed_OS_is_openembedded-Update-pattern-match.patch delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fix-missing-openembedded-from-ssg-constants.py.patch delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-fix-deprecated-getiterator-function.patch delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/files/0003-fix-remaining-getchildren-and-getiterator-functions.patch delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc delete mode 100644 meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb
meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 174293162e5840684d967e36840fc1f9f57c90be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <[email protected]> -Date: Thu, 5 Dec 2019 15:02:05 +0100 -Subject: [PATCH] Fix XML "parsing" of the remediation functions file. - -A proper fix is not worth the effort, as we aim to kill shared Bash remediation -with Jinja2 macros. - -Upstream-Status: Backport -[https://github.com/ComplianceAsCode/content/commit/174293162e5840684d967e36840fc1f9f57c90be] - -Signed-off-by: Yi Zhao <[email protected]> ---- - ssg/build_remediations.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py -index 7da807bd6..13e90f732 100644 ---- a/ssg/build_remediations.py -+++ b/ssg/build_remediations.py -@@ -56,11 +56,11 @@ def get_available_functions(build_dir): - remediation_functions = [] - with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile: - filestring = xmlfile.read() -- # This regex looks implementation dependent but we can rely on -- # ElementTree sorting XML attrs alphabetically. Hidden is guaranteed -- # to be the first attr and ID is guaranteed to be second. -+ # This regex looks implementation dependent but we can rely on the element attributes -+ # being present on one line. -+ # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7. - remediation_functions = re.findall( -- r'<Value hidden=\"true\" id=\"function_(\S+)\"', -+ r'<Value.*id=\"function_(\S+)\"', - filestring, re.DOTALL - ) - --- -2.17.1 -
meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch deleted +0 -46
46 lines not on this page · raw message
meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-fix-deprecated-instance-of-element.getchildren.patch deleted +0 -43
43 lines not on this page · raw message
meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-installed_OS_is_openembedded-Update-pattern-match.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From d943e41d64da6af89a6b8224110299ad88747497 Mon Sep 17 00:00:00 2001 -From: Akshay Bhat <[email protected]> -Date: Mon, 14 Feb 2022 13:00:31 -0500 -Subject: [PATCH] installed_OS_is_openembedded: Update pattern match - -The VERSION_ID string is no longer quoted with f451c68667cca of -openembedded-core. Update the pattern match check in -installed_OS_is_openembedded to match the same. - -Signed-off-by: Akshay Bhat <[email protected]> ---- - shared/checks/oval/installed_OS_is_openembedded.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shared/checks/oval/installed_OS_is_openembedded.xml b/shared/checks/oval/installed_OS_is_openembedded.xml -index 01df16b43..eaf9f2b10 100644 ---- a/shared/checks/oval/installed_OS_is_openembedded.xml -+++ b/shared/checks/oval/installed_OS_is_openembedded.xml -@@ -23,7 +23,7 @@ - </ind:textfilecontent54_test> - <ind:textfilecontent54_object id="obj_openembedded" version="1" comment="Check OpenEmbedded version"> - <ind:filepath>/etc/os-release</ind:filepath> -- <ind:pattern operation="pattern match">^VERSION_ID=\"nodistro\.[0-9].$</ind:pattern> -+ <ind:pattern operation="pattern match">^VERSION_ID=nodistro\.[0-9]$</ind:pattern> - <ind:instance datatype="int">1</ind:instance> - </ind:textfilecontent54_object> - --- -2.25.1 -
meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fix-missing-openembedded-from-ssg-constants.py.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 037a12301968a56f0c7e492ea4a05d2eecbd4cc6 Mon Sep 17 00:00:00 2001 -From: Jate Sujjavanich <[email protected]> -Date: Fri, 8 Jan 2021 20:18:00 -0500 -Subject: [PATCH 2/3] Fix missing openembedded from ssg/constants.py - ---- - ssg/constants.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ssg/constants.py b/ssg/constants.py -index fab7cda5d..2ca289f84 100644 ---- a/ssg/constants.py -+++ b/ssg/constants.py -@@ -234,7 +234,8 @@ PRODUCT_TO_CPE_MAPPING = { - } - - MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhosp", "rhv", "debian", "ubuntu", -- "wrlinux", "opensuse", "sle", "ol", "ocp", "example"] -+ "wrlinux", "opensuse", "sle", "ol", "ocp", "example", -+ "openembedded"] - - MULTI_PLATFORM_MAPPING = { - "multi_platform_debian": ["debian8"], -@@ -249,6 +250,7 @@ MULTI_PLATFORM_MAPPING = { - "multi_platform_sle": ["sle11", "sle12"], - "multi_platform_ubuntu": ["ubuntu1404", "ubuntu1604", "ubuntu1804"], - "multi_platform_wrlinux": ["wrlinux"], -+ "multi_platform_openembedded": ["openembedded"], - } - - RHEL_CENTOS_CPE_MAPPING = { --- -2.24.3 (Apple Git-128) -
meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 28a35d63a0cc6b7beb51c77d93bb30778e6960cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <[email protected]> -Date: Mon, 9 Dec 2019 13:41:47 +0100 -Subject: [PATCH] Fixed the broken fix, when greedy regex ate the whole file. - -We want to match attributes in an XML element, not in the whole file. - -Upstream-Status: Backport -[https://github.com/ComplianceAsCode/content/commit/28a35d63a0cc6b7beb51c77d93bb30778e6960cd] - -Signed-off-by: Yi Zhao <[email protected]> ---- - ssg/build_remediations.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py -index 13e90f732..edf31c0cf 100644 ---- a/ssg/build_remediations.py -+++ b/ssg/build_remediations.py -@@ -57,10 +57,10 @@ def get_available_functions(build_dir): - with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile: - filestring = xmlfile.read() - # This regex looks implementation dependent but we can rely on the element attributes -- # being present on one line. -+ # being present. Beware, DOTALL means we go through the whole file at once. - # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7. - remediation_functions = re.findall( -- r'<Value.*id=\"function_(\S+)\"', -+ r'<Value[^>]+id=\"function_(\S+)\"', - filestring, re.DOTALL - ) - --- -2.17.1 -
meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-fix-deprecated-getiterator-function.patch deleted +0 -58
58 lines not on this page · raw message
meta-security-compliance/recipes-openscap/scap-security-guide/files/0003-fix-remaining-getchildren-and-getiterator-functions.patch deleted +0 -57
57 lines not on this page · raw message
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc deleted +0 -35
@@ -1,35 +0,0 @@ -# Copyright (C) 2017 Armin Kuster <[email protected]> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMARRY = "SCAP content for various platforms" -HOME_URL = "https://www.open-scap.org/security-policies/scap-security-guide/" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97662e4486d9a1d09f358851d9f41a1a" -LICENSE = "LGPL-2.1-only" - -DEPENDS = "openscap-native python3 python3-pyyaml-native python3-jinja2-native libxml2-native expat-native" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig python3native python3targetconfig - -STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" -export OSCAP_CPE_PATH="${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe" -export OSCAP_SCHEMA_PATH="${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas" -export OSCAP_XSLT_PATH="${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl" - -OECMAKE_GENERATOR = "Unix Makefiles" - -EXTRA_OECMAKE += "-DENABLE_PYTHON_COVERAGE=OFF" - -B = "${S}/build" - -do_configure[depends] += "openscap-native:do_install" - -do_configure:prepend () { - sed -i -e 's:NAMES\ sed:NAMES\ ${HOSTTOOLS_DIR}/sed:g' ${S}/CMakeLists.txt - sed -i -e 's:NAMES\ grep:NAMES\ ${HOSTTOOLS_DIR}/grep:g' ${S}/CMakeLists.txt -} - -FILES:${PN} += "${datadir}/xml" - -RDEPENDS:${PN} = "openscap"
meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb deleted +0 -18
@@ -1,18 +0,0 @@ -SUMARRY = "SCAP content for various platforms, OE changes" - -SRCREV = "5fdfdcb2e95afbd86ace555beca5d20cbf1043ed" -SRC_URI = "git://github.com/akuster/scap-security-guide.git;branch=oe-0.1.44;;protocol=https \ - file://0001-Fix-XML-parsing-of-the-remediation-functions-file.patch \ - file://0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch \ - file://0001-fix-deprecated-instance-of-element.getchildren.patch \ - file://0002-fix-deprecated-getiterator-function.patch \ - file://0003-fix-remaining-getchildren-and-getiterator-functions.patch \ - file://0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch \ - file://0002-Fix-missing-openembedded-from-ssg-constants.py.patch \ - file://0001-installed_OS_is_openembedded-Update-pattern-match.patch \ - " -PV = "0.1.44+git${SRCPV}" - -require scap-security-guide.inc - -EXTRA_OECMAKE += "-DSSG_PRODUCT_OPENEMBEDDED=ON"
Signature · 1 line
2.25.1