diff options
10 files changed, 0 insertions, 395 deletions
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch deleted file mode 100644 index c0b93e4..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-XML-parsing-of-the-remediation-functions-file.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 174293162e5840684d967e36840fc1f9f57c90be Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com> | ||
3 | Date: Thu, 5 Dec 2019 15:02:05 +0100 | ||
4 | Subject: [PATCH] Fix XML "parsing" of the remediation functions file. | ||
5 | |||
6 | A proper fix is not worth the effort, as we aim to kill shared Bash remediation | ||
7 | with Jinja2 macros. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | [https://github.com/ComplianceAsCode/content/commit/174293162e5840684d967e36840fc1f9f57c90be] | ||
11 | |||
12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
13 | --- | ||
14 | ssg/build_remediations.py | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py | ||
18 | index 7da807bd6..13e90f732 100644 | ||
19 | --- a/ssg/build_remediations.py | ||
20 | +++ b/ssg/build_remediations.py | ||
21 | @@ -56,11 +56,11 @@ def get_available_functions(build_dir): | ||
22 | remediation_functions = [] | ||
23 | with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile: | ||
24 | filestring = xmlfile.read() | ||
25 | - # This regex looks implementation dependent but we can rely on | ||
26 | - # ElementTree sorting XML attrs alphabetically. Hidden is guaranteed | ||
27 | - # to be the first attr and ID is guaranteed to be second. | ||
28 | + # This regex looks implementation dependent but we can rely on the element attributes | ||
29 | + # being present on one line. | ||
30 | + # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7. | ||
31 | remediation_functions = re.findall( | ||
32 | - r'<Value hidden=\"true\" id=\"function_(\S+)\"', | ||
33 | + r'<Value.*id=\"function_(\S+)\"', | ||
34 | filestring, re.DOTALL | ||
35 | ) | ||
36 | |||
37 | -- | ||
38 | 2.17.1 | ||
39 | |||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch deleted file mode 100644 index 60664a3..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 2beb4bc83a157b21edb1a3fef295cd4cced467df Mon Sep 17 00:00:00 2001 | ||
2 | From: Jate Sujjavanich <jatedev@gmail.com> | ||
3 | Date: Thu, 7 Jan 2021 18:10:01 -0500 | ||
4 | Subject: [PATCH 1/3] Fix platform spec, file check, tests in installed OS | ||
5 | detect for openembedded | ||
6 | |||
7 | Change platform to multi in openembedded installed check matching others | ||
8 | and allowing compile of xml into oval | ||
9 | --- | ||
10 | shared/checks/oval/installed_OS_is_openembedded.xml | 11 ++++++----- | ||
11 | 1 file changed, 6 insertions(+), 5 deletions(-) | ||
12 | |||
13 | diff --git a/shared/checks/oval/installed_OS_is_openembedded.xml b/shared/checks/oval/installed_OS_is_openembedded.xml | ||
14 | index 763d17bcb..01df16b43 100644 | ||
15 | --- a/shared/checks/oval/installed_OS_is_openembedded.xml | ||
16 | +++ b/shared/checks/oval/installed_OS_is_openembedded.xml | ||
17 | @@ -1,11 +1,9 @@ | ||
18 | -</def-group> | ||
19 | - | ||
20 | <def-group> | ||
21 | <definition class="inventory" id="installed_OS_is_openembedded" version="2"> | ||
22 | <metadata> | ||
23 | <title>OpenEmbedded</title> | ||
24 | <affected family="unix"> | ||
25 | - <platform>OPENEMBEDDED</platform> | ||
26 | + <platform>multi_platform_all</platform> | ||
27 | </affected> | ||
28 | <reference ref_id="cpe:/o:openembedded:openembedded:0" | ||
29 | source="CPE" /> | ||
30 | @@ -20,8 +18,11 @@ | ||
31 | </criteria> | ||
32 | </definition> | ||
33 | |||
34 | - <ind:textfilecontent54_object id="test_openembedded" version="1" comment="Check OPenEmbedded version"> | ||
35 | - <ind:filepath>/etc/os-release/ind:filepath> | ||
36 | + <ind:textfilecontent54_test check="all" check_existence="at_least_one_exists" comment="Check OpenEmbedded version" id="test_openembedded" version="1"> | ||
37 | + <ind:object object_ref="obj_openembedded" /> | ||
38 | + </ind:textfilecontent54_test> | ||
39 | + <ind:textfilecontent54_object id="obj_openembedded" version="1" comment="Check OpenEmbedded version"> | ||
40 | + <ind:filepath>/etc/os-release</ind:filepath> | ||
41 | <ind:pattern operation="pattern match">^VERSION_ID=\"nodistro\.[0-9].$</ind:pattern> | ||
42 | <ind:instance datatype="int">1</ind:instance> | ||
43 | </ind:textfilecontent54_object> | ||
44 | -- | ||
45 | 2.24.3 (Apple Git-128) | ||
46 | |||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-fix-deprecated-instance-of-element.getchildren.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-fix-deprecated-instance-of-element.getchildren.patch deleted file mode 100644 index 01e3dd6..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-fix-deprecated-instance-of-element.getchildren.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From e435bf2dc59d652710104a1c59332e410b12bb64 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vojtech Polasek <vpolasek@redhat.com> | ||
3 | Date: Mon, 8 Jun 2020 12:33:48 +0200 | ||
4 | Subject: [PATCH] fix deprecated instance of element.getchildren | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | [https://github.com/ComplianceAsCode/content/commit/e435bf2dc59d652710104a1c59332e410b12bb64] | ||
8 | |||
9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
10 | --- | ||
11 | ssg/build_remediations.py | 2 +- | ||
12 | ssg/build_stig.py | 2 +- | ||
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py | ||
16 | index fdde0f268..c18d6bd54 100644 | ||
17 | --- a/ssg/build_remediations.py | ||
18 | +++ b/ssg/build_remediations.py | ||
19 | @@ -735,7 +735,7 @@ def expand_xccdf_subs(fix, remediation_type, remediation_functions): | ||
20 | # First concat output form of modified fix text (including text appended | ||
21 | # to all children of the fix) | ||
22 | modfix = [fix.text] | ||
23 | - for child in fix.getchildren(): | ||
24 | + for child in list(fix): | ||
25 | if child is not None and child.text is not None: | ||
26 | modfix.append(child.text) | ||
27 | modfixtext = "".join(modfix) | ||
28 | diff --git a/ssg/build_stig.py b/ssg/build_stig.py | ||
29 | index 528285f3d..6122981fc 100644 | ||
30 | --- a/ssg/build_stig.py | ||
31 | +++ b/ssg/build_stig.py | ||
32 | @@ -38,7 +38,7 @@ def add_references(reference, destination): | ||
33 | for ref in refs: | ||
34 | if (ref.get('href').startswith(stig_refs) and | ||
35 | ref.text in dictionary): | ||
36 | - index = rule.getchildren().index(ref) | ||
37 | + index = list(rule).index(ref) | ||
38 | new_ref = ET.Element( | ||
39 | '{%s}reference' % XCCDF11_NS, {'href': stig_ns}) | ||
40 | new_ref.text = dictionary[ref.text] | ||
41 | -- | ||
42 | 2.17.1 | ||
43 | |||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-installed_OS_is_openembedded-Update-pattern-match.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-installed_OS_is_openembedded-Update-pattern-match.patch deleted file mode 100644 index 61d9206..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-installed_OS_is_openembedded-Update-pattern-match.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From d943e41d64da6af89a6b8224110299ad88747497 Mon Sep 17 00:00:00 2001 | ||
2 | From: Akshay Bhat <akshay.bhat@timesys.com> | ||
3 | Date: Mon, 14 Feb 2022 13:00:31 -0500 | ||
4 | Subject: [PATCH] installed_OS_is_openembedded: Update pattern match | ||
5 | |||
6 | The VERSION_ID string is no longer quoted with f451c68667cca of | ||
7 | openembedded-core. Update the pattern match check in | ||
8 | installed_OS_is_openembedded to match the same. | ||
9 | |||
10 | Signed-off-by: Akshay Bhat <akshay.bhat@timesys.com> | ||
11 | --- | ||
12 | shared/checks/oval/installed_OS_is_openembedded.xml | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/shared/checks/oval/installed_OS_is_openembedded.xml b/shared/checks/oval/installed_OS_is_openembedded.xml | ||
16 | index 01df16b43..eaf9f2b10 100644 | ||
17 | --- a/shared/checks/oval/installed_OS_is_openembedded.xml | ||
18 | +++ b/shared/checks/oval/installed_OS_is_openembedded.xml | ||
19 | @@ -23,7 +23,7 @@ | ||
20 | </ind:textfilecontent54_test> | ||
21 | <ind:textfilecontent54_object id="obj_openembedded" version="1" comment="Check OpenEmbedded version"> | ||
22 | <ind:filepath>/etc/os-release</ind:filepath> | ||
23 | - <ind:pattern operation="pattern match">^VERSION_ID=\"nodistro\.[0-9].$</ind:pattern> | ||
24 | + <ind:pattern operation="pattern match">^VERSION_ID=nodistro\.[0-9]$</ind:pattern> | ||
25 | <ind:instance datatype="int">1</ind:instance> | ||
26 | </ind:textfilecontent54_object> | ||
27 | |||
28 | -- | ||
29 | 2.25.1 | ||
30 | |||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fix-missing-openembedded-from-ssg-constants.py.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fix-missing-openembedded-from-ssg-constants.py.patch deleted file mode 100644 index 1e712f6..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fix-missing-openembedded-from-ssg-constants.py.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 037a12301968a56f0c7e492ea4a05d2eecbd4cc6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jate Sujjavanich <jatedev@gmail.com> | ||
3 | Date: Fri, 8 Jan 2021 20:18:00 -0500 | ||
4 | Subject: [PATCH 2/3] Fix missing openembedded from ssg/constants.py | ||
5 | |||
6 | --- | ||
7 | ssg/constants.py | 4 +++- | ||
8 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/ssg/constants.py b/ssg/constants.py | ||
11 | index fab7cda5d..2ca289f84 100644 | ||
12 | --- a/ssg/constants.py | ||
13 | +++ b/ssg/constants.py | ||
14 | @@ -234,7 +234,8 @@ PRODUCT_TO_CPE_MAPPING = { | ||
15 | } | ||
16 | |||
17 | MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhosp", "rhv", "debian", "ubuntu", | ||
18 | - "wrlinux", "opensuse", "sle", "ol", "ocp", "example"] | ||
19 | + "wrlinux", "opensuse", "sle", "ol", "ocp", "example", | ||
20 | + "openembedded"] | ||
21 | |||
22 | MULTI_PLATFORM_MAPPING = { | ||
23 | "multi_platform_debian": ["debian8"], | ||
24 | @@ -249,6 +250,7 @@ MULTI_PLATFORM_MAPPING = { | ||
25 | "multi_platform_sle": ["sle11", "sle12"], | ||
26 | "multi_platform_ubuntu": ["ubuntu1404", "ubuntu1604", "ubuntu1804"], | ||
27 | "multi_platform_wrlinux": ["wrlinux"], | ||
28 | + "multi_platform_openembedded": ["openembedded"], | ||
29 | } | ||
30 | |||
31 | RHEL_CENTOS_CPE_MAPPING = { | ||
32 | -- | ||
33 | 2.24.3 (Apple Git-128) | ||
34 | |||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch deleted file mode 100644 index f0c9909..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 28a35d63a0cc6b7beb51c77d93bb30778e6960cd Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com> | ||
3 | Date: Mon, 9 Dec 2019 13:41:47 +0100 | ||
4 | Subject: [PATCH] Fixed the broken fix, when greedy regex ate the whole file. | ||
5 | |||
6 | We want to match attributes in an XML element, not in the whole file. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | [https://github.com/ComplianceAsCode/content/commit/28a35d63a0cc6b7beb51c77d93bb30778e6960cd] | ||
10 | |||
11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
12 | --- | ||
13 | ssg/build_remediations.py | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py | ||
17 | index 13e90f732..edf31c0cf 100644 | ||
18 | --- a/ssg/build_remediations.py | ||
19 | +++ b/ssg/build_remediations.py | ||
20 | @@ -57,10 +57,10 @@ def get_available_functions(build_dir): | ||
21 | with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile: | ||
22 | filestring = xmlfile.read() | ||
23 | # This regex looks implementation dependent but we can rely on the element attributes | ||
24 | - # being present on one line. | ||
25 | + # being present. Beware, DOTALL means we go through the whole file at once. | ||
26 | # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7. | ||
27 | remediation_functions = re.findall( | ||
28 | - r'<Value.*id=\"function_(\S+)\"', | ||
29 | + r'<Value[^>]+id=\"function_(\S+)\"', | ||
30 | filestring, re.DOTALL | ||
31 | ) | ||
32 | |||
33 | -- | ||
34 | 2.17.1 | ||
35 | |||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-fix-deprecated-getiterator-function.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-fix-deprecated-getiterator-function.patch deleted file mode 100644 index 84271c4..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0002-fix-deprecated-getiterator-function.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From b0adc1d53780def4a95e310b6d26bb91ee97177e Mon Sep 17 00:00:00 2001 | ||
2 | From: Vojtech Polasek <vpolasek@redhat.com> | ||
3 | Date: Mon, 8 Jun 2020 13:27:41 +0200 | ||
4 | Subject: [PATCH] fix deprecated getiterator function | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | [https://github.com/ComplianceAsCode/content/commit/b0adc1d53780def4a95e310b6d26bb91ee97177e] | ||
8 | |||
9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
10 | --- | ||
11 | ssg/build_cpe.py | 6 +++--- | ||
12 | ssg/id_translate.py | 2 +- | ||
13 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/ssg/build_cpe.py b/ssg/build_cpe.py | ||
16 | index 2e5d24a5d..8c046777a 100644 | ||
17 | --- a/ssg/build_cpe.py | ||
18 | +++ b/ssg/build_cpe.py | ||
19 | @@ -17,7 +17,7 @@ def extract_subelement(objects, sub_elem_type): | ||
20 | """ | ||
21 | |||
22 | for obj in objects: | ||
23 | - for subelement in obj.getiterator(): | ||
24 | + for subelement in obj.iter(): | ||
25 | if subelement.get(sub_elem_type): | ||
26 | sub_element = subelement.get(sub_elem_type) | ||
27 | return sub_element | ||
28 | @@ -44,12 +44,12 @@ def extract_referred_nodes(tree_with_refs, tree_with_ids, attrname): | ||
29 | reflist = [] | ||
30 | elementlist = [] | ||
31 | |||
32 | - for element in tree_with_refs.getiterator(): | ||
33 | + for element in tree_with_refs.iter(): | ||
34 | value = element.get(attrname) | ||
35 | if value is not None: | ||
36 | reflist.append(value) | ||
37 | |||
38 | - for element in tree_with_ids.getiterator(): | ||
39 | + for element in tree_with_ids.iter(): | ||
40 | if element.get("id") in reflist: | ||
41 | elementlist.append(element) | ||
42 | |||
43 | diff --git a/ssg/id_translate.py b/ssg/id_translate.py | ||
44 | index 72b07be18..ba9225904 100644 | ||
45 | --- a/ssg/id_translate.py | ||
46 | +++ b/ssg/id_translate.py | ||
47 | @@ -64,7 +64,7 @@ class IDTranslator(object): | ||
48 | ) | ||
49 | |||
50 | def translate(self, tree, store_defname=False): | ||
51 | - for element in tree.getiterator(): | ||
52 | + for element in tree.iter(): | ||
53 | idname = element.get("id") | ||
54 | if idname: | ||
55 | # store the old name if requested (for OVAL definitions) | ||
56 | -- | ||
57 | 2.17.1 | ||
58 | |||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0003-fix-remaining-getchildren-and-getiterator-functions.patch b/meta-security-compliance/recipes-openscap/scap-security-guide/files/0003-fix-remaining-getchildren-and-getiterator-functions.patch deleted file mode 100644 index 8162292..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/files/0003-fix-remaining-getchildren-and-getiterator-functions.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | From a0da16c5eeb9a7414f7f2a37a6b270c8d04b2ddf Mon Sep 17 00:00:00 2001 | ||
2 | From: Vojtech Polasek <vpolasek@redhat.com> | ||
3 | Date: Mon, 8 Jun 2020 14:01:55 +0200 | ||
4 | Subject: [PATCH] fix remaining getchildren and getiterator functions | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | [https://github.com/ComplianceAsCode/content/commit/a0da16c5eeb9a7414f7f2a37a6b270c8d04b2ddf] | ||
8 | |||
9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
10 | --- | ||
11 | build-scripts/sds_move_ocil_to_checks.py | 2 +- | ||
12 | build-scripts/verify_references.py | 2 +- | ||
13 | shared/transforms/pcidss/transform_benchmark_to_pcidss.py | 2 +- | ||
14 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/build-scripts/sds_move_ocil_to_checks.py b/build-scripts/sds_move_ocil_to_checks.py | ||
17 | index 5f5139659..64dc19084 100755 | ||
18 | --- a/build-scripts/sds_move_ocil_to_checks.py | ||
19 | +++ b/build-scripts/sds_move_ocil_to_checks.py | ||
20 | @@ -106,7 +106,7 @@ def move_ocil_content_from_ds_extended_component_to_ds_component(datastreamtree, | ||
21 | timestamp = extendedcomp.get('timestamp') | ||
22 | |||
23 | # Get children elements of <ds:extended-component> containing OCIL content | ||
24 | - extchildren = extendedcomp.getchildren() | ||
25 | + extchildren = list(extendedcomp) | ||
26 | # There should be just one OCIL subcomponent in <ds:extended-component> | ||
27 | if len(extchildren) != 1: | ||
28 | sys.stderr.write("ds:extended-component contains more than one element!" | ||
29 | diff --git a/build-scripts/verify_references.py b/build-scripts/verify_references.py | ||
30 | index 69b3e2d1f..95d387f46 100755 | ||
31 | --- a/build-scripts/verify_references.py | ||
32 | +++ b/build-scripts/verify_references.py | ||
33 | @@ -179,7 +179,7 @@ def main(): | ||
34 | check_content_refs = xccdftree.findall(".//{%s}check-content-ref" | ||
35 | % xccdf_ns) | ||
36 | |||
37 | - xccdf_parent_map = dict((c, p) for p in xccdftree.getiterator() for c in p) | ||
38 | + xccdf_parent_map = dict((c, p) for p in xccdftree.iter() for c in p) | ||
39 | # now we can actually do the verification work here | ||
40 | if options.rules_with_invalid_checks or options.all_checks: | ||
41 | for check_content_ref in check_content_refs: | ||
42 | diff --git a/shared/transforms/pcidss/transform_benchmark_to_pcidss.py b/shared/transforms/pcidss/transform_benchmark_to_pcidss.py | ||
43 | index 0ceaf727d..c94b12c45 100755 | ||
44 | --- a/shared/transforms/pcidss/transform_benchmark_to_pcidss.py | ||
45 | +++ b/shared/transforms/pcidss/transform_benchmark_to_pcidss.py | ||
46 | @@ -111,7 +111,7 @@ def main(): | ||
47 | benchmark.findall(".//{%s}Value" % (XCCDF_NAMESPACE)): | ||
48 | values.append(value) | ||
49 | |||
50 | - parent_map = dict((c, p) for p in benchmark.getiterator() for c in p) | ||
51 | + parent_map = dict((c, p) for p in benchmark.iter() for c in p) | ||
52 | for rule in \ | ||
53 | benchmark.findall(".//{%s}Rule" % (XCCDF_NAMESPACE)): | ||
54 | parent_map[rule].remove(rule) | ||
55 | -- | ||
56 | 2.17.1 | ||
57 | |||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc deleted file mode 100644 index 6f29eda..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | # Copyright (C) 2017 Armin Kuster <akuster808@gmail.com> | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | SUMARRY = "SCAP content for various platforms" | ||
5 | HOME_URL = "https://www.open-scap.org/security-policies/scap-security-guide/" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=97662e4486d9a1d09f358851d9f41a1a" | ||
7 | LICENSE = "LGPL-2.1-only" | ||
8 | |||
9 | DEPENDS = "openscap-native python3 python3-pyyaml-native python3-jinja2-native libxml2-native expat-native" | ||
10 | |||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | inherit cmake pkgconfig python3native python3targetconfig | ||
14 | |||
15 | STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts" | ||
16 | export OSCAP_CPE_PATH="${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/cpe" | ||
17 | export OSCAP_SCHEMA_PATH="${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/schemas" | ||
18 | export OSCAP_XSLT_PATH="${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl" | ||
19 | |||
20 | OECMAKE_GENERATOR = "Unix Makefiles" | ||
21 | |||
22 | EXTRA_OECMAKE += "-DENABLE_PYTHON_COVERAGE=OFF" | ||
23 | |||
24 | B = "${S}/build" | ||
25 | |||
26 | do_configure[depends] += "openscap-native:do_install" | ||
27 | |||
28 | do_configure:prepend () { | ||
29 | sed -i -e 's:NAMES\ sed:NAMES\ ${HOSTTOOLS_DIR}/sed:g' ${S}/CMakeLists.txt | ||
30 | sed -i -e 's:NAMES\ grep:NAMES\ ${HOSTTOOLS_DIR}/grep:g' ${S}/CMakeLists.txt | ||
31 | } | ||
32 | |||
33 | FILES:${PN} += "${datadir}/xml" | ||
34 | |||
35 | RDEPENDS:${PN} = "openscap" | ||
diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb deleted file mode 100644 index f493ea8..0000000 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | SUMARRY = "SCAP content for various platforms, OE changes" | ||
2 | |||
3 | SRCREV = "5fdfdcb2e95afbd86ace555beca5d20cbf1043ed" | ||
4 | SRC_URI = "git://github.com/akuster/scap-security-guide.git;branch=oe-0.1.44;;protocol=https \ | ||
5 | file://0001-Fix-XML-parsing-of-the-remediation-functions-file.patch \ | ||
6 | file://0002-Fixed-the-broken-fix-when-greedy-regex-ate-the-whole.patch \ | ||
7 | file://0001-fix-deprecated-instance-of-element.getchildren.patch \ | ||
8 | file://0002-fix-deprecated-getiterator-function.patch \ | ||
9 | file://0003-fix-remaining-getchildren-and-getiterator-functions.patch \ | ||
10 | file://0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch \ | ||
11 | file://0002-Fix-missing-openembedded-from-ssg-constants.py.patch \ | ||
12 | file://0001-installed_OS_is_openembedded-Update-pattern-match.patch \ | ||
13 | " | ||
14 | PV = "0.1.44+git${SRCPV}" | ||
15 | |||
16 | require scap-security-guide.inc | ||
17 | |||
18 | EXTRA_OECMAKE += "-DSSG_PRODUCT_OPENEMBEDDED=ON" | ||