From 97724c3182a7c038ecc8e74effe799590cc0ccf6 Mon Sep 17 00:00:00 2001 From: rabbitali Date: Wed, 21 Jun 2023 10:55:53 +0800 Subject: [PATCH] update hostpatch info query func (cherry picked from commit 77f59c8cc8f2037ae15ac8ee8f2d5185d74cf5ff) --- 0004-update-hotpatch-info-query-func.patch | 26 ++++++++++++++++++++++ aops-ceres.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0004-update-hotpatch-info-query-func.patch diff --git a/0004-update-hotpatch-info-query-func.patch b/0004-update-hotpatch-info-query-func.patch new file mode 100644 index 0000000..94c9098 --- /dev/null +++ b/0004-update-hotpatch-info-query-func.patch @@ -0,0 +1,26 @@ +From f198f261309b3f0b01ee1462c896b8d931346bbb Mon Sep 17 00:00:00 2001 +From: gongzt +Date: Tue, 20 Jun 2023 15:07:59 +0800 +Subject: [PATCH] update hostpatch info query func +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + ceres/manages/vulnerability_manage.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ceres/manages/vulnerability_manage.py b/ceres/manages/vulnerability_manage.py +index c153190..8547abe 100644 +--- a/ceres/manages/vulnerability_manage.py ++++ b/ceres/manages/vulnerability_manage.py +@@ -406,7 +406,7 @@ class VulnerabilityManage: + if not hotpatch_info.startswith("CVE"): + continue + cve_id, base_pkg, status = [info.strip() for info in hotpatch_info.split()] +- if status != "ACTIVED" and status != "ACCEPT": ++ if status != "ACTIVED" and status != "ACCEPTED": + continue + hotpatch_list[base_pkg].append(cve_id) + +-- diff --git a/aops-ceres.spec b/aops-ceres.spec index c7d9195..f922ff0 100644 --- a/aops-ceres.spec +++ b/aops-ceres.spec @@ -1,6 +1,6 @@ Name: aops-ceres Version: v1.2.1 -Release: 4 +Release: 5 Summary: An agent which needs to be adopted in client, it managers some plugins, such as gala-gopher(kpi collection), fluentd(log collection) and so on. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} @@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz Patch0001: 0001-modify-return-value-when-no-hotpatch-is-matched.patch Patch0002: 0002-update-cve-fix-and-cve-scan.patch Patch0003: 0003-fix-issue-cve-fix-result-doesn-t-match-log.patch +Patch0004: 0004-update-hotpatch-info-query-func.patch BuildRequires: python3-setuptools @@ -43,6 +44,9 @@ An agent which needs to be adopted in client, it managers some plugins, such as %changelog +* Wed Jun 21 2023 wenxin - v1.2.1-5 +- update hostpatch info query func + * Fri Jun 09 2023 wenxin - v1.2.1-4 - fix issue: cve fix result doesn't match log -- Gitee