Skip to content

Commit 90fe6e5

Browse files
atomicturtleatomicturtle
authored
Merge pull request #25 from atomicturtle/v0.1.57-rhel
Updating for 0.1.57
2 parents c517b2c + 11908df commit 90fe6e5

File tree

4 files changed

+123
-3
lines changed

4 files changed

+123
-3
lines changed

‎ComplianceAsCode/content_for_supporting_rocky8/files/disa-stig-rocky8-v1r3-xccdf-manual.xml renamed to ‎ComplianceAsCode/content_for_supporting_rocky8/files/disa-stig-rl8-v1r3-xccdf-manual.xml

File renamed without changes.

‎ComplianceAsCode/content_for_supporting_rocky8/files/installed_OS_is_rocky8.xml renamed to ‎ComplianceAsCode/content_for_supporting_rocky8/files/installed_OS_is_rl8.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<def-group>
22
<definition class="inventory"
3-
id="installed_OS_is_rocky8" version="1">
3+
id="installed_OS_is_rl8" version="1">
44
<metadata>
55
<title>Rocky Linux 8</title>
66
<affected family="unix">

‎ComplianceAsCode/content_for_supporting_rocky8/files/rocky8-0.1.57.patch

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
diff -ruN scap-security-guide-0.1.57/build_product b/build_product
2+
--- scap-security-guide-0.1.57/build_product 2021-07-27 10:51:15.000000000 -0400
3+
+++ b/build_product 2021-10-16 14:14:27.167238394 -0400
4+
@@ -297,6 +297,7 @@
5+
OPENSUSE
6+
RHEL7
7+
RHEL8
8+
+ ROCKY8
9+
RHEL9
10+
RHOSP10
11+
RHOSP13
12+
diff -ruN scap-security-guide-0.1.57/CMakeLists.txt b/CMakeLists.txt
13+
--- scap-security-guide-0.1.57/CMakeLists.txt 2021-10-16 13:57:11.850990039 -0400
14+
+++ b/CMakeLists.txt 2021-10-16 14:14:00.232789690 -0400
15+
@@ -92,6 +92,7 @@
16+
option(SSG_PRODUCT_VSEL "If enabled, the McAfee VSEL SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
17+
option(SSG_PRODUCT_WRLINUX8 "If enabled, the WRLinux8 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
18+
option(SSG_PRODUCT_WRLINUX1019 "If enabled, the WRLinux1019 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
19+
+option(SSG_PRODUCT_ROCKY8 "If enabled, the ROCKY8 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
20+
21+
option(SSG_CENTOS_DERIVATIVES_ENABLED "If enabled, CentOS derivative content will be built from the RHEL content" TRUE)
22+
option(SSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED "If enabled, Scientific Linux derivative content will be built from the RHEL content" TRUE)
23+
@@ -287,6 +288,7 @@
24+
message(STATUS "McAfee VSEL: ${SSG_PRODUCT_VSEL}")
25+
message(STATUS "WRLinux 8: ${SSG_PRODUCT_WRLINUX8}")
26+
message(STATUS "WRLinux 1019: ${SSG_PRODUCT_WRLINUX1019}")
27+
+message(STATUS "ROCKY 8: ${SSG_PRODUCT_ROCKY8}")
28+
29+
30+
31+
@@ -409,6 +411,10 @@
32+
if (SSG_PRODUCT_WRLINUX1019)
33+
add_subdirectory("products/wrlinux1019" "wrlinux1019")
34+
endif()
35+
+if (SSG_PRODUCT_ROCKY8)
36+
+ add_subdirectory("products/rl8" "rl8")
37+
+endif()
38+
+
39+
40+
# ZIP only contains source datastreams and kickstarts, people who
41+
# want sources to build from should get the tarball instead.
42+
diff -ruN scap-security-guide-0.1.57/shared/checks/oval/install_mcafee_hbss.xml b/shared/checks/oval/install_mcafee_hbss.xml
43+
--- scap-security-guide-0.1.57/shared/checks/oval/install_mcafee_hbss.xml 2021-07-27 10:51:15.000000000 -0400
44+
+++ b/shared/checks/oval/install_mcafee_hbss.xml 2021-10-16 14:14:00.232789690 -0400
45+
@@ -14,6 +14,7 @@
46+
<platform>multi_platform_sle</platform>
47+
<platform>multi_platform_ubuntu</platform>
48+
<platform>multi_platform_wrlinux</platform>
49+
+ <platform>multi_platform_rl</platform>
50+
</affected>
51+
<description>McAfee Host-Based Intrusion Detection Software (HBSS) software
52+
should be installed.</description>
53+
diff -ruN scap-security-guide-0.1.57/shared/checks/oval/sysctl_kernel_ipv6_disable.xml b/shared/checks/oval/sysctl_kernel_ipv6_disable.xml
54+
--- scap-security-guide-0.1.57/shared/checks/oval/sysctl_kernel_ipv6_disable.xml 2021-07-27 10:51:15.000000000 -0400
55+
+++ b/shared/checks/oval/sysctl_kernel_ipv6_disable.xml 2021-10-16 14:14:00.233789707 -0400
56+
@@ -9,11 +9,12 @@
57+
<platform>multi_platform_opensuse</platform>
58+
<platform>multi_platform_ol</platform>
59+
<platform>multi_platform_rhcos</platform>
60+
- <platform>multi_platform_rhel</platform>
61+
+ <platform>multi_platform_rhel,multi_platform_rl</platform>
62+
<platform>multi_platform_rhv</platform>
63+
<platform>multi_platform_sle</platform>
64+
<platform>multi_platform_ubuntu</platform>
65+
<platform>multi_platform_wrlinux</platform>
66+
+ <platform>multi_platform_rl</platform>
67+
</affected>
68+
<description>Disables IPv6 for all network interfaces.</description>
69+
</metadata>
70+
diff -ruN scap-security-guide-0.1.57/ssg/constants.py b/ssg/constants.py
71+
--- scap-security-guide-0.1.57/ssg/constants.py 2021-07-27 10:51:15.000000000 -0400
72+
+++ b/ssg/constants.py 2021-10-16 14:14:00.233789707 -0400
73+
@@ -24,7 +24,8 @@
74+
'sle12', 'sle15',
75+
'ubuntu1604', 'ubuntu1804', 'ubuntu2004',
76+
'vsel',
77+
- 'wrlinux8', 'wrlinux1019'
78+
+ 'wrlinux8', 'wrlinux1019',
79+
+ 'rl8'
80+
]
81+
82+
JINJA_MACROS_BASE_DEFINITIONS = os.path.join(os.path.dirname(os.path.dirname(
83+
@@ -181,6 +182,7 @@
84+
"Ubuntu 20.04": "ubuntu2004",
85+
"WRLinux 8": "wrlinux8",
86+
"WRLinux 1019": "wrlinux1019",
87+
+ "Rocky Linux 8": "rl8",
88+
}
89+
90+
91+
@@ -195,7 +197,7 @@
92+
}
93+
94+
MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhosp", "rhv", "debian", "ubuntu",
95+
- "wrlinux", "opensuse", "sle", "ol", "ocp", "rhcos", "example"]
96+
+ "wrlinux", "opensuse", "sle", "ol", "ocp", "rhcos", "rl", "example"]
97+
98+
MULTI_PLATFORM_MAPPING = {
99+
"multi_platform_debian": ["debian9", "debian10"],
100+
@@ -211,6 +213,7 @@
101+
"multi_platform_sle": ["sle12", "sle15"],
102+
"multi_platform_ubuntu": ["ubuntu1604", "ubuntu1804", "ubuntu2004"],
103+
"multi_platform_wrlinux": ["wrlinux8", "wrlinux1019"],
104+
+ "multi_platform_rl": ["rl8"],
105+
}
106+
107+
RHEL_CENTOS_CPE_MAPPING = {
108+
@@ -376,6 +379,7 @@
109+
'ol': 'Oracle Linux',
110+
'ocp': 'Red Hat OpenShift Container Platform',
111+
'rhcos': 'Red Hat Enterprise Linux CoreOS',
112+
+ 'rl': 'Rocky Linux',
113+
}
114+
115+

‎ComplianceAsCode/content_for_supporting_rocky8/tools/add_product_rocky8.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
### copy rocky8 directory under new directory
44
cp -pr ./content_for_supporting_rocky8/files/rl8 ./products/ || exit 1
55
### copy several files
6-
#cp -pr ./content_for_supporting_rocky8/files/installed_OS_is_rocky8.xml ./shared/checks/oval/
76
cp -pr ./content_for_supporting_rocky8/files/installed_OS_is_rl8.xml ./shared/checks/oval/
87
cp -pr ./content_for_supporting_rocky8/files/disa-stig-rl8-v1r3-xccdf-manual.xml ./shared/references/
98

109
### patch to several files for supporting rocky8
11-
patch -p1 < ./content_for_supporting_rocky8/files/diff_content_for_supporting_rocky8
10+
patch -p1 < ./content_for_supporting_rocky8/files/rocky8-0.1.57.patch
11+
if [ $? -ne 0 ]; then
12+
echo
13+
echo "ERROR: patching failed"
14+
echo
15+
exit 1
16+
fi
1217

1318
### add rocky8 to several XML definition files.
1419
find ./linux_os -type f -exec sed -i '/prodtype:/s/rhel8/rhel8,rl8/g' {} \;

0 commit comments

Comments
 (0)