rpm/openscap
SHA256
1
0
Fork 0
forked from pool/openscap
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=236

Browse Source
This commit is contained in:
Marcus Meissner 2020-01-11 09:27:40 +00:00 committed by Git OBS Bridge
parent dfe7310c7f
commit 5bfd648668
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openscap-new-rpm.patch Normal file
View File

@ -0,0 +1,33 @@
Index: openscap-1.3.1/src/OVAL/probes/unix/linux/rpmverifyfile_probe.c
===================================================================
--- openscap-1.3.1.orig/src/OVAL/probes/unix/linux/rpmverifyfile_probe.c
+++ openscap-1.3.1/src/OVAL/probes/unix/linux/rpmverifyfile_probe.c
@@ -418,18 +418,18 @@ typedef struct {
} rpmverifyfile_bhmap_t;
const rpmverifyfile_bhmap_t rpmverifyfile_bhmap[] = {
- { "nolinkto", (uint64_t)VERIFY_LINKTO },
- { "nomd5", (uint64_t)VERIFY_MD5 }, // deprecated since OVAL 5.11.1
- { "nosize", (uint64_t)VERIFY_SIZE },
- { "nouser", (uint64_t)VERIFY_USER },
- { "nogroup", (uint64_t)VERIFY_GROUP },
- { "nomtime", (uint64_t)VERIFY_MTIME },
- { "nomode", (uint64_t)VERIFY_MODE },
- { "nordev", (uint64_t)VERIFY_RDEV },
+ { "nolinkto", (uint64_t)RPMVERIFY_LINKTO },
+ { "nomd5", (uint64_t)RPMVERIFY_MD5 }, // deprecated since OVAL 5.11.1
+ { "nosize", (uint64_t)RPMVERIFY_SIZE },
+ { "nouser", (uint64_t)RPMVERIFY_USER },
+ { "nogroup", (uint64_t)RPMVERIFY_GROUP },
+ { "nomtime", (uint64_t)RPMVERIFY_MTIME },
+ { "nomode", (uint64_t)RPMVERIFY_MODE },
+ { "nordev", (uint64_t)RPMVERIFY_RDEV },
{ "noconfigfiles", RPMVERIFY_SKIP_CONFIG },
{ "noghostfiles", RPMVERIFY_SKIP_GHOST },
- { "nofiledigest", (uint64_t)VERIFY_FILEDIGEST },
- { "nocaps", (uint64_t)VERIFY_CAPS }
+ { "nofiledigest", (uint64_t)RPMVERIFY_FILEDIGEST },
+ { "nocaps", (uint64_t)RPMVERIFY_CAPS }
};
int rpmverifyfile_probe_main(probe_ctx *ctx, void *arg)

2
openscap.spec
View File

@ -37,6 +37,7 @@ Source4: scap-yast2sec-oval.xml
Source5: oscap-scan.service Source5: oscap-scan.service
Source6: oscap-scan.sh Source6: oscap-scan.sh
Patch0: openscap-new-suse.patch Patch0: openscap-new-suse.patch
Patch1: openscap-new-rpm.patch
Url: http://www.open-scap.org/ Url: http://www.open-scap.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asciidoc BuildRequires: asciidoc
@ -170,6 +171,7 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%if 0%{?with_bindings} %if 0%{?with_bindings}