openscap-1.3.3
This commit is contained in:
Jan Černý
parent
16d73258b4
commit
d0887b1c4c
1
.gitignore
vendored
1
.gitignore
vendored
@ -65,3 +65,4 @@ openscap-0.6.0.tar.gz
|
||||
/openscap-1.3.0.tar.gz
|
||||
/openscap-1.3.1.tar.gz
|
||||
/openscap-1.3.2.tar.gz
|
||||
/openscap-1.3.3.tar.gz
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 0ba7c9423f64a88ceef50318f1a382059484f737 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
|
||||
Date: Wed, 15 Jan 2020 13:54:45 +0100
|
||||
Subject: [PATCH] Do not use C++ keyword operator as a function parameter name
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This fixes SCAP Workbench build.
|
||||
|
||||
Addressing:
|
||||
[ 37%] Building CXX object CMakeFiles/scap-workbench.dir/scap-workbench_autogen/mocs_compilation.cpp.o
|
||||
In file included from /usr/local/include/openscap/xccdf_policy.h:39,
|
||||
from /home/jcerny/work/git/scap-workbench/include/TailoringDockWidgets.h:31,
|
||||
from /home/jcerny/work/git/scap-workbench/build/scap-workbench_autogen/6YEA5652QU/moc_TailoringDockWidgets.cpp:10,
|
||||
from /home/jcerny/work/git/scap-workbench/build/scap-workbench_autogen/mocs_compilation.cpp:18:
|
||||
/usr/local/include/openscap/oval_definitions.h:1676:117: error: declaration of ‘operator,’ as parameter
|
||||
1676 | restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint);
|
||||
| ^
|
||||
|
||||
Fixes: #1462
|
||||
---
|
||||
src/OVAL/public/oval_definitions.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/OVAL/public/oval_definitions.h b/src/OVAL/public/oval_definitions.h
|
||||
index ea9d3aaf8..b5fe77154 100644
|
||||
--- a/src/OVAL/public/oval_definitions.h
|
||||
+++ b/src/OVAL/public/oval_definitions.h
|
||||
@@ -1669,7 +1669,7 @@ OSCAP_API void oval_variable_possible_value_iterator_free(struct oval_variable_p
|
||||
* @param hint A short description of what the value means or represents.
|
||||
* @memberof oval_variable_possible_restriction
|
||||
*/
|
||||
-OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint);
|
||||
+OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t, const char *);
|
||||
|
||||
|
||||
/**
|
||||
@ -1,62 +0,0 @@
|
||||
From e9ae8e3fac97694aa9cbb1350b90f110e461e02d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
|
||||
Date: Wed, 22 Jan 2020 12:59:47 +0100
|
||||
Subject: [PATCH] Fix duplicate global variables
|
||||
|
||||
This should fix failed builds with GCC 10 on Rawhide.
|
||||
|
||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1793914
|
||||
---
|
||||
src/OVAL/probes/unix/process58_probe.c | 2 +-
|
||||
src/OVAL/probes/unix/process_probe.c | 4 ++--
|
||||
src/OVAL/probes/unix/shadow_probe.c | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/OVAL/probes/unix/process58_probe.c b/src/OVAL/probes/unix/process58_probe.c
|
||||
index 3b8d8d1d2..74a2feee0 100644
|
||||
--- a/src/OVAL/probes/unix/process58_probe.c
|
||||
+++ b/src/OVAL/probes/unix/process58_probe.c
|
||||
@@ -152,7 +152,7 @@ static void report_finding(struct result_info *res, probe_ctx *ctx)
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
|
||||
-unsigned long ticks, boot;
|
||||
+static unsigned long ticks, boot;
|
||||
|
||||
static void get_boot_time(void)
|
||||
{
|
||||
diff --git a/src/OVAL/probes/unix/process_probe.c b/src/OVAL/probes/unix/process_probe.c
|
||||
index ab0bdf67a..cc4e46ff1 100644
|
||||
--- a/src/OVAL/probes/unix/process_probe.c
|
||||
+++ b/src/OVAL/probes/unix/process_probe.c
|
||||
@@ -58,7 +58,7 @@
|
||||
#include "process_probe.h"
|
||||
#include "oscap_helpers.h"
|
||||
|
||||
-oval_schema_version_t over;
|
||||
+static oval_schema_version_t over;
|
||||
|
||||
/* Convenience structure for the results being reported */
|
||||
struct result_info {
|
||||
@@ -106,7 +106,7 @@ static void report_finding(struct result_info *res, probe_ctx *ctx)
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
|
||||
-unsigned long ticks, boot;
|
||||
+static unsigned long ticks, boot;
|
||||
|
||||
static void get_boot_time(void)
|
||||
{
|
||||
diff --git a/src/OVAL/probes/unix/shadow_probe.c b/src/OVAL/probes/unix/shadow_probe.c
|
||||
index b1fe15095..24e3a4651 100644
|
||||
--- a/src/OVAL/probes/unix/shadow_probe.c
|
||||
+++ b/src/OVAL/probes/unix/shadow_probe.c
|
||||
@@ -61,7 +61,7 @@
|
||||
#include <probe/option.h>
|
||||
#include "shadow_probe.h"
|
||||
|
||||
-oval_schema_version_t over;
|
||||
+static oval_schema_version_t over;
|
||||
|
||||
#ifndef HAVE_SHADOW_H
|
||||
int shadow_probe_main(probe_ctx *ctx, void *arg)
|
||||
@ -1,13 +1,11 @@
|
||||
Name: openscap
|
||||
Version: 1.3.2
|
||||
Release: 5%{?dist}
|
||||
Version: 1.3.3
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
||||
License: LGPLv2+
|
||||
URL: http://www.open-scap.org/
|
||||
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: openscap-1.3.3-cpp-operator-in-header.patch
|
||||
Patch1: openscap-1.3.3-duplicate-globals.patch
|
||||
BuildRequires: cmake >= 2.6
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
@ -199,6 +197,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
|
||||
%{_mandir}/man8/oscap-podman.8*
|
||||
|
||||
%changelog
|
||||
* Thu Apr 30 2020 Jan Černý <jcerny@redhat.com> - 1:1.3.3-1
|
||||
- Upgrade to the latest upstream release
|
||||
|
||||
* Thu Apr 09 2020 Matěj Týč <matyc@redhat.com> - 1:1.3.2-5
|
||||
- Made the spec file requirements section copy-paste of the RHEL8 section.
|
||||
- Cleaned the spec file up from ancient obsoletes.
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (openscap-1.3.2.tar.gz) = 7f41c223d9ca1228a03cc4d16c4ee57279ec55954aa0c5b9d8fc602e267ab1fbd31bbb102fd556563a37091c3307e09487f0a85992eaf01d70b5812455ab0235
|
||||
SHA512 (openscap-1.3.3.tar.gz) = e230668cdf900a2f31ccabc20787dce6c4174740aa7d2cc7b91c1c095e2a5b73d81bb614aa767d2e51383b5472def360c4204e9a6c4c85110c58b9999566613e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user