summaryrefslogtreecommitdiffstats
path: root/meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch')
-rw-r--r--meta-security-compliance/recipes-openscap/scap-security-guide/files/0001-Fix-platform-spec-file-check-tests-in-installed-OS-d.patch46
1 files changed, 0 insertions, 46 deletions
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 @@
1From 2beb4bc83a157b21edb1a3fef295cd4cced467df Mon Sep 17 00:00:00 2001
2From: Jate Sujjavanich <jatedev@gmail.com>
3Date: Thu, 7 Jan 2021 18:10:01 -0500
4Subject: [PATCH 1/3] Fix platform spec, file check, tests in installed OS
5 detect for openembedded
6
7Change platform to multi in openembedded installed check matching others
8and 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
13diff --git a/shared/checks/oval/installed_OS_is_openembedded.xml b/shared/checks/oval/installed_OS_is_openembedded.xml
14index 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--
452.24.3 (Apple Git-128)
46