Update to 1.3.9
This commit is contained in:
parent
1224bb5dd7
commit
58c0e6c9bb
@ -1,31 +0,0 @@
|
|||||||
# 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
|
|
||||||
|
|
||||||
Binary file not shown.
@ -1,13 +1,10 @@
|
|||||||
Name: openscap
|
Name: openscap
|
||||||
Version: 1.3.7
|
Version: 1.3.9
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: An open source framework in order to provide a interface for using scap
|
Summary: An open source framework in order to provide a interface for using scap
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.open-scap.org
|
URL: http://www.open-scap.org
|
||||||
Source0: https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz
|
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: 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 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
|
BuildRequires: bzip2-devel asciidoc openldap-devel GConf2-devel dbus-devel chrpath libcurl-devel >= 7.12.0
|
||||||
@ -17,7 +14,7 @@ BuildRequires: make glib2-devel libyaml-devel xmlsec1-devel xmlsec1-
|
|||||||
BuildRequires: perl-XML-XPath bzip2
|
BuildRequires: perl-XML-XPath bzip2
|
||||||
%endif
|
%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}-scanner = %{version}-%{release} %{name}-utils = %{version}-%{release}
|
||||||
Provides: %{name}-engine-sce = %{version}-%{release} %{name}-containers = %{version}-%{release}
|
Provides: %{name}-engine-sce = %{version}-%{release} %{name}-containers = %{version}-%{release}
|
||||||
@ -119,8 +116,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/openscap/cpe/*
|
%{_datadir}/openscap/cpe/*
|
||||||
|
|
||||||
%{_sysconfdir}/bash_completion.d
|
%{_sysconfdir}/bash_completion.d
|
||||||
%{_libexecdir}/oscap-remediate
|
|
||||||
%{_unitdir}/oscap-remediate.service
|
|
||||||
%config(noreplace) /etc/ld.so.conf.d/*
|
%config(noreplace) /etc/ld.so.conf.d/*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
@ -145,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Fri Feb 03 2023 wangkai <wangkai385@h-partners.com> - 1.3.7-1
|
||||||
- Update to version 1.3.7
|
- Update to version 1.3.7
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user