From dead0955af412bbc7c7b8bf9dbc7d69a08478e34ce78d4a52a0cdeefbdb3caf2 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 20 Mar 2024 10:02:14 +0000 Subject: [PATCH] Accepting request 1159796 from home:rfrohl:branches:security openscap 1.3.10 OBS-URL: https://build.opensuse.org/request/show/1159796 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=290 --- ...requires-reqs-for-C-20-compatibility.patch | 66 ------------------- openscap-1.3.10.tar.gz | 3 + openscap-1.3.9.tar.gz | 3 - openscap.changes | 25 +++++++ openscap.spec | 3 +- 5 files changed, 29 insertions(+), 71 deletions(-) delete mode 100644 0005-rename-requires-reqs-for-C-20-compatibility.patch create mode 100644 openscap-1.3.10.tar.gz delete mode 100644 openscap-1.3.9.tar.gz diff --git a/0005-rename-requires-reqs-for-C-20-compatibility.patch b/0005-rename-requires-reqs-for-C-20-compatibility.patch deleted file mode 100644 index 2871ec2..0000000 --- a/0005-rename-requires-reqs-for-C-20-compatibility.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f276794e7395cf3805e32ab3b86508f933471537 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= -Date: Tue, 28 Mar 2023 13:09:59 +0200 -Subject: [PATCH 5/5] rename requires -> reqs for C++20 compatibility -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Klaus Kämpf ---- - src/XCCDF/public/xccdf_benchmark.h | 6 +++--- - src/XCCDF/rule.c | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/XCCDF/public/xccdf_benchmark.h b/src/XCCDF/public/xccdf_benchmark.h -index db65873..74e3920 100644 ---- a/src/XCCDF/public/xccdf_benchmark.h -+++ b/src/XCCDF/public/xccdf_benchmark.h -@@ -3343,11 +3343,11 @@ OSCAP_API bool xccdf_item_add_warning(struct xccdf_item *item, struct xccdf_warn - OSCAP_API bool xccdf_refine_rule_add_remark(struct xccdf_refine_rule *obj, struct oscap_text *item); - - /// @memberof xccdf_rule --OSCAP_API bool xccdf_rule_add_requires(struct xccdf_rule *rule, struct oscap_stringlist *requires); -+OSCAP_API bool xccdf_rule_add_requires(struct xccdf_rule *rule, struct oscap_stringlist *reqs); - /// @memberof xccdf_group --OSCAP_API bool xccdf_group_add_requires(struct xccdf_group *group, struct oscap_stringlist *requires); -+OSCAP_API bool xccdf_group_add_requires(struct xccdf_group *group, struct oscap_stringlist *reqs); - /// @memberof xccdf_item --OSCAP_API bool xccdf_item_add_requires(struct xccdf_item *item, struct oscap_stringlist *requires); -+OSCAP_API bool xccdf_item_add_requires(struct xccdf_item *item, struct oscap_stringlist *reqs); - /// @memberof xccdf_rule - OSCAP_API bool xccdf_rule_add_conflicts(struct xccdf_rule *rule, const char *conflicts); - /// @memberof xccdf_group -diff --git a/src/XCCDF/rule.c b/src/XCCDF/rule.c -index b16b69e..0ec1643 100644 ---- a/src/XCCDF/rule.c -+++ b/src/XCCDF/rule.c -@@ -76,20 +76,20 @@ bool xccdf_content_parse(xmlTextReaderPtr reader, struct xccdf_item *parent) - return false; - } - --static void xccdf_deps_get(struct xccdf_item *item, struct oscap_list **conflicts, struct oscap_list **requires) -+static void xccdf_deps_get(struct xccdf_item *item, struct oscap_list **conflicts, struct oscap_list **reqs) - { - switch (item->type) { - case XCCDF_RULE: - if (conflicts) - *conflicts = item->sub.rule.conflicts; -- if (requires) -- *requires = item->sub.rule.requires; -+ if (reqs) -+ *reqs = item->sub.rule.requires; - break; - case XCCDF_GROUP: - if (conflicts) - *conflicts = item->sub.group.conflicts; -- if (requires) -- *requires = item->sub.group.requires; -+ if (reqs) -+ *reqs = item->sub.group.requires; - break; - default: - assert(false); --- -2.40.0 - diff --git a/openscap-1.3.10.tar.gz b/openscap-1.3.10.tar.gz new file mode 100644 index 0000000..adf0ae3 --- /dev/null +++ b/openscap-1.3.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a51a09810d6d188e82afb31e454d06989d59d05f39e2aec99a661b01cd660aa +size 14047461 diff --git a/openscap-1.3.9.tar.gz b/openscap-1.3.9.tar.gz deleted file mode 100644 index be8a5f5..0000000 --- a/openscap-1.3.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:033889da66178d5ce63d802c6a41cce8bcc08d09ae02e256f365f4daca8a1899 -size 14028562 diff --git a/openscap.changes b/openscap.changes index a0a908e..d71cd83 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Mar 20 08:56:12 UTC 2024 - Robert Frohl + +- update to 1.3.10: + * New features + - Dump all env. variables that affects the behaviour on INFO log level + - Support Blueprint services customization for masking + - Fix Blueprint template to be self-contained + - Add a refine-rule tailoring ability to autotailor + - Introduce JSON tailoring import option for autotailor + - Select rules based on reference + - Skip certain paths from scanning (controlled via env. variable) + - Introduce a limit of collected items (controlled via env. variable) + * Maintenance, bug fix + - Fix partition probe for PCRE2 + - Fix NSS crypto backend + - Wrap Bash snippets in a subshell when generating a fix script + - Improve references in HTML guides and reports + - Update html report with OVAL details + - Rewrite dpkginfo probe without using APT + - Fix incorrect openscap-cpe-oval result filename + - Implement xccdf_session_get_rule_results function in XCCDF session API + - Implement xccdf_session_result_reset function in XCCDF session API +- drop 0005-rename-requires-reqs-for-C-20-compatibility.patch: fixed upstream + ------------------------------------------------------------------- Tue Feb 27 22:23:26 UTC 2024 - Jaime Marquínez Ferrándiz diff --git a/openscap.spec b/openscap.spec index bc49a01..997ef92 100644 --- a/openscap.spec +++ b/openscap.spec @@ -23,7 +23,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: openscap -Version: 1.3.9 +Version: 1.3.10 Release: 0 Summary: A Set of Libraries for Integration with SCAP License: LGPL-2.1-or-later @@ -44,7 +44,6 @@ Patch3: 0003-Use-openSUSE-SUSE-cpe-links.patch %if 0%{?suse_version} != 1599 Patch4: 0004-oscap-remediate-is-located-in-bindir.patch %endif -Patch5: 0005-rename-requires-reqs-for-C-20-compatibility.patch BuildRequires: asciidoc # Use package name cause of "have choice for perl(XML::Parser): brp-check-suse perl-XML-Parser"