diff --git a/add-anolis-platform.patch b/add-anolis-platform.patch new file mode 100644 index 0000000000000000000000000000000000000000..99520073aaaabc8d7fa221c383c0dc5dafb79683 --- /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 89deda4d79c3c441a42e9a8f9bb78f4e44e15113..c448924e701f99a67d4e8336ff1cd07ebccb754f 100644 --- a/python3.spec +++ b/python3.spec @@ -2,6 +2,7 @@ # Top-level metadata # ================== +%define anolis_release .0.1 Name: python3 Summary: Interpreter of the Python programming language URL: https://www.python.org/ @@ -14,7 +15,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: 41%{?dist} +Release: 41%{anolis_release}%{?dist} License: Python @@ -625,6 +626,8 @@ Patch366: 00366-CVE-2021-3733.patch # # https://fedoraproject.org/wiki/SIGs/Python/PythonPatches +# add anolis platform dist +Patch1000: add-anolis-platform.patch # ========================================== # Descriptions, and metadata for subpackages @@ -951,6 +954,8 @@ git apply %{PATCH351} %patch364 -p1 %patch366 -p1 +%patch1000 -p1 + # Remove files that should be generated by the build # (This is after patching, so that we can use patches directly from upstream) rm configure pyconfig.h.in @@ -1875,6 +1880,10 @@ fi # ====================================================== %changelog +* Wed Dec 15 2021 zhangbinchen - 3.6.8-41.0.1 +- Add Anolis platform +- cherry-pick [9a96461] + * Thu Sep 09 2021 Lumír Balhar - 3.6.8-41 - Security fix for CVE-2021-3733: Denial of service when identifying crafted invalid RFCs Resolves: rhbz#1995234