diff --git a/0001-openscap-anolis-modify-bug-url.patch b/0001-openscap-anolis-modify-bug-url.patch new file mode 100644 index 0000000000000000000000000000000000000000..d0ce1ac997acb4c9912ef05c12a96bafb3729b9d --- /dev/null +++ b/0001-openscap-anolis-modify-bug-url.patch @@ -0,0 +1,43 @@ +From db1e978a3552ce99a7f4b2d30efd8f41d94c937b Mon Sep 17 00:00:00 2001 +From: yangxianzhao +Date: Thu, 9 Mar 2023 10:14:51 +0800 +Subject: [PATCH] test + +--- + 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..5eed8d9 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://bugzilla.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://bugzilla.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://bugzilla.openanolis.cn)" + raise ImportError("Cannot create agent session for \"%s\": %s" % (f_OVAL, desc)) + sessions[file] = sess + names[file] = [sess, def_model] +-- +2.18.4 + diff --git a/openscap.spec b/openscap.spec index 5f079de5b74651dc58b4583cfe4ca80e5c2dceb8..13b25825b4f81048a98cc232048474b736991c6c 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %define __python /usr/bin/python2 %{!?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)")} @@ -7,7 +8,7 @@ restorecon -R /usr/bin/oscap /usr/libexec/openscap; \ Name: openscap Version: 1.2.17 -Release: 15%{?dist} +Release: 15%{anolis_release}%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries License: LGPLv2+ @@ -50,6 +51,9 @@ Patch34: openscap-1.3.1-improve_stig-viewer_output-PR_1319.patch Patch35: openscap-1.3.5-fix_segfaults_and_broken_test-PR_1669.patch Patch36: openscap-1.2.18-memory-limits-PR_1803.patch Patch37: openscap-1.3.7-prevent_memory_error-PR_1861.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 @@ -202,7 +206,7 @@ Tool for scanning Atomic containers. %patch35 -p1 %patch36 -p1 %patch37 -p1 - +%patch100 -p1 %build %ifarch sparc64 #sparc64 need big PIE @@ -357,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 09 2023 yangxianzhao - 1.2.17-15.0.1 +- Rebrand: modify bug url + * Tue Jan 31 2023 Jan Černý - 1.2.17-15 - Prevent memory errors (rhbz#2111041)