openscap/openscap-operator-c++.patch
Marcus Meissner 0cb0407eba Accepting request 799976 from home:msmeissn:branches:security
- openscap 1.3.3. Notable improvements in this release:
  - a Python script that can be used for CLI tailoring (autotailor) (thank you, Matěj Týč);
  - timezone for XCCDF TestResult start and end time (thank you, Jan Černý);
  - new yamlfilecontent independent probe (draft implementation),
    see the proposal https://github.com/OVAL-Community/OVAL/issues/91
    for additional information.
There are other changes as well, here is the list:
  - Introduced `urn:xccdf:fix:script:kubernetes` fix type in XCCDF;
  - Added ability to generate `machineconfig` fix;
  - Detect ambiguous scan target (utils/oscap-podman);
  - Fixed #170: The rpmverifyfile probe can't verify files from '/bin' directory;
  - The data system_info probe return for offline and online modes is consistent and actual;
  - Prevent crashes when complicated regexes are executed in textfilecontent58 probe;
  - Fixed #1512: Severity refinement lost in generated guide;
  - Fixed #1453: Pointer lost in Swig API;
  - Evaluation Characteristics of the XCCDF report are now consistent with OVAL entities;
    from system_info probe;
  - Fixed filepath pattern matching in offline mode in textfilecontent58 probe;
  - Fixed infinite recursion in systemdunitdependency probe;
  - Fixed the case when CMake couldn't find libacl or xattr.h.
- dropped 0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch: upstream

OBS-URL: https://build.opensuse.org/request/show/799976
OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=248
2020-05-04 18:33:17 +00:00

27 lines
1.3 KiB
Diff

Index: openscap-1.3.2/src/OVAL/probes/probe/entcmp.h
===================================================================
--- openscap-1.3.2.orig/src/OVAL/probes/probe/entcmp.h
+++ openscap-1.3.2/src/OVAL/probes/probe/entcmp.h
@@ -49,7 +49,7 @@ oval_result_t probe_ent_result_bychk(SEX
* @param res_lst the results vector
* @param check the operator enumeration value
*/
-oval_result_t probe_ent_result_byopr(SEXP_t * res_lst, oval_operator_t operator);
+oval_result_t probe_ent_result_byopr(SEXP_t * res_lst, oval_operator_t xop);
/**
* Compare object entity's content with a value.
Index: openscap-1.3.2/src/OVAL/public/oval_definitions.h
===================================================================
--- openscap-1.3.2.orig/src/OVAL/public/oval_definitions.h
+++ openscap-1.3.2/src/OVAL/public/oval_definitions.h
@@ -1669,7 +1669,7 @@ OSCAP_API void oval_variable_possible_va
* @param hint A short description of what the value means or represents.
* @memberof oval_variable_possible_restriction
*/
-OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint);
+OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t xop, const char *hint);
/**