diff --git a/0001-openscap-anolis-modify-bug-url.patch b/0001-openscap-anolis-modify-bug-url.patch new file mode 100644 index 0000000000000000000000000000000000000000..df7e16239a2ef2d3bd7e4fa83a2fffeda8e069ea --- /dev/null +++ b/0001-openscap-anolis-modify-bug-url.patch @@ -0,0 +1,43 @@ +From 7da6df77a80e7d1c6f30b1f13dfe5e8fb2c1917f Mon Sep 17 00:00:00 2001 +From: yangxianzhao +Date: Mon, 18 Oct 2021 13:37:57 +0800 +Subject: [PATCH] modify bug url + +--- + swig/src/openscap_api.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/swig/src/openscap_api.py b/swig/src/openscap_api.py +index 710398b..9b2d9a4 100644 +--- a/swig/src/openscap_api.py ++++ b/swig/src/openscap_api.py +@@ -693,7 +693,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 (http://bugs.openanolis.cn)" + raise ImportError("Benchmark \"%s\" loading failed: %s" % (f_XCCDF, desc)) + policy_model = self.policy_model(benchmark) + files = policy_model.get_files() +@@ -711,7 +711,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 (http://bugs.openanolis.cn)" + raise ImportError("Cannot import definition model for \"%s\": %s" % (f_OVAL, desc)) + def_models.append(def_model) + sess = oval.agent_new_session(def_model, file) +@@ -719,7 +719,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 (http://bugs.openanolis.cn)" + raise ImportError("Cannot create agent session for \"%s\": %s" % (f_OVAL, desc)) + sessions[file] = sess + names[file] = [sess, def_model] +-- +1.8.3.1 + diff --git a/openscap.spec b/openscap.spec index 672d82f2111b0a575af990627c30d04f9ee6665a..98027dd6739aa4517e15fc7a6551f2527f46ce76 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -6,7 +7,7 @@ restorecon -R /usr/bin/oscap /usr/libexec/openscap; \ Name: openscap Version: 1.2.17 -Release: 13%{?dist} +Release: 13%{anolis_release}%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries License: LGPLv2+ @@ -39,6 +40,10 @@ Patch24: openscap-1.2.18-cvrf-segfault.patch Patch25: openscap-1.3.2-red-hat-errata-url-pr1388.patch Patch26: openscap-1.3.4-rpmverifyfile_leak-PR_1565.patch Patch27: openscap-1.2.18-gzip-compression-PR1576.patch +#Add by Anolis +Patch100: 0001-openscap-anolis-modify-bug-url.patch +#End + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: swig libxml2-devel libxslt-devel perl-XML-Parser BuildRequires: rpm-devel @@ -181,6 +186,7 @@ Tool for scanning Atomic containers. %patch25 -p1 %patch26 -p1 %patch27 -p1 +%patch100 -p1 %build %ifarch sparc64 @@ -336,6 +342,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 01 2022 yangxianzhao - 1.2.17-13.0.1 +- Rebrand: modify bug url +- Cherry-pick [cd51eda] + * Mon Sep 21 2020 Jan Černý - 1.2.17-13 - Enable gzip compression when downloading remote content (RHBZ#1870147)