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

Compare commits

base: packages:cbe1ce08a19acf3ae7ee96248a4be91f37e7c62c
Branches Tags
packages:main
...
compare: packages:b1af43cc7fcdbe06eb07ee6ecdd7374d29b9ecfa
Branches Tags
packages:main

10 Commits
cbe1ce08a1 ... b1af43cc7f

Author SHA1 Message Date
openeuler-ci-bot
b1af43cc7f
!19 fix implicit declarations due to missing include 
From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
 2024-03-04 06:46:21 +00:00
lyn1001
4313de06c4 fix implicit declarations due to missing include 2024-03-04 11:24:05 +08:00
openeuler-ci-bot
d1702f0a13
!18 Port pcre dependency to pcre2 
From: @starlet-dx 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
 2024-01-30 01:37:23 +00:00
starlet-dx
532e135a4e Port pcre dependency to pcre2 2024-01-29 15:53:08 +08:00
openeuler-ci-bot
76fd30b256
!17 Update to version 1.3.9 
From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
 2024-01-10 08:05:00 +00:00
lyn1001
58c0e6c9bb Update to 1.3.9 2024-01-10 10:33:22 +08:00
openeuler-ci-bot
1224bb5dd7
!15 Update to version 1.3.7 
From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
 2023-02-03 10:10:13 +00:00
wk333
f41c4e23c6 Update to version 1.3.7 2023-02-03 17:45:04 +08:00
openeuler-ci-bot
47a5023b17
!13 openscap升级至1.3.6版本 
From: @wu-leilei 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
 2022-05-19 07:04:17 +00:00
wu-leilei
47e4ae76c2 update package 2022-05-17 17:26:37 +08:00
3 changed files with 55 additions and 5 deletions
Show Stats Expand all files Collapse all files

BIN
1.3.3.tar.gz → 1.3.9.tar.gz
View File

Binary file not shown.

33
openscap-1.3.9-includes.patch Normal file
View File

@ -0,0 +1,33 @@
diff -ru openscap-1.3.9/src/common/xml_iterate.c openscap-1.3.9.new/src/common/xml_iterate.c
--- openscap-1.3.9/src/common/xml_iterate.c 2023-09-06 16:04:46.000000000 +0200
+++ openscap-1.3.9.new/src/common/xml_iterate.c 2023-11-27 03:13:21.931933518 +0100
@@ -22,6 +22,7 @@
#endif
#include <string.h>
+#include <libxml/parser.h>
#include "debug_priv.h"
#include "xml_iterate.h"
#include "oscap_helpers.h"
diff -ru openscap-1.3.9/src/OVAL/results/oval_cmp_evr_string.c openscap-1.3.9.new/src/OVAL/results/oval_cmp_evr_string.c
--- openscap-1.3.9/src/OVAL/results/oval_cmp_evr_string.c 2023-09-06 16:04:46.000000000 +0200
+++ openscap-1.3.9.new/src/OVAL/results/oval_cmp_evr_string.c 2023-11-27 03:18:23.003882498 +0100
@@ -30,6 +30,7 @@
#include <math.h>
#include <string.h>
#include <ctype.h>
+#include <limits.h>
#include "oval_cmp_evr_string_impl.h"
#include "oval_definitions.h"
#include "oval_types.h"
diff -ru openscap-1.3.9/src/source/bz2.c openscap-1.3.9.new/src/source/bz2.c
--- openscap-1.3.9/src/source/bz2.c 2023-09-06 16:04:46.000000000 +0200
+++ openscap-1.3.9.new/src/source/bz2.c 2023-11-27 03:32:20.069323771 +0100
@@ -26,6 +26,7 @@
#endif
#include <libxml/tree.h>
+#include <libxml/parser.h>
#include <stdlib.h>
#include <string.h>
#ifdef OS_WINDOWS

27
openscap.spec
View File

@ -1,19 +1,21 @@
Name: openscap
Version: 1.3.3
Release: 2
Version: 1.3.9
Release: 3
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
Patch0: openscap-1.3.9-includes.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: rpm-devel libgcrypt-devel pcre2-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
BuildRequires: make glib2-devel libyaml-devel xmlsec1-devel xmlsec1-openssl-devel
%if %{?_with_check:1}%{!?_with_check:0}
BuildRequires: perl-XML-XPath bzip2
%endif
Requires: libcurl >= 7.12.0 rpmdevtools rpm-build
Requires: libcurl >= 7.12.0 rpmdevtools rpm-build python3-docker
Provides: %{name}-scanner = %{version}-%{release} %{name}-utils = %{version}-%{release}
Provides: %{name}-engine-sce = %{version}-%{release} %{name}-containers = %{version}-%{release}
@ -68,7 +70,7 @@ mkdir -p build
%build
cd build
%cmake -DENABLE_DOCS=ON ..
%cmake -DWITH_PCRE2=ON -DENABLE_DOCS=ON ..
%make_build
make docs
@ -139,6 +141,21 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/*
%changelog
* Mon Mar 4 2024 liyanan <liyanan61@h-partners.com> - 1.3.9-3
- fix implicit declarations due to missing include
* Mon Jan 29 2024 yaoxin <yao_xin001@hoperun.com> - 1.3.9-2
- Port pcre dependency to pcre2
* Wed Jan 10 2024 liyanan <liyanan61@h-partners.com> - 1.3.9-1
- Update to version 1.3.9
* Fri Feb 03 2023 wangkai <wangkai385@h-partners.com> - 1.3.7-1
- Update to version 1.3.7
* Tue May 17 2022 wulei <wulei80@h-partners.com> - 1.3.6-1
- Update package
* Mon Sep 13 2021 chenchen <chen_aka_jan@163.com> - 1.3.3-2
- del rpath for some binaries and bin