diff --git a/0001-Fix-compile-error-with-future-versions-of-gcc.patch b/0001-Fix-compile-error-with-future-versions-of-gcc.patch deleted file mode 100644 index 5ba94c55a9a396253bc3f63c798c09c26e1737eb..0000000000000000000000000000000000000000 --- a/0001-Fix-compile-error-with-future-versions-of-gcc.patch +++ /dev/null @@ -1,31 +0,0 @@ -# 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.7.tar.gz b/1.3.9.tar.gz similarity index 62% rename from 1.3.7.tar.gz rename to 1.3.9.tar.gz index abe901b6a241aa69967944e25cdc08040a400523..782f3eff0664b00b825a288742d0af2b93337d0c 100644 Binary files a/1.3.7.tar.gz and b/1.3.9.tar.gz differ diff --git a/openscap.spec b/openscap.spec index 8a623898de3d4af0445f17c492584b349701035d..f2fdbfe56b6464ecf7e80d53f2c58c95d0e4c071 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,13 +1,10 @@ Name: openscap -Version: 1.3.7 +Version: 1.3.9 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 @@ -17,7 +14,7 @@ BuildRequires: make glib2-devel libyaml-devel xmlsec1-devel xmlsec1- 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} @@ -119,8 +116,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/openscap/cpe/* %{_sysconfdir}/bash_completion.d -%{_libexecdir}/oscap-remediate -%{_unitdir}/oscap-remediate.service %config(noreplace) /etc/ld.so.conf.d/* %files devel @@ -145,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/* %changelog +* Wed Jan 10 2024 liyanan - 1.3.9-1 +- Update to version 1.3.9 + * Fri Feb 03 2023 wangkai - 1.3.7-1 - Update to version 1.3.7