From 989a171f695ad0f7f80316f55747767c93328d97 Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Tue, 2 Feb 2021 02:50:03 +0800 Subject: [PATCH] rebrand: add bugzilla address of openanolis Signed-off-by: yangxiaoxuan Change-Id: Ib314bcf2441a4f2943a62b40824aa5bbeb6ba4c8 (cherry picked from commit 5975ebdf8417f37270e1c62a6322701b70265b4c) Signed-off-by: zhangbinchen --- 0001-openscap-anolis-modify-bug-url.patch | 43 +++++++++++++++++++++++ openscap.spec | 13 ++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0001-openscap-anolis-modify-bug-url.patch diff --git a/0001-openscap-anolis-modify-bug-url.patch b/0001-openscap-anolis-modify-bug-url.patch new file mode 100644 index 0000000..901f9b9 --- /dev/null +++ b/0001-openscap-anolis-modify-bug-url.patch @@ -0,0 +1,43 @@ +From be17212884f38023cf25b5d4cb6105133eedd5f6 Mon Sep 17 00:00:00 2001 +From: mahailiang +Date: Mon, 1 Feb 2021 14:47:03 +0800 +Subject: [PATCH] modify bug url + +--- + swig/openscap_api.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/swig/openscap_api.py b/swig/openscap_api.py +index e2fd9c3..856d2b4 100644 +--- a/swig/openscap_api.py ++++ b/swig/openscap_api.py +@@ -792,7 +792,7 @@ class OSCAP_Object(object): + if OSCAP.oscap_err(): + desc = OSCAP.oscap_err_desc() + else: +- desc = "Unknown error, please report this bug (http://bugzilla.redhat.com/)" ++ desc = "Unknown error, please report this bug (https://bugs.openanolis.cn)" + raise ImportError( + "Benchmark \"%s\" loading failed: %s" % (f_XCCDF, desc)) + +@@ -813,7 +813,7 @@ class OSCAP_Object(object): + if OSCAP.oscap_err(): + desc = OSCAP.oscap_err_desc() + else: +- desc = "Unknown error,please report this bug (http://bugzilla.redhat.com/)" ++ desc = "Unknown error,please report this bug (https://bugs.openanolis.cn)" + raise ImportError( + "Cannot import definition model for \"%s\": %s" % (f_OVAL, desc)) + def_models.append(def_model) +@@ -822,7 +822,7 @@ class OSCAP_Object(object): + if OSCAP.oscap_err(): + desc = OSCAP.oscap_err_desc() + else: +- desc = "Unknown error,please report this bug (http://bugzilla.redhat.com/)" ++ desc = "Unknown error,please report this bug (https://bugs.openanolis.cn)" + raise ImportError( + "Cannot create agent session for \"%s\": %s" % (f_OVAL, desc)) + sessions[file] = sess +-- +2.18.2 + diff --git a/openscap.spec b/openscap.spec index 8aa1731..f62fe6e 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,6 +1,7 @@ +%define anolis_release .0.1 Name: openscap Version: 1.3.2 -Release: 8%{?dist} +Release: 8%{anolis_release}%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries License: LGPLv2+ @@ -15,6 +16,11 @@ Patch5: openscap-1.3.2-covscan_ux_fix.patch Patch6: openscap-1.3.3-fix-cmake-findacl.patch Patch7: openscap-1.3.6-PR-1779-initialize-crapi-once.patch Patch8: openscap-1.3.6-PR-1788-test-rhbz1959570.patch + +# Add by Anolis +Patch1000: 0001-openscap-anolis-modify-bug-url.patch +# End + # END PATCHES FOR 1.3.2 BuildRequires: cmake >= 2.6 BuildRequires: swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser @@ -141,6 +147,7 @@ for developing applications that use %{name}-engine-sce. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch1000 -p1 mkdir build %build @@ -226,6 +233,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/oscap-run-sce-script %changelog +* Wed Dec 15 2021 Mahailiang - 1.3.2-8.0.1 +- Modify bug url +- cherry-pick [5975ebd] + * Tue Oct 05 2021 Jan Černý - 1.3.2-8 - Fix broken prep phase -- Gitee