Merge branch 'maint-1.0' into maint-1.2

Before 1.2.9 Conflicts: cpe/openscap-cpe-dict.xml cpe/openscap-cpe-oval.xml
Spencerx · Feb 25, 2016 · d244e4a · d244e4a
2 parents cf6f263 + 9bdf0f8
commit d244e4a
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 5 deletions.
diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml
@@ -77,6 +77,10 @@
             <title xml:lang="en-us">Fedora 24</title>
             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:24</check>
       </cpe-item>
+      <cpe-item name="cpe:/o:fedoraproject:fedora:25">
+            <title xml:lang="en-us">Fedora 25</title>
+            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:25</check>
+      </cpe-item>
       <cpe-item name="cpe:/o:suse:sle">
             <title xml:lang="en-us">SUSE Linux Enterprise all versions</title>
             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sle:def:1</check>
@@ -121,6 +125,7 @@
             <title xml:lang="en-us">openSUSE All Versions</title>
             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:1</check>
       </cpe-item>
+
       <!-- Add-ons -->
       <cpe-item name="cpe:/a:redhat:rhel_productivity">
             <title xml:lang="en-us">Red Hat Enterprise Linux Optional Productivity Applications</title>

diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml
@@ -278,6 +278,20 @@
                         <criterion comment="Fedora 24 is installed" test_ref="oval:org.open-scap.cpe.fedora:tst:24"/>
                   </criteria>
             </definition>
+            <definition class="inventory" id="oval:org.open-scap.cpe.fedora:def:25" version="1">
+                  <metadata>
+                        <title>Fedora 25</title>
+                        <affected family="unix">
+                            <platform>Fedora 25</platform>
+                        </affected>
+                        <reference ref_id="cpe:/o:fedoraproject:fedora:25" source="CPE"/>
+                        <description>The operating system installed on the system is Fedora 25</description>
+                  </metadata>
+                  <criteria>
+                        <criterion comment="Installed operating system is part of the unix family" test_ref="oval:org.open-scap.cpe.rhel:tst:1"/>
+                        <criterion comment="Fedora 25 is installed" test_ref="oval:org.open-scap.cpe.fedora:tst:25"/>
+                  </criteria>
+            </definition>
 
             <definition class="inventory" id="oval:org.open-scap.cpe.sle:def:1" version="1">
                   <metadata>
@@ -446,7 +460,6 @@
                         <criterion comment="openSUSE 13.2 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:132"/>
                   </criteria>
             </definition>
-
       </definitions>
       <tests>
             <family_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.rhel:tst:1" version="1" check="only one" 
@@ -550,6 +563,11 @@
                   <object object_ref="oval:org.open-scap.cpe.fedora-release:obj:2"/>
                   <state state_ref="oval:org.open-scap.cpe.fedora:ste:24"/>
             </rpminfo_test>
+            <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.fedora:tst:25" version="1" check="at least one" comment="fedora-release is version Fedora 25"
+                  xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+                  <object object_ref="oval:org.open-scap.cpe.fedora-release:obj:2"/>
+                  <state state_ref="oval:org.open-scap.cpe.fedora:ste:25"/>
+            </rpminfo_test>
             <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sles:tst:1" 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"/>
@@ -709,6 +727,9 @@
             <rpminfo_state id="oval:org.open-scap.cpe.fedora:ste:24" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                   <version operation="pattern match">^24$</version>
             </rpminfo_state>
+            <rpminfo_state id="oval:org.open-scap.cpe.fedora:ste:25" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+                  <version operation="pattern match">^25$</version>
+            </rpminfo_state>
             <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>

diff --git a/docs/manual/manual.adoc b/docs/manual/manual.adoc
@@ -2,7 +2,7 @@
 Michal Šrubař <msrubar@redhat.com>
 v1.0, 2015-31-08
 :imagesdir: ./images
-:workbench_url: https://fedorahosted.org/scap-workbench/
+:workbench_url: https://www.open-scap.org/tools/scap-workbench/
 :openscap_web: https://open-scap.org/
 :oscap_git:     https://github.com/OpenSCAP/openscap
 :ssg_git:       https://github.com/OpenSCAP/scap-security-guide

diff --git a/src/XCCDF_POLICY/xccdf_policy_resolve.c b/src/XCCDF_POLICY/xccdf_policy_resolve.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1015 Red Hat Inc., Durham, North Carolina.
+ * Copyright 2015 Red Hat Inc., Durham, North Carolina.
  * All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or

diff --git a/tests/probes/process58/command_line.sh b/tests/probes/process58/command_line.sh
@@ -42,6 +42,10 @@ function get_zombie_pid_from_ppid() {
 			[ "${ZOMBIE_PID}" != "" ] && break;
 			sleep 0.1s
 		done
+	if [ "x${ZOMBIE_PID}" == "x" ]; then
+		echo "Debug: The ZOMBIE_PID was not found!" >&2
+		ps -ostate,pid --ppid ${PARENT_PID} >&2
+	fi
 	echo ${ZOMBIE_PID}
 }
 

diff --git a/tests/sce/Makefile.am b/tests/sce/Makefile.am
@@ -15,5 +15,9 @@ EXTRA_DIST =	test_sce.sh \
 		lua_passer.lua \
 		python_passer.py \
 		python_is16.py \
+		test_check_engine_results.sh \
 		test_check_engine_results.xccdf.xml \
-		empty_stdout.sh
+		empty_stdout.sh \
+		test_passing_vars.sh \
+		test_passing_vars_sce.sh \
+		test_passing_vars_xccdf.xml
diff --git a/utils/oscap.8 b/utils/oscap.8
@@ -622,7 +622,7 @@ Evaluate XCCDF content using CPE dictionary and produce html report. In this cas
 
 .SH REPORTING BUGS
 .nf
-Please report bugs using https://fedorahosted.org/openscap/
+Please report bugs using https://github.com/OpenSCAP/openscap/issues
 Make sure you include the full output of `oscap --v` in the bug report.
 
 .SH AUTHORS