components/openscap/patches/oval_probe.c.patch
branchs11u3-sru
changeset 5494 4d99913076de
parent 2705 e39a44e3cb41
--- a/components/openscap/patches/oval_probe.c.patch	Tue Feb 23 15:51:24 2016 -0800
+++ b/components/openscap/patches/oval_probe.c.patch	Wed Feb 24 14:19:35 2016 -0800
@@ -1,16 +1,16 @@
-This patch adds the smf probe to the list of supported probes.
-This patch has not been contributed upstream, but is planned to be done by
- 2013-Jul-12.
-
---- openscap-0.8.1/src/OVAL/oval_probe.c.orig	2012-11-19 10:04:14.596320954 -0800
-+++ openscap-0.8.1/src/OVAL/oval_probe.c	2012-11-19 09:56:27.562728645 -0800
-@@ -84,7 +84,8 @@
-         OVAL_PROBE_EXTERNAL(OVAL_UNIX_PROCESS58, "process58"),
+This patch adds the smf, smfproperty probes to the list of supported probes.
+This patch has been submitted upstream, but is being negotiated am hoping
+to have it accepted by 2016-Mar-15.
+--- openscap-1.2.6/src/OVAL/oval_probe.c.~1~	2016-01-28 09:48:41.960984701 -0800
++++ openscap-1.2.6/src/OVAL/oval_probe.c	2016-01-28 09:51:02.504730673 -0800
+@@ -91,7 +91,9 @@
          OVAL_PROBE_EXTERNAL(OVAL_UNIX_FILEEXTENDEDATTRIBUTE, "fileextendedattribute"),
          OVAL_PROBE_EXTERNAL(OVAL_UNIX_GCONF, "gconf"),
--        OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable")
-+        OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable"),
-+        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf")
+         OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable"),
+-        OVAL_PROBE_EXTERNAL(OVAL_UNIX_SYMLINK, "symlink")
++        OVAL_PROBE_EXTERNAL(OVAL_UNIX_SYMLINK, "symlink"),
++	OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf"),
++	OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMFPROPERTY,"smfproperty")
  };
  
  #define __PROBE_META_COUNT (sizeof OSCAP_GSYM(__probe_meta)/sizeof OSCAP_GSYM(__probe_meta)[0])