From 57e2d03c9fd6103d4e06abc73047e976c3c8df695a4bf4a05c6707501f33d8cd Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 12 Jan 2020 12:37:02 +0000
Subject: [PATCH] Accepting request 763602 from home:msmeissn:branches:security

- temporary openscap 1.3.1 git snapshot
  - make it build with new RPM  (bsc#1160720)

OBS-URL: https://build.opensuse.org/request/show/763602
OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=239
---
 1.3.1.tar.gz                    |  3 ---
 openscap-1.3.1.20200112.tar.bz2 |  3 +++
 openscap-new-rpm.patch          | 32 --------------------------------
 openscap.changes                |  4 ++--
 openscap.spec                   |  9 +++++----
 5 files changed, 10 insertions(+), 41 deletions(-)
 delete mode 100644 1.3.1.tar.gz
 create mode 100644 openscap-1.3.1.20200112.tar.bz2
 delete mode 100644 openscap-new-rpm.patch

diff --git a/1.3.1.tar.gz b/1.3.1.tar.gz
deleted file mode 100644
index 54f265a..0000000
--- a/1.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c5caa1bc8f10c470cf03bf6818986185f51513b9775f6363260cb6e79038c2f
-size 12333871
diff --git a/openscap-1.3.1.20200112.tar.bz2 b/openscap-1.3.1.20200112.tar.bz2
new file mode 100644
index 0000000..634922e
--- /dev/null
+++ b/openscap-1.3.1.20200112.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbd51cdd2580a67188a4544650ad72968cd12992c2aa9a8b1cb32cb35fcc04b1
+size 34823568
diff --git a/openscap-new-rpm.patch b/openscap-new-rpm.patch
deleted file mode 100644
index e328663..0000000
--- a/openscap-new-rpm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-+	{ "nolinkto",      (uint64_t)RPMVERIFY_LINKTO    },
-+	{ "nomd5",	 (uint64_t)RPMVERIFY_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      },
-+	{ "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.changes b/openscap.changes
index e78db51..64d096d 100644
--- a/openscap.changes
+++ b/openscap.changes
@@ -1,8 +1,8 @@
 -------------------------------------------------------------------
 Sat Jan 11 17:24:21 UTC 2020 - Marcus Meissner <meissner@suse.com>
 
-- openscap-new-rpm.patch: use the recent RPM defines, some old
-  ones got obsoleted
+- temporary openscap 1.3.1 git snapshot
+  - make it build with new RPM  (bsc#1160720)
 
 -------------------------------------------------------------------
 Sat Jan 11 09:01:49 UTC 2020 - Marcus Meissner <meissner@suse.com>
diff --git a/openscap.spec b/openscap.spec
index b26b84d..ccfd5f1 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -25,9 +25,11 @@
 %define with_bindings 0
 
 Name:           openscap
-Version:        1.3.1
+Version:        1.3.1.20200112
 Release:        1.0
-Source:         https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz
+#Source:         https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz
+# temp snapshot to make it build with new RPM before 1.3.2
+Source:         openscap-%version.tar.bz2
 Source1:        openscap-rpmlintrc
 Source2:        sysconfig.oscap-scan
 # SUSE specific profile, based on yast2-security checks.
@@ -37,7 +39,6 @@ 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
@@ -171,7 +172,6 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %if 0%{?with_bindings}
@@ -292,6 +292,7 @@ ln -s  %{_datadir}/openscap/scap-yast2sec-xccdf.xml %{buildroot}/%{_datadir}/ope
 %{_bindir}/oscap-chroot
 %{_bindir}/scap-as-rpm
 %{_bindir}/oscap-podman
+%{_bindir}/oscap-run-sce-script
 %{_sbindir}/rcoscap-scan
 %{_datadir}/bash-completion/completions/*