diff --git a/0001-Fix-compile-error-with-future-versions-of-gcc.patch b/0001-Fix-compile-error-with-future-versions-of-gcc.patch new file mode 100644 index 0000000..5ba94c5 --- /dev/null +++ b/0001-Fix-compile-error-with-future-versions-of-gcc.patch @@ -0,0 +1,31 @@ +# include 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 +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 + #include + #include ++#include + #include + + #include +-- +2.35.3 + diff --git a/1.3.6.tar.gz b/1.3.7.tar.gz similarity index 62% rename from 1.3.6.tar.gz rename to 1.3.7.tar.gz index b4a4bec..abe901b 100644 Binary files a/1.3.6.tar.gz and b/1.3.7.tar.gz differ diff --git a/openscap.spec b/openscap.spec index fec7fac..8a62389 100644 --- a/openscap.spec +++ b/openscap.spec @@ -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 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 - 1.3.7-1 +- Update to version 1.3.7 + * Tue May 17 2022 wulei - 1.3.6-1 - Update package