From 5c4b32d46fb15a84adc40bedf43ab9e37e4592da Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Fri, 15 Apr 2022 16:32:11 +0800 Subject: [PATCH] The third party software jinja2-support python 3.10.0 --- ...oftware-jinja2-support-python-3.10.0.patch | 24 +++++++++++++++++++ nodejs.spec | 7 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0006-The-third-party-software-jinja2-support-python-3.10.0.patch diff --git a/0006-The-third-party-software-jinja2-support-python-3.10.0.patch b/0006-The-third-party-software-jinja2-support-python-3.10.0.patch new file mode 100644 index 0000000..0705ba3 --- /dev/null +++ b/0006-The-third-party-software-jinja2-support-python-3.10.0.patch @@ -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 diff --git a/nodejs.spec b/nodejs.spec index 5f870b7..f899121 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -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 - 1:12.18.4-8 +- The third party software jinja2-support python 3.10.0 + * Thu Oct 21 2021 yaoxin - 1:12.18.4-7 - fix CVE-2021-22930 -- Gitee