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

!15 Update to version 1.3.7

Browse Source 
From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-02-03 10:10:13 +00:00 committed by Gitee
commit 1224bb5dd7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-Fix-compile-error-with-future-versions-of-gcc.patch Normal file
View File

@ -0,0 +1,31 @@
# include <rpm/rpmcrypto.h> in rpm-helper.h
# Reported upstream in https://github.com/OpenSCAP/openscap/pull/1922
From 989901ef95e344b49e78238c89c59bd80951b876 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 1 Feb 2023 06:38:40 +0000
Subject: [PATCH] Fix compile error with future versions of gcc
/builddir/build/BUILD/openscap-1.3.6/src/OVAL/probes/unix/linux/rpminfo_probe.c: In function 'rpminfo_probe_fini':
/builddir/build/BUILD/openscap-1.3.6/src/OVAL/probes/unix/linux/rpminfo_probe.c:307:9: error: implicit declaration of function 'rpmFreeCrypto'
307 | rpmFreeCrypto();
| ^~~~~~~~~~~~~
---
src/OVAL/probes/unix/linux/rpm-helper.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/OVAL/probes/unix/linux/rpm-helper.h b/src/OVAL/probes/unix/linux/rpm-helper.h
index eca9cde04..6f7cb71d7 100644
--- a/src/OVAL/probes/unix/linux/rpm-helper.h
+++ b/src/OVAL/probes/unix/linux/rpm-helper.h
@@ -30,6 +30,7 @@
#include <rpm/rpmts.h>
#include <rpm/rpmmacro.h>
#include <rpm/rpmlog.h>
+#include <rpm/rpmcrypto.h>
#include <rpm/header.h>
#include <pthread.h>
--
2.35.3

BIN
1.3.6.tar.gz → 1.3.7.tar.gz
View File

Binary file not shown.

8
openscap.spec
View File

@ -1,10 +1,13 @@
Name: openscap
Version: 1.3.6
Version: 1.3.7
Release: 1
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
# include <rpm/rpmcrypto.h> in rpm-helper.h
# Reported upstream in https://github.com/OpenSCAP/openscap/pull/1922
Patch0: https://github.com/OpenSCAP/openscap/pull/1922.patch#/0001-Fix-compile-error-with-future-versions-of-gcc.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
@ -142,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/*
%changelog
* 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