From 773d863a3aeeb47f0a1857484f8bc1013adbeb3d Mon Sep 17 00:00:00 2001 From: xiezhongtian Date: Fri, 27 Aug 2021 15:44:10 +0800 Subject: [PATCH] rebrand: add anolis platform distribution --- add-anolis-platform.patch | 12 ++++++++++++ python3.spec | 12 ++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 add-anolis-platform.patch diff --git a/add-anolis-platform.patch b/add-anolis-platform.patch new file mode 100644 index 0000000..9952007 --- /dev/null +++ b/add-anolis-platform.patch @@ -0,0 +1,12 @@ +diff -Nur Python-3.6.8/Lib/platform.py Python-3.6.8.new/Lib/platform.py +--- Python-3.6.8/Lib/platform.py 2018-12-24 05:37:14.000000000 +0800 ++++ Python-3.6.8.new/Lib/platform.py 2020-11-26 11:18:27.345369745 +0800 +@@ -297,7 +297,7 @@ + # and http://www.die.net/doc/linux/man/man1/lsb_release.1.html + + _supported_dists = ( +- 'SuSE', 'debian', 'fedora', 'redhat', 'centos', ++ 'SuSE', 'debian', 'fedora', 'redhat', 'centos', 'anolis', + 'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo', + 'UnitedLinux', 'turbolinux', 'arch', 'mageia') + diff --git a/python3.spec b/python3.spec index 09546fb..dd6896d 100644 --- a/python3.spec +++ b/python3.spec @@ -6,7 +6,7 @@ # pybasever without the dot: %global pyshortver 36 - +%define anolis_release .0.1 Name: python3 Summary: Interpreter of the Python programming language URL: https://www.python.org/ @@ -14,7 +14,7 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well Version: %{pybasever}.8 -Release: 18%{?dist} +Release: 18%{anolis_release}%{?dist} License: Python @@ -394,6 +394,9 @@ Patch324: 00324-disallow-control-chars-in-http-urls.patch # Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1714642 Patch325: 00325-CVE-2019-9948.patch +# add anolis platform dist +Patch1000: add-anolis-platform.patch + # 00329 # # Support OpenSSL FIPS mode # - Fallback implementations md5, sha1, sha256, sha512 are removed in favor of OpenSSL wrappers @@ -793,6 +796,7 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en %patch333 -p1 %patch344 -p1 %patch346 -p1 +%patch1000 -p1 # Patch 351 adds binary file for testing. We need to apply it using Git. git apply %{PATCH351} @@ -1674,6 +1678,10 @@ CheckPython optimized # ====================================================== %changelog +* Fri Jul 01 2022 xiezhongtian - 3.6.8-18.0.1 +- Add Anolis platform +- Cherry-pick [912fa50] + * Fri Jul 31 2020 Charalampos Stratakis - 3.6.8-18 - Avoid infinite loop when reading specially crafted TAR files (CVE-2019-20907) Resolves: rhbz#1856481 -- Gitee