openscap-1.3.8
This commit is contained in:
parent
b57b42463d
commit
676375616c
@ -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
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: openscap
|
Name: openscap
|
||||||
Version: 1.3.7
|
Version: 1.3.8
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
@ -8,10 +8,6 @@ URL: http://www.open-scap.org/
|
|||||||
VCS: https://github.com/OpenSCAP/openscap
|
VCS: https://github.com/OpenSCAP/openscap
|
||||||
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{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: make
|
BuildRequires: make
|
||||||
BuildRequires: cmake >= 2.6
|
BuildRequires: cmake >= 2.6
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -31,7 +27,6 @@ BuildRequires: glib2-devel
|
|||||||
BuildRequires: dbus-devel
|
BuildRequires: dbus-devel
|
||||||
BuildRequires: libyaml-devel
|
BuildRequires: libyaml-devel
|
||||||
BuildRequires: xmlsec1-devel xmlsec1-openssl-devel
|
BuildRequires: xmlsec1-devel xmlsec1-openssl-devel
|
||||||
BuildRequires: systemd
|
|
||||||
%if %{?_with_check:1}%{!?_with_check:0}
|
%if %{?_with_check:1}%{!?_with_check:0}
|
||||||
BuildRequires: perl-XML-XPath
|
BuildRequires: perl-XML-XPath
|
||||||
BuildRequires: bzip2
|
BuildRequires: bzip2
|
||||||
@ -156,12 +151,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
|||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
# enable oscap-remediate.service here for now
|
|
||||||
# https://github.com/hughsie/PackageKit/issues/401
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1833176
|
|
||||||
mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants/
|
|
||||||
ln -sf ../oscap-remediate.service %{buildroot}%{_unitdir}/system-update.target.wants/oscap-remediate.service
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc AUTHORS NEWS README.md
|
%doc AUTHORS NEWS README.md
|
||||||
%license COPYING
|
%license COPYING
|
||||||
@ -194,9 +183,6 @@ ln -sf ../oscap-remediate.service %{buildroot}%{_unitdir}/system-update.target.w
|
|||||||
%{_bindir}/oscap
|
%{_bindir}/oscap
|
||||||
%{_bindir}/oscap-chroot
|
%{_bindir}/oscap-chroot
|
||||||
%{_sysconfdir}/bash_completion.d
|
%{_sysconfdir}/bash_completion.d
|
||||||
%{_libexecdir}/oscap-remediate
|
|
||||||
%{_unitdir}/oscap-remediate.service
|
|
||||||
%{_unitdir}/system-update.target.wants/
|
|
||||||
|
|
||||||
%files utils
|
%files utils
|
||||||
%doc docs/oscap-scan.cron
|
%doc docs/oscap-scan.cron
|
||||||
@ -219,6 +205,9 @@ ln -sf ../oscap-remediate.service %{buildroot}%{_unitdir}/system-update.target.w
|
|||||||
%{_mandir}/man8/oscap-podman.8*
|
%{_mandir}/man8/oscap-podman.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 20 2023 Evgeny Kolesnikov <ekolesni@redhat.com> - 1:1.3.8-1
|
||||||
|
- Upgrade to the latest upstream release
|
||||||
|
|
||||||
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1:1.3.7-4
|
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1:1.3.7-4
|
||||||
- Rebuilt for Python 3.12
|
- Rebuilt for Python 3.12
|
||||||
|
|
||||||
|
1
sources
1
sources
@ -1 +1,2 @@
|
|||||||
SHA512 (openscap-1.3.7.tar.gz) = 64dcceadbbb5b6045d2ebaca89287c80c26e05d7247fc0dd31cd9bff98398c7a26d6ed0e9191dcd2fd01f0711181f15d34fe9784bd043ccd0854baa17397cd88
|
SHA512 (openscap-1.3.7.tar.gz) = 64dcceadbbb5b6045d2ebaca89287c80c26e05d7247fc0dd31cd9bff98398c7a26d6ed0e9191dcd2fd01f0711181f15d34fe9784bd043ccd0854baa17397cd88
|
||||||
|
SHA512 (openscap-1.3.8.tar.gz) = 4a05f6467ea88f92cc74d7470ed97de10be4ae3de9b16ab065adcedc403adfae667b1b787b65ba6d9c85d38bf7ef47dbd10c90b2dd2b2a48056655a451103ae9
|
||||||
|
Loading…
Reference in New Issue
Block a user