diff --git a/0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch b/0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch new file mode 100644 index 0000000..c278de5 --- /dev/null +++ b/0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch @@ -0,0 +1,41 @@ +From 0ba7c9423f64a88ceef50318f1a382059484f737 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= +Date: Wed, 15 Jan 2020 13:54:45 +0100 +Subject: [PATCH] Do not use C++ keyword operator as a function parameter name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes SCAP Workbench build. + +Addressing: +[ 37%] Building CXX object CMakeFiles/scap-workbench.dir/scap-workbench_autogen/mocs_compilation.cpp.o +In file included from /usr/local/include/openscap/xccdf_policy.h:39, + from /home/jcerny/work/git/scap-workbench/include/TailoringDockWidgets.h:31, + from /home/jcerny/work/git/scap-workbench/build/scap-workbench_autogen/6YEA5652QU/moc_TailoringDockWidgets.cpp:10, + from /home/jcerny/work/git/scap-workbench/build/scap-workbench_autogen/mocs_compilation.cpp:18: +/usr/local/include/openscap/oval_definitions.h:1676:117: error: declaration of ‘operator,’ as parameter + 1676 | restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint); + | ^ + +Fixes: #1462 +--- + src/OVAL/public/oval_definitions.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/OVAL/public/oval_definitions.h b/src/OVAL/public/oval_definitions.h +index ea9d3aaf8..b5fe77154 100644 +--- a/src/OVAL/public/oval_definitions.h ++++ b/src/OVAL/public/oval_definitions.h +@@ -1669,7 +1669,7 @@ OSCAP_API void oval_variable_possible_value_iterator_free(struct oval_variable_p + * @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, const char *); + + + /** +-- +2.25.1 + diff --git a/openscap.changes b/openscap.changes index 4f7b1b3..dbe90b2 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 25 13:53:51 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch to fix the scap-workbench build: + * 0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch + ------------------------------------------------------------------- Tue Jan 14 13:43:11 UTC 2020 - Marcus Meissner diff --git a/openscap.spec b/openscap.spec index adc2bc0..3fec8c7 100644 --- a/openscap.spec +++ b/openscap.spec @@ -39,7 +39,9 @@ Source4: scap-yast2sec-oval.xml Source5: oscap-scan.service Source6: oscap-scan.sh Patch0: openscap-new-suse.patch -Url: http://www.open-scap.org/ +# PATCH-FIX-UPSTREAM +Patch1: 0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch +Url: https://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: asciidoc BuildRequires: doxygen @@ -172,6 +174,7 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %if 0%{?with_bindings}