!86 fix build error for python 3.10

From: @lyn1001 
Reviewed-by: @solarhu 
Signed-off-by: @solarhu
This commit is contained in:
openeuler-ci-bot 2022-04-19 01:12:10 +00:00 committed by Gitee
commit 3538c4f4f3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff -Nur a/deps/v8/third_party/jinja2/tests.py b/deps/v8/third_party/jinja2/tests.py
--- a/deps/v8/third_party/jinja2/tests.py 2020-09-15 15:08:49.000000000 +0800
+++ b/deps/v8/third_party/jinja2/tests.py 2022-04-15 11:37:42.109184439 +0800
@@ -10,7 +10,7 @@
"""
import operator
import re
-from collections import Mapping
+from collections.abc import Mapping
from jinja2.runtime import Undefined
from jinja2._compat import text_type, string_types, integer_types
import decimal
diff -Nur a/tools/inspector_protocol/jinja2/tests.py b/tools/inspector_protocol/jinja2/tests.py
--- a/tools/inspector_protocol/jinja2/tests.py 2020-09-15 15:08:50.000000000 +0800
+++ b/tools/inspector_protocol/jinja2/tests.py 2022-04-15 11:38:31.877761944 +0800
@@ -10,7 +10,7 @@
"""
import operator
import re
-from collections import Mapping
+from collections.abc import Mapping
from jinja2.runtime import Undefined
from jinja2._compat import text_type, string_types, integer_types
import decimal

View File

@ -1,5 +1,5 @@
%bcond_with bootstrap
%global baserelease 7
%global baserelease 8
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global nodejs_epoch 1
%global nodejs_major 12
@ -95,6 +95,8 @@ Patch00011: 0005-use-getauxval-in-node_main_cc.patch
Patch00012: CVE-2021-22930-1.patch
Patch00013: CVE-2021-22930-2.patch
Patch00014: CVE-2021-22930-3.patch
#https://github.com/nodejs/node/pull/40296
Patch00015: 0006-The-third-party-software-jinja2-support-python-3.10.0.patch
BuildRequires: python3-devel
BuildRequires: zlib-devel
@ -497,6 +499,9 @@ end
%{_pkgdocdir}/npm/docs
%changelog
* Fri Apr 15 2022 liyanan <liyanan32@h-partners.com> - 1:12.18.4-8
- The third party software jinja2-support python 3.10.0
* Thu Oct 21 2021 yaoxin <yaoxin30@huawei.com> - 1:12.18.4-7
- fix CVE-2021-22930