From 2167e3e34e31688a131e30df52e665213eb6663b159d989fd4c38a9ba8de1e7a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 11 Jan 2020 08:58:18 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=234 --- openscap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openscap.spec b/openscap.spec index c8b52aa..d3959ee 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,7 +1,7 @@ # # spec file for package openscap # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,7 +45,7 @@ BuildRequires: doxygen %if !0%{?is_opensuse} && 0%{?sle_version} < 130000 BuildRequires: sles-release %else -BuildRequires: dummy-release +BuildRequires: distribution-release %endif BuildRequires: libacl-devel BuildRequires: libattr-devel From dfe7310c7fd4ae74da0682d98367a711726b8edf69a228aaaa93aa4524e06c7c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 11 Jan 2020 09:02:02 +0000 Subject: [PATCH 2/7] - use distribution-release instead of dummy-release OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=235 --- openscap.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openscap.changes b/openscap.changes index 16e16db..0262ab0 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 11 09:01:49 UTC 2020 - Marcus Meissner + +- use distribution-release instead of dummy-release + ------------------------------------------------------------------- Thu Jun 13 14:22:06 UTC 2019 - Robert Frohl From 5bfd6486684ab1468b4006105605c724260f2d213d19798b3c260bbfdd3cb077 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 11 Jan 2020 09:27:40 +0000 Subject: [PATCH 3/7] 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} From af55f05af150e17375fb8b21b8c15cd37328b8daf19f6ac1f90a275340705b5a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 11 Jan 2020 09:34:55 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=237 --- openscap-new-rpm.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openscap-new-rpm.patch b/openscap-new-rpm.patch index de89b86..e328663 100644 --- a/openscap-new-rpm.patch +++ b/openscap-new-rpm.patch @@ -8,15 +8,14 @@ Index: openscap-1.3.1/src/OVAL/probes/unix/linux/rpmverifyfile_probe.c 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 }, ++ { "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 }, -+ { "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 }, From c92b50e50e3f71148749f1c6034e87b2416549e9a5616ef6af0862fb069ec681 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 11 Jan 2020 17:24:43 +0000 Subject: [PATCH 5/7] - openscap-new-rpm.patch: use the recent RPM defines, some old ones got obsoleted OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=238 --- openscap.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openscap.changes b/openscap.changes index 0262ab0..e78db51 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 11 17:24:21 UTC 2020 - Marcus Meissner + +- openscap-new-rpm.patch: use the recent RPM defines, some old + ones got obsoleted + ------------------------------------------------------------------- Sat Jan 11 09:01:49 UTC 2020 - Marcus Meissner From 57e2d03c9fd6103d4e06abc73047e976c3c8df695a4bf4a05c6707501f33d8cd Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 12 Jan 2020 12:37:02 +0000 Subject: [PATCH 6/7] 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 -- 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 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/* From 31b86a44ed157fc90130f544c6b0cfa5c243f8b4abd7551d6259eb66301a3f60 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 12 Jan 2020 18:07:15 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=240 --- _service | 13 +++++++++++++ openscap-1.3.1+git.20200110.tar.bz2 | 3 +++ openscap-1.3.1.20200112.tar.bz2 | 3 --- openscap.spec | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 _service create mode 100644 openscap-1.3.1+git.20200110.tar.bz2 delete mode 100644 openscap-1.3.1.20200112.tar.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..b20374a --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + https://github.com/openscap/openscap.git + git + maint-1.3 + @PARENT_TAG@+git.%cd + + + *.tar + bz2 + + + diff --git a/openscap-1.3.1+git.20200110.tar.bz2 b/openscap-1.3.1+git.20200110.tar.bz2 new file mode 100644 index 0000000..624e169 --- /dev/null +++ b/openscap-1.3.1+git.20200110.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0624c283f9a6da2cce858d1ccdbd52c6b375b158bd244d3ddc424eaafe63f5ae +size 7951975 diff --git a/openscap-1.3.1.20200112.tar.bz2 b/openscap-1.3.1.20200112.tar.bz2 deleted file mode 100644 index 634922e..0000000 --- a/openscap-1.3.1.20200112.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbd51cdd2580a67188a4544650ad72968cd12992c2aa9a8b1cb32cb35fcc04b1 -size 34823568 diff --git a/openscap.spec b/openscap.spec index ccfd5f1..6ba71ba 100644 --- a/openscap.spec +++ b/openscap.spec @@ -25,8 +25,8 @@ %define with_bindings 0 Name: openscap -Version: 1.3.1.20200112 -Release: 1.0 +Version: 1.3.1+git.20200110 +Release: 0 #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