From 3503466e53f8ac4ffadc48b89801914911b7c75d Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 7 Jun 2024 11:41:44 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- SOURCES/python-2.7-almalinux_support.patch | 12 ++++++++++++ SPECS/python2.spec | 11 +++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 SOURCES/python-2.7-almalinux_support.patch diff --git a/SOURCES/python-2.7-almalinux_support.patch b/SOURCES/python-2.7-almalinux_support.patch new file mode 100644 index 0000000..599b1a7 --- /dev/null +++ b/SOURCES/python-2.7-almalinux_support.patch @@ -0,0 +1,12 @@ +diff -Naur Python-2.7.17.orig/Lib/platform.py Python-2.7.17.alma/Lib/platform.py +--- Python-2.7.17.orig/Lib/platform.py 2019-10-19 18:38:44.000000000 +0000 ++++ Python-2.7.17.alma/Lib/platform.py 2021-03-22 07:54:35.254207418 +0000 +@@ -291,7 +291,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', 'almalinux', + 'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo', + 'UnitedLinux', 'turbolinux') + diff --git a/SPECS/python2.spec b/SPECS/python2.spec index cb303ba..aa1ebb5 100644 --- a/SPECS/python2.spec +++ b/SPECS/python2.spec @@ -2,6 +2,8 @@ # Conditionals and other variables controlling the build # ====================================================== +%global dist %{?dist}.alma + # Note that the bcond macros are named for the CLI option they create. # "%%bcond_without" means "ENABLE by default and create a --without option" @@ -867,6 +869,7 @@ Patch408: 00408-cve-2022-48560.patch # above: Patch5000: 05000-autotool-intermediates.patch +Patch5001: python-2.7-almalinux_support.patch # ====================================================== # Additional metadata, and subpackages @@ -1204,6 +1207,7 @@ find -name "*~" |xargs rm -f %patch5000 -p0 -b .autotool-intermediates %endif +%patch5001 -p1 # ====================================================== # Configuring and building the code: @@ -2132,10 +2136,12 @@ fi # ====================================================== %changelog +* Thu Mar 28 2024 Andrew Lukoshko - 2.7.18-17.alma +- Add AlmaLinux to supported distros + * Thu Nov 30 2023 Lumír Balhar - 2.7.18-17 - Security fix for CVE-2022-48560 Resolves: RHEL-16702 - * Thu Oct 12 2023 Lumír Balhar - 2.7.18-16 - Fix for CVE-2022-48565 Resolves: RHEL-7088 @@ -2147,19 +2153,16 @@ Resolves: RHEL-9621 * Thu Jul 20 2023 Charalampos Stratakis - 2.7.18-14 - Security fix for CVE-2023-24329 Resolves: rhbz#2173917 - * Thu Feb 16 2023 Josef Ridky - 2.7.18-13 - Add missing part of fix for CVE-2022-45061 (#2145071) * Wed Dec 21 2022 Charalampos Stratakis - 2.7.18-12 - Security fix for CVE-2022-45061: CPU denial of service via inefficient IDNA decoder Resolves: rhbz#2144072 - * Fri Jun 17 2022 Charalampos Stratakis - 2.7.18-11 - Security fix for CVE-2015-20107 - Fix the test suite support for Expat >= 2.4.5 Resolves: rhbz#2075390 - * Tue Feb 08 2022 Charalampos Stratakis - 2.7.18-10 - Security fix for CVE-2022-0391: urlparse does not sanitize URLs containing ASCII newline and tabs Resolves: rhbz#2047376