AlmaLinux changes
This commit is contained in:
parent
b843c4abcb
commit
afa03e0da2
70
SOURCES/openscap-1.3.5-almalinux.patch
Normal file
70
SOURCES/openscap-1.3.5-almalinux.patch
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
diff -Naur openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml openscap-1.3.3.alma/cpe/openscap-cpe-oval.xml
|
||||||
|
--- openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml 2020-04-30 11:50:09.000000000 +0300
|
||||||
|
+++ openscap-1.3.3.alma/cpe/openscap-cpe-oval.xml 2021-03-22 13:12:12.069413537 +0300
|
||||||
|
@@ -133,6 +133,19 @@
|
||||||
|
<criterion comment="Oracle Linux 8 is installed" test_ref="oval:org.open-scap.cpe.ol:tst:8"/>
|
||||||
|
</criteria>
|
||||||
|
</definition>
|
||||||
|
+ <definition class="inventory" id="oval:org.open-scap.cpe.almalinux:def:8" version="1">
|
||||||
|
+ <metadata>
|
||||||
|
+ <title>AlmaLinux 8</title>
|
||||||
|
+ <affected family="unix">
|
||||||
|
+ <platform>AlmaLinux 8</platform>
|
||||||
|
+ </affected>
|
||||||
|
+ <reference ref_id="cpe:/o:almalinux:almalinux:8" source="CPE"/>
|
||||||
|
+ <description>The operating system installed on the system is AlmaLinux 8</description>
|
||||||
|
+ </metadata>
|
||||||
|
+ <criteria>
|
||||||
|
+ <criterion comment="AlmaLinux 8 is installed" test_ref="oval:org.open-scap.cpe.almalinux:tst:8"/>
|
||||||
|
+ </criteria>
|
||||||
|
+ </definition>
|
||||||
|
<definition class="inventory" id="oval:org.open-scap.cpe.rhel:def:1005" version="1">
|
||||||
|
<metadata>
|
||||||
|
<title>Community Enterprise Operating System 5</title>
|
||||||
|
@@ -828,6 +841,11 @@
|
||||||
|
<object object_ref="oval:org.open-scap.cpe.oraclelinux-release:obj:1"/>
|
||||||
|
<state state_ref="oval:org.open-scap.cpe.ol:ste:8"/>
|
||||||
|
</rpminfo_test>
|
||||||
|
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.almalinux:tst:8" version="1" check="at least one" comment="almalinux-release is version 8"
|
||||||
|
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
+ <object object_ref="oval:org.open-scap.cpe.almalinux-release:obj:1"/>
|
||||||
|
+ <state state_ref="oval:org.open-scap.cpe.almalinux:ste:8"/>
|
||||||
|
+ </rpminfo_test>
|
||||||
|
<rpmverifyfile_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.rhel:tst:1005" version="1" check="at least one" comment="centos-release is version 5"
|
||||||
|
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<object object_ref="oval:org.open-scap.cpe.redhat-release:obj:3"/>
|
||||||
|
@@ -1165,6 +1183,9 @@
|
||||||
|
<rpminfo_object id="oval:org.open-scap.cpe.oraclelinux-release:obj:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<name>oraclelinux-release</name>
|
||||||
|
</rpminfo_object>
|
||||||
|
+ <rpminfo_object id="oval:org.open-scap.cpe.almalinux-release:obj:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
+ <name>almalinux-release</name>
|
||||||
|
+ </rpminfo_object>
|
||||||
|
<registry_object id="oval:org.open-scap.cpe.windows:obj:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" >
|
||||||
|
<hive>HKEY_LOCAL_MACHINE</hive>
|
||||||
|
<key>SOFTWARE\Microsoft\Windows NT\CurrentVersion</key>
|
||||||
|
@@ -1233,6 +1254,10 @@
|
||||||
|
<name operation="pattern match">^oraclelinux-release</name>
|
||||||
|
<version operation="pattern match">^8</version>
|
||||||
|
</rpminfo_state>
|
||||||
|
+ <rpminfo_state id="oval:org.open-scap.cpe.almalinux:ste:8" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
+ <name operation="pattern match">^almalinux-release</name>
|
||||||
|
+ <version operation="pattern match">^8</version>
|
||||||
|
+ </rpminfo_state>
|
||||||
|
<rpminfo_state id="oval:org.open-scap.cpe.fedora:ste:16" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<version operation="pattern match">^16$</version>
|
||||||
|
</rpminfo_state>
|
||||||
|
diff -Naur openscap-1.3.5/cpe/openscap-cpe-dict.xml openscap-1.3.5.alma/cpe/openscap-cpe-dict.xml
|
||||||
|
--- openscap-1.3.5/cpe/openscap-cpe-dict.xml 2021-04-23 13:39:58.000000000 +0300
|
||||||
|
+++ openscap-1.3.5.alma/cpe/openscap-cpe-dict.xml 2021-10-10 10:02:27.000000000 +0300
|
||||||
|
@@ -37,6 +37,10 @@
|
||||||
|
<title xml:lang="en-us">Community Enterprise Operating System 8</title>
|
||||||
|
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.centos:def:8</check>
|
||||||
|
</cpe-item>
|
||||||
|
+ <cpe-item name="cpe:/o:almalinux:almalinux:8">
|
||||||
|
+ <title xml:lang="en-us">AlmaLinux 8</title>
|
||||||
|
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.almalinux:def:8</check>
|
||||||
|
+ </cpe-item>
|
||||||
|
<cpe-item name="cpe:/o:fedoraproject:fedora:32">
|
||||||
|
<title xml:lang="en-us">Fedora 32</title>
|
||||||
|
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:32</check>
|
||||||
@ -1,11 +1,13 @@
|
|||||||
Name: openscap
|
Name: openscap
|
||||||
Version: 1.3.6
|
Version: 1.3.6
|
||||||
Release: 3%{?dist}
|
Release: 3%{?dist}.alma
|
||||||
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.open-scap.org/
|
URL: http://www.open-scap.org/
|
||||||
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
# Add AlmaLinux definitions
|
||||||
|
Patch100: openscap-1.3.5-almalinux.patch
|
||||||
Patch1: openscap-1.3.7-PR-1841-coverity.patch
|
Patch1: openscap-1.3.7-PR-1841-coverity.patch
|
||||||
Patch2: openscap-1.3.7-PR-1843-fix-test-ds-misc.patch
|
Patch2: openscap-1.3.7-PR-1843-fix-test-ds-misc.patch
|
||||||
Patch3: openscap-1.3.7-PR-1844-fix-test-ds-misc-2.patch
|
Patch3: openscap-1.3.7-PR-1844-fix-test-ds-misc-2.patch
|
||||||
@ -228,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_bindir}/oscap-run-sce-script
|
%{_bindir}/oscap-run-sce-script
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 01 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1.3.6-3.alma
|
||||||
|
- AlmaLinux changes
|
||||||
|
|
||||||
* Wed Feb 02 2022 Jan Černý <jcerny@redhat.com> - 1.3.6-3
|
* Wed Feb 02 2022 Jan Černý <jcerny@redhat.com> - 1.3.6-3
|
||||||
- Prevent fails of test_ds_misc.sh
|
- Prevent fails of test_ds_misc.sh
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user