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

Compare commits

base: packages:0ba544aabb6d67ffbebd0e6cb93a73859e1a3745
Branches Tags
packages:main
...
compare: packages:4fa4ed00be8b5cdbdc55ba24e9d413756ea36125
Branches Tags
packages:main

10 Commits
0ba544aabb ... 4fa4ed00be

Author SHA1 Message Date
openeuler-ci-bot
4fa4ed00be
!16 Remove rpath 
From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
 2023-11-08 07:20:04 +00:00
lyn1001
3374df489d Remove rpath 2023-11-08 14:02:48 +08:00
openeuler-ci-bot
cbb3b13eb3 !8 Add Requires openscap-help into openscap 
From: @caodongxia
Reviewed-by: @small_leek
Signed-off-by: @small_leek
 2020-11-10 17:12:05 +08:00
caodongxia
6399c9b823 add help package to main package 2020-11-10 11:00:26 +08:00
openeuler-ci-bot
088d71990e !7 rebuild for requirement package update 
Merge pull request !7 from Liquor/openEuler-20.03-LTS
 2020-08-18 21:29:23 +08:00
liquor
76b791b212 rebuild for requirement package update 2020-08-18 20:58:24 +08:00
openeuler-ci-bot
8b80a2956b !5 rebuild for openscap 
Merge pull request !5 from wangchen/openscap-LTS
 2020-05-20 10:25:00 +08:00
wangchen2020
7191b17221 rebuild for openscap 2020-05-18 19:51:58 +08:00
openeuler-ci-bot
394bfe2cc6 !3 Fix scap-workbench compilation failure due to operator declared as a parameter in oval_definitions.h 
Merge pull request !3 from small_leek/xsl
 2020-03-11 19:05:54 +08:00
small_leek
291e8446ac fix scap-workbench compilation failure due to operator declared as a parameter in oval_definitions.h 2020-03-11 06:52:39 -04:00
2 changed files with 54 additions and 3 deletions
Show Stats 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);
/**

28
openscap.spec
View File

@ -1,11 +1,11 @@
Name: openscap
Version: 1.3.2
Release: 4
Release: 9
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
@ -15,7 +15,7 @@ BuildRequires: perl-XML-XPath bzip2
%endif
Requires: libcurl >= 7.12.0 rpmdevtools rpm-build
Requires: %{name}-help = %{version}-%{release}
Provides: %{name}-scanner = %{version}-%{release} %{name}-utils = %{version}-%{release}
Provides: %{name}-engine-sce = %{version}-%{release} %{name}-containers = %{version}-%{release}
@ -84,6 +84,13 @@ cd build
%delete_la
cd $RPM_BUILD_ROOT/usr
file `find -type f`| grep -w ELF | awk -F":" '{print $1}' | for i in `xargs`
do
chrpath -d $i
done
cd -
pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
%clean
@ -128,6 +135,21 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/*
%changelog
* Wed Nov 8 2023 liyanan <liyanan61@h-partners.com> - 1.3.2-9
- Remove rpath
* Fri Nov 06 2020 caodongxia <caodongxia@huawei.com> - 1.3.2-8
- Add install requires help package into main package
* Tue Aug 18 2020 liquor <lirui130@huawei.com> - 1.3.2-7
- rebuild for requirement package update
* Mon May 18 2020 wangchen <wangchen137@huawei.com> 1.3.2-6
- rebuild for openscap
* 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