update to 1.2.10

1 files changed, 0 insertions, 100 deletions

diff --git a/fails_and_fix.patch b/fails_and_fix.patch
deleted file mode 100644
index 17be9d8d32ff..000000000000
--- a/fails_and_fix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -aur openscap-1.2.8/tests/API/OVAL/unittests/all.sh openscap-1.2.8-patch/tests/API/OVAL/unittests/all.sh
---- openscap-1.2.8/tests/API/OVAL/unittests/all.sh	2016-01-18 17:22:49.094523797 +0800
-+++ openscap-1.2.8-patch/tests/API/OVAL/unittests/all.sh	2016-04-06 17:04:11.290429850 +0800
-@@ -11,7 +11,7 @@
- test_run "applicability_check element" $srcdir/test_applicability_check.sh
- test_run "count function"  $srcdir/test_count_function.sh
- test_run "partial matches"  $srcdir/test_item_not_exist.sh
--test_run "empty variable evaluation" $srcdir/test_oval_empty_variable_evaluation.sh
-+#test_run "empty variable evaluation" $srcdir/test_oval_empty_variable_evaluation.sh
- test_run "export of xsi:nil on pid entity of env.var.58_object" $srcdir/test_xsinil_envv58_pid.sh
- test_run "Import content without proper namespaces" $srcdir/test_xmlns_missing.sh
- test_run "int comparison - intmax_t" $srcdir/test_int_comparison.sh
-diff -aur openscap-1.2.8/tests/API/XCCDF/unittests/all.sh openscap-1.2.8-patch/tests/API/XCCDF/unittests/all.sh
---- openscap-1.2.8/tests/API/XCCDF/unittests/all.sh	2016-01-18 17:22:49.093523769 +0800
-+++ openscap-1.2.8-patch/tests/API/XCCDF/unittests/all.sh	2016-04-06 16:52:00.991482169 +0800
-@@ -80,10 +80,10 @@
- #
- # Tests for 'oscap xccdf remediate'
- #
--test_run "XCCDF Remediate" $srcdir/test_remediate_simple.sh
--test_run "XCCDF Remediate + python fix" $srcdir/test_remediate_python.sh
--test_run "XCCDF Remediate + python fix + xhtml:object" $srcdir/test_remediate_python_subs.sh
--test_run "XCCDF Remediate + perl fix" $srcdir/test_remediate_perl.sh
-+#test_run "XCCDF Remediate" $srcdir/test_remediate_simple.sh
-+#test_run "XCCDF Remediate + python fix" $srcdir/test_remediate_python.sh
-+#test_run "XCCDF Remediate + python fix + xhtml:object" $srcdir/test_remediate_python_subs.sh
-+#test_run "XCCDF Remediate + perl fix" $srcdir/test_remediate_perl.sh
- 
- #
- # Tests for XCCDF report
-diff -aur openscap-1.2.8/tests/mitre/test_mitre.sh openscap-1.2.8-patch/tests/mitre/test_mitre.sh
---- openscap-1.2.8/tests/mitre/test_mitre.sh	2016-01-18 17:18:42.303429988 +0800
-+++ openscap-1.2.8-patch/tests/mitre/test_mitre.sh	2016-04-06 16:52:50.136542323 +0800
-@@ -97,16 +97,16 @@
- #test_run "unix-def_file_test.xml" test_mitre unix-def_file_test.xml "true"
- 
- test_run "linux-def_partition_test.xml" test_mitre linux-def_partition_test.xml "true"
--test_run "linux-def_rpminfo_test.xml" test_mitre linux-def_rpminfo_test.xml "true"
--test_run "linux-def_rpmverify_test.xml" test_mitre linux-def_rpmverify_test.xml "true"
-+#test_run "linux-def_rpminfo_test.xml" test_mitre linux-def_rpminfo_test.xml "true"
-+#test_run "linux-def_rpmverify_test.xml" test_mitre linux-def_rpmverify_test.xml "true"
- # Fedora 18 and RHEL-7 - no allow_console_login
- if [[ ( ${DISTRO#Fedora} != "$DISTRO" && $DISTRO_RELEASE -lt 18 ) || \
- 	( ${DISTRO#Red Hat} != "$DISTRO" && $DISTRO_RELEASE -lt 7 ) ]]; then
- 	test_run "linux-def_selinuxboolean_test.xml" test_mitre linux-def_selinuxboolean_test.xml "true"
- fi
- 
--test_run "linux-def_selinuxsecuritycontext_test.xml" test_mitre linux-def_selinuxsecuritycontext_test.xml "true"
--test_run "linux-def_inetlisteningservers_test.xml" test_mitre linux-def_inetlisteningservers_test.xml "true"
-+#test_run "linux-def_selinuxsecuritycontext_test.xml" test_mitre linux-def_selinuxsecuritycontext_test.xml "true"
-+#test_run "linux-def_inetlisteningservers_test.xml" test_mitre linux-def_inetlisteningservers_test.xml "true"
- 
- test_run "oval_binary_datatype.xml" test_mitre oval_binary_datatype.xml "true"
- test_run "oval_boolean_datatype.xml" test_mitre oval_boolean_datatype.xml "true"
---- openscap-1.2.8/tests/probes/Makefile.am	2016-01-18 17:18:42.304430017 +0800
-+++ openscap-1.2.8-patch/tests/probes/Makefile.am	2016-04-06 16:35:21.606042932 +0800
-@@ -29,9 +29,9 @@
- if probe_file_enabled
- UNIX_SUBDIRS += file
- endif
--if probe_uname_enabled
--UNIX_SUBDIRS += uname
--endif
-+#if probe_uname_enabled
-+#UNIX_SUBDIRS += uname
-+#endif
- if probe_shadow_enabled
- UNIX_SUBDIRS += shadow
- endif
-@@ -77,12 +77,12 @@
- if probe_selinuxboolean_enabled
- LINUX_SUBDIRS += selinuxboolean
- endif
--if probe_systemdunitproperty_enabled
--LINUX_SUBDIRS += systemdunitproperty
--endif
--if probe_systemdunitdependency_enabled
--LINUX_SUBDIRS += systemdunitdependency
--endif
-+#if probe_systemdunitproperty_enabled
-+#LINUX_SUBDIRS += systemdunitproperty
-+#endif
-+#if probe_systemdunitdependency_enabled
-+#LINUX_SUBDIRS += systemdunitdependency
-+#endif
- endif
- 
- if WANT_PROBES_SOLARIS
---- openscap-1.2.8/tests/test_common.sh.in	2016-04-06 17:10:12.439743753 +0800
-+++ openscap-1.2.8-patch/tests/test_common.sh.in	2016-04-06 17:03:00.834628286 +0800
-@@ -67,7 +64,8 @@
- 	echo -e "RESULT: SKIPPED\n" >&2
- 	return 0; 
-     else
--        result=$[$result + $ret_val]
-+# It's quite weird that a warning halts the whole tests.
-+#       result=$[$result + $ret_val]
- 	echo "[ WARN ]"; 
- 	echo -e "RESULT: WARNING (unknown exist status $ret_val)\n" >&2
- 	return 1;