From 5bfd6486684ab1468b4006105605c724260f2d213d19798b3c260bbfdd3cb077 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sat, 11 Jan 2020 09:27:40 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/security/openscap?expand=0&rev=236

---
 openscap-new-rpm.patch | 33 +++++++++++++++++++++++++++++++++
 openscap.spec          |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 openscap-new-rpm.patch

diff --git a/openscap-new-rpm.patch b/openscap-new-rpm.patch
new file mode 100644
index 0000000..de89b86
--- /dev/null
+++ b/openscap-new-rpm.patch
@@ -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)
diff --git a/openscap.spec b/openscap.spec
index d3959ee..b26b84d 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -37,6 +37,7 @@ Source4:        scap-yast2sec-oval.xml
 Source5:        oscap-scan.service
 Source6:        oscap-scan.sh
 Patch0:         openscap-new-suse.patch
+Patch1:         openscap-new-rpm.patch
 Url:            http://www.open-scap.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  asciidoc
@@ -170,6 +171,7 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if 0%{?with_bindings}