File 0001-Fix-invalid-CPE-content.patch of Package openscap.2375
From 57a9efac0b24ffb5c2b771ae7e5d16221700b89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Tue, 3 Nov 2015 09:10:47 +0100
Subject: [PATCH] Fix invalid CPE content
This OVAL file was invalid. There were missing objects and states.
It was one of causes of issue #191 (segfault on oscap xccdf eval).
---
cpe/openscap-cpe-oval.xml | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
Index: openscap-1.1.0/cpe/openscap-cpe-oval.xml
===================================================================
--- openscap-1.1.0.orig/cpe/openscap-cpe-oval.xml
+++ openscap-1.1.0/cpe/openscap-cpe-oval.xml
@@ -462,18 +462,8 @@
</rpminfo_test>
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:1" version="1" check="at least one" comment="/etc/sled-release is provided by sled-release package"
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
- <object object_ref="oval:org.open-scap.cpe.sles-release:obj:1"/>
- <state state_ref="oval:org.open-scap.cpe.sled:ste:1"/>
- </rpminfo_test>
- <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sles:tst:2" version="1" check="at least one" comment="/etc/sles-release is provided by sles-release package"
- xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
- <object object_ref="oval:org.open-scap.cpe.sles-release:obj:1"/>
- <state state_ref="oval:org.open-scap.cpe.sles:ste:2"/>
- </rpminfo_test>
- <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:2" version="1" check="at least one" comment="/etc/sles-release is provided by sles-release package"
- xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
<object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
- <state state_ref="oval:org.open-scap.cpe.sled:ste:2"/>
+ <state state_ref="oval:org.open-scap.cpe.sled:ste:1"/>
</rpminfo_test>
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sles:tst:10" version="1" check="at least one" comment="sles-release is version 10"
@@ -498,12 +488,12 @@
</rpminfo_test>
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:11" version="1" check="at least one" comment="sled-release is version 11"
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
- <object object_ref="oval:org.open-scap.cpe.sled-release:obj:3"/>
+ <object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
<state state_ref="oval:org.open-scap.cpe.sled:ste:11"/>
</rpminfo_test>
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:12" version="1" check="at least one" comment="sled-release is version 12"
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
- <object object_ref="oval:org.open-scap.cpe.sled-release:obj:3"/>
+ <object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
<state state_ref="oval:org.open-scap.cpe.sled:ste:12"/>
</rpminfo_test>
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:1" version="1" check="at least one" comment="openSUSE-release is version 11.4"
@@ -606,10 +596,10 @@
<rpminfo_state id="oval:org.open-scap.cpe.fedora:ste:22" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
<version operation="pattern match">^22$</version>
</rpminfo_state>
- <rpminfo_state id="oval:org.open-scap.cpe.sles:ste:2" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <rpminfo_state id="oval:org.open-scap.cpe.sles:ste:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
<name operation="pattern match">^sles-release</name>
</rpminfo_state>
- <rpminfo_state id="oval:org.open-scap.cpe.sled:ste:2" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <rpminfo_state id="oval:org.open-scap.cpe.sled:ste:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
<name operation="pattern match">^sled-release</name>
</rpminfo_state>
<rpminfo_state id="oval:org.open-scap.cpe.sles:ste:10" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
