packages/openscap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 Fix scap-workbench compilation failure due to operator declared as a parameter in oval_definitions.h

Browse Source 
Merge pull request !3 from small_leek/xsl
This commit is contained in:
openeuler-ci-bot 2020-03-11 19:05:54 +08:00 committed by Gitee
commit 394bfe2cc6
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Fix-scap_workbench-builderror.patch Normal file
View File

@ -0,0 +1,29 @@
diff -Nur openscap-1.3.2_old/src/OVAL/oval_variable.c openscap-1.3.2/src/OVAL/oval_variable.c
--- openscap-1.3.2_old/src/OVAL/oval_variable.c 2020-03-11 04:30:50.534661136 -0400
+++ openscap-1.3.2/src/OVAL/oval_variable.c 2020-03-11 04:32:05.787195584 -0400
@@ -156,11 +156,11 @@
return oval_collection_iterator_remaining((struct oval_iterator*)iter);
}
-struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint)
+struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t opera, const char *hint)
{
struct oval_variable_possible_restriction *pr;
pr = malloc(sizeof(oval_variable_possible_restriction_t));
- pr->operator = operator;
+ pr->operator = opera;
pr->hint = oscap_strdup(hint);
pr->restrictions = oval_collection_new();
return pr;
diff -Nur openscap-1.3.2_old/src/OVAL/public/oval_definitions.h openscap-1.3.2/src/OVAL/public/oval_definitions.h
--- openscap-1.3.2_old/src/OVAL/public/oval_definitions.h 2020-03-11 04:30:50.546661222 -0400
+++ openscap-1.3.2/src/OVAL/public/oval_definitions.h 2020-03-11 04:31:30.354943942 -0400
@@ -1669,7 +1669,7 @@
* @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 opera, const char *hint);
/**

7
openscap.spec
View File

@ -1,11 +1,11 @@
Name: openscap
Version: 1.3.2
Release: 4
Release: 5
Summary: An open source framework in order to provide a interface for using scap
License: LGPLv2+
URL: http://www.open-scap.org
Source0: https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz
Patch9000: Fix-scap_workbench-builderror.patch
BuildRequires: cmake >= 2.6 gcc gcc-c++ swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser
BuildRequires: rpm-devel libgcrypt-devel pcre-devel libacl-devel libselinux-devel libcap-devel libblkid-devel
BuildRequires: bzip2-devel asciidoc openldap-devel GConf2-devel dbus-devel chrpath libcurl-devel >= 7.12.0
@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/*
%changelog
* Wed Mar 11 2020 Senlin Xia <xiasenlin1@huawei.com> 1.3.2-5
- Fix scap-workbench compilation failure: declaration of 'operator' as parameter in oval_definitions.h
* Sat Feb 29 2020 lihao <lihao129@huawei.com> - 1.3.2-4
- Fix incompatible with rpm-devel-4.15