From bba5d92a8aed97f5ef568e0376c61ead2594e9d2 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 13 Nov 2024 16:17:13 +0300 Subject: [PATCH] import python3.11-3.11.9-7.el9_5.1 --- .gitignore | 2 +- .python3.11.metadata | 2 +- SOURCES/00329-fips.patch | 37 ++- SOURCES/00397-tarfile-filter.patch | 35 ++- ...-addresses-in-email-parseaddr-111116.patch | 71 +++--- SOURCES/00422-fix-expat-tests.patch | 75 ++++++ ...s-for-xmlpullparser-with-expat-2-6-0.patch | 77 ------- SOURCES/00426-CVE-2023-6597.patch | 215 ------------------ SOURCES/00431-CVE-2024-4032.patch | 33 +-- SOURCES/Python-3.11.7.tar.xz.asc | 16 -- SOURCES/Python-3.11.9.tar.xz.asc | 16 ++ SPECS/python3.11.spec | 81 ++++--- 12 files changed, 222 insertions(+), 438 deletions(-) create mode 100644 SOURCES/00422-fix-expat-tests.patch delete mode 100644 SOURCES/00422-fix-tests-for-xmlpullparser-with-expat-2-6-0.patch delete mode 100644 SOURCES/00426-CVE-2023-6597.patch delete mode 100644 SOURCES/Python-3.11.7.tar.xz.asc create mode 100644 SOURCES/Python-3.11.9.tar.xz.asc diff --git a/.gitignore b/.gitignore index b16aaa9..bcbc2f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/Python-3.11.7.tar.xz +SOURCES/Python-3.11.9.tar.xz diff --git a/.python3.11.metadata b/.python3.11.metadata index 7c0a04b..22ae9aa 100644 --- a/.python3.11.metadata +++ b/.python3.11.metadata @@ -1 +1 @@ -f2534d591121f3845388fbdd6a121b96dfe305a6 SOURCES/Python-3.11.7.tar.xz +926cd6a577b2e8dcbb17671b30eda04019328ada SOURCES/Python-3.11.9.tar.xz diff --git a/SOURCES/00329-fips.patch b/SOURCES/00329-fips.patch index ae99211..e2f1cf8 100644 --- a/SOURCES/00329-fips.patch +++ b/SOURCES/00329-fips.patch @@ -220,7 +220,7 @@ https://bugs.python.org/issue17258 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py -index 8b81f99..69c0b7e 100644 +index 59c61d2..7fc594e 100644 --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -43,6 +43,10 @@ BUFSIZE = 8192 @@ -234,7 +234,7 @@ index 8b81f99..69c0b7e 100644 _mmap_counter = itertools.count() default_family = 'AF_INET' -@@ -752,7 +756,7 @@ def deliver_challenge(connection, authkey): +@@ -753,7 +757,7 @@ def deliver_challenge(connection, authkey): "Authkey must be bytes, not {0!s}".format(type(authkey))) message = os.urandom(MESSAGE_LENGTH) connection.send_bytes(CHALLENGE + message) @@ -243,7 +243,7 @@ index 8b81f99..69c0b7e 100644 response = connection.recv_bytes(256) # reject large message if response == digest: connection.send_bytes(WELCOME) -@@ -768,7 +772,7 @@ def answer_challenge(connection, authkey): +@@ -769,7 +773,7 @@ def answer_challenge(connection, authkey): message = connection.recv_bytes(256) # reject large message assert message[:len(CHALLENGE)] == CHALLENGE, 'message = %r' % message message = message[len(CHALLENGE):] @@ -446,10 +446,10 @@ index 56ae7a5..45fb403 100644 + if (_Py_hashlib_fips_error(exc, name)) return NULL; \ +} while (0) diff --git a/configure.ac b/configure.ac -index 52d5c1f..56aff78 100644 +index 7b4000f..8e2f0ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -7069,7 +7069,8 @@ PY_STDLIB_MOD([_sha512], [test "$with_builtin_sha512" = yes]) +@@ -7070,7 +7070,8 @@ PY_STDLIB_MOD([_sha512], [test "$with_builtin_sha512" = yes]) PY_STDLIB_MOD([_sha3], [test "$with_builtin_sha3" = yes]) PY_STDLIB_MOD([_blake2], [test "$with_builtin_blake2" = yes], [], @@ -792,12 +792,12 @@ Date: Mon, 26 Aug 2019 19:39:48 +0200 Subject: [PATCH 6/7] Guard against Python HMAC in FIPS mode --- - Lib/hmac.py | 13 +++++++++---- + Lib/hmac.py | 12 +++++++++--- Lib/test/test_hmac.py | 10 ++++++++++ - 2 files changed, 19 insertions(+), 4 deletions(-) + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Lib/hmac.py b/Lib/hmac.py -index 8b4f920..20ef96c 100644 +index 8b4eb2f..8930bda 100644 --- a/Lib/hmac.py +++ b/Lib/hmac.py @@ -16,8 +16,9 @@ else: @@ -812,16 +812,9 @@ index 8b4f920..20ef96c 100644 # The size of the digests returned by HMAC depends on the underlying # hashing module used. Use digest_size from the instance of HMAC instead. -@@ -48,17 +49,18 @@ class HMAC: - msg argument. Passing it as a keyword argument is - recommended, though not required for legacy API reasons. - """ -- - if not isinstance(key, (bytes, bytearray)): - raise TypeError("key: expected bytes or bytearray, but got %r" % type(key).__name__) - +@@ -55,10 +56,12 @@ class HMAC: if not digestmod: - raise TypeError("Missing required parameter 'digestmod'.") + raise TypeError("Missing required argument 'digestmod'.") - if _hashopenssl and isinstance(digestmod, (str, _functype)): + if _hashopenssl.get_fips_mode() or (_hashopenssl and isinstance(digestmod, (str, _functype))): @@ -833,7 +826,7 @@ index 8b4f920..20ef96c 100644 self._init_old(key, msg, digestmod) else: self._init_old(key, msg, digestmod) -@@ -69,6 +71,9 @@ class HMAC: +@@ -69,6 +72,9 @@ class HMAC: self.block_size = self._hmac.block_size def _init_old(self, key, msg, digestmod): @@ -844,7 +837,7 @@ index 8b4f920..20ef96c 100644 digest_cons = digestmod elif isinstance(digestmod, str): diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py -index a39a2c4..0742a1c 100644 +index 1502fba..e40ca4b 100644 --- a/Lib/test/test_hmac.py +++ b/Lib/test/test_hmac.py @@ -5,6 +5,7 @@ import hashlib @@ -883,7 +876,7 @@ index a39a2c4..0742a1c 100644 @unittest.skipUnless(sha256_module is not None, 'need _sha256') def test_with_sha256_module(self): h = hmac.HMAC(b"key", b"hash this!", digestmod=sha256_module.sha256) -@@ -481,6 +489,7 @@ class SanityTestCase(unittest.TestCase): +@@ -489,6 +497,7 @@ class UpdateTestCase(unittest.TestCase): class CopyTestCase(unittest.TestCase): @@ -891,7 +884,7 @@ index a39a2c4..0742a1c 100644 @hashlib_helper.requires_hashdigest('sha256') def test_attributes_old(self): # Testing if attributes are of same type. -@@ -492,6 +501,7 @@ class CopyTestCase(unittest.TestCase): +@@ -500,6 +509,7 @@ class CopyTestCase(unittest.TestCase): self.assertEqual(type(h1._outer), type(h2._outer), "Types of outer don't match.") @@ -902,6 +895,7 @@ index a39a2c4..0742a1c 100644 -- 2.45.0 + From a0c3f9ac5a4e60ab22418a3196ae46ba34e9477b Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Thu, 24 Nov 2022 01:47:31 +0300 @@ -938,3 +932,4 @@ index 0000000..82720d1 +``_imp.source_hash()``. -- 2.45.0 + diff --git a/SOURCES/00397-tarfile-filter.patch b/SOURCES/00397-tarfile-filter.patch index 3c4ebf4..bae08fa 100644 --- a/SOURCES/00397-tarfile-filter.patch +++ b/SOURCES/00397-tarfile-filter.patch @@ -1,4 +1,4 @@ -From 8b70605b594b3831331a9340ba764ff751871612 Mon Sep 17 00:00:00 2001 +From 0181d677dd7fd11bc19a211b3eb735ac3ad3d7fb Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 6 Mar 2023 17:24:24 +0100 Subject: [PATCH] CVE-2007-4559, PEP-706: Add filters for tarfile extraction @@ -9,11 +9,11 @@ variable and config file. --- Lib/tarfile.py | 42 +++++++++++++ Lib/test/test_shutil.py | 3 +- - Lib/test/test_tarfile.py | 128 ++++++++++++++++++++++++++++++++++++++- - 3 files changed, 169 insertions(+), 4 deletions(-) + Lib/test/test_tarfile.py | 127 ++++++++++++++++++++++++++++++++++++++- + 3 files changed, 168 insertions(+), 4 deletions(-) diff --git a/Lib/tarfile.py b/Lib/tarfile.py -index 130b5e0..3b7d8d5 100755 +index 612217b..dc59fc6 100755 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -72,6 +72,13 @@ __all__ = ["TarFile", "TarInfo", "is_tarfile", "TarError", "ReadError", @@ -30,7 +30,7 @@ index 130b5e0..3b7d8d5 100755 #--------------------------------------------------------- # tar constants -@@ -2211,6 +2218,41 @@ class TarFile(object): +@@ -2219,6 +2226,41 @@ class TarFile(object): if filter is None: filter = self.extraction_filter if filter is None: @@ -73,10 +73,10 @@ index 130b5e0..3b7d8d5 100755 if isinstance(filter, str): raise TypeError( diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py -index 9bf4145..f247b82 100644 +index 6728d30..2338b63 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py -@@ -1665,7 +1665,8 @@ class TestArchives(BaseTest, unittest.TestCase): +@@ -1774,7 +1774,8 @@ class TestArchives(BaseTest, unittest.TestCase): def check_unpack_tarball(self, format): self.check_unpack_archive(format, filter='fully_trusted') self.check_unpack_archive(format, filter='data') @@ -87,10 +87,10 @@ index 9bf4145..f247b82 100644 def test_unpack_archive_tar(self): diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py -index cdea033..4724285 100644 +index 389da7b..5a43f9d 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py -@@ -2,7 +2,7 @@ import sys +@@ -3,7 +3,7 @@ import sys import os import io from hashlib import sha256 @@ -99,7 +99,7 @@ index cdea033..4724285 100644 from random import Random import pathlib import shutil -@@ -2999,7 +2999,11 @@ class NoneInfoExtractTests(ReadTest): +@@ -3049,7 +3049,11 @@ class NoneInfoExtractTests(ReadTest): tar = tarfile.open(tarname, mode='r', encoding="iso8859-1") cls.control_dir = pathlib.Path(TEMPDIR) / "extractall_ctrl" tar.errorlevel = 0 @@ -112,7 +112,7 @@ index cdea033..4724285 100644 tar.close() cls.control_paths = set( p.relative_to(cls.control_dir) -@@ -3674,7 +3678,8 @@ class TestExtractionFilters(unittest.TestCase): +@@ -3868,7 +3872,8 @@ class TestExtractionFilters(unittest.TestCase): """Ensure the default filter does not warn (like in 3.12)""" with ArchiveMaker() as arc: arc.add('foo') @@ -122,10 +122,10 @@ index cdea033..4724285 100644 with self.check_context(arc.open(), None): self.expect_file('foo') -@@ -3844,6 +3849,123 @@ class TestExtractionFilters(unittest.TestCase): +@@ -4037,6 +4042,122 @@ class TestExtractionFilters(unittest.TestCase): + with self.check_context(arc.open(errorlevel='boo!'), filtererror_filter): self.expect_exception(TypeError) # errorlevel is not int - + @contextmanager + def rh_config_context(self, config_lines=None): + """Set up for testing various ways of overriding the default filter @@ -242,10 +242,9 @@ index cdea033..4724285 100644 + ): + self.check_trusted_default(tar, tempdir) + -+ - def setUpModule(): - os_helper.unlink(TEMPDIR) - os.makedirs(TEMPDIR) + + class OverwriteTests(archiver_tests.OverwriteTests, unittest.TestCase): + testdir = os.path.join(TEMPDIR, "testoverwrite") -- -2.41.0 +2.44.0 diff --git a/SOURCES/00415-cve-2023-27043-gh-102988-reject-malformed-addresses-in-email-parseaddr-111116.patch b/SOURCES/00415-cve-2023-27043-gh-102988-reject-malformed-addresses-in-email-parseaddr-111116.patch index 73bf9b7..b29388f 100644 --- a/SOURCES/00415-cve-2023-27043-gh-102988-reject-malformed-addresses-in-email-parseaddr-111116.patch +++ b/SOURCES/00415-cve-2023-27043-gh-102988-reject-malformed-addresses-in-email-parseaddr-111116.patch @@ -1,4 +1,4 @@ -From d8b0fafb202bf884135a3f7f0ce0b086217a2da2 Mon Sep 17 00:00:00 2001 +From 642f28679e04c7b4ec7731f0c8872103f21a76f8 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 15 Dec 2023 16:10:40 +0100 Subject: [PATCH 1/2] 00415: [CVE-2023-27043] gh-102988: Reject malformed @@ -12,10 +12,10 @@ Thomas Dwyer. Co-Authored-By: Thomas Dwyer --- Doc/library/email.utils.rst | 19 +- - Lib/email/utils.py | 151 ++++++++++++- + Lib/email/utils.py | 150 ++++++++++++- Lib/test/test_email/test_email.py | 204 +++++++++++++++++- ...-10-20-15-28-08.gh-issue-102988.dStNO7.rst | 8 + - 4 files changed, 361 insertions(+), 21 deletions(-) + 4 files changed, 360 insertions(+), 21 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2023-10-20-15-28-08.gh-issue-102988.dStNO7.rst diff --git a/Doc/library/email.utils.rst b/Doc/library/email.utils.rst @@ -72,18 +72,10 @@ index 0e266b6..6723dc4 100644 .. function:: parsedate(date) diff --git a/Lib/email/utils.py b/Lib/email/utils.py -index cfdfeb3..9522341 100644 +index 8993858..41bb3c9 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py -@@ -48,6 +48,7 @@ TICK = "'" - specialsre = re.compile(r'[][\\()<>@,:;".]') - escapesre = re.compile(r'[\\"]') - -+ - def _has_surrogates(s): - """Return True if s contains surrogate-escaped binary data.""" - # This check is based on the fact that unless there are surrogates, utf8 -@@ -106,12 +107,127 @@ def formataddr(pair, charset='utf-8'): +@@ -106,12 +106,127 @@ def formataddr(pair, charset='utf-8'): return address @@ -125,12 +117,7 @@ index cfdfeb3..9522341 100644 + result.append(addr[start:]) + + return ''.join(result) - --def getaddresses(fieldvalues): -- """Return a list of (REALNAME, EMAIL) for each fieldvalue.""" -- all = COMMASPACE.join(str(v) for v in fieldvalues) -- a = _AddressList(all) -- return a.addresslist ++ + +supports_strict_parsing = True + @@ -139,7 +126,12 @@ index cfdfeb3..9522341 100644 + + When parsing fails for a fieldvalue, a 2-tuple of ('', '') is returned in + its place. -+ + +-def getaddresses(fieldvalues): +- """Return a list of (REALNAME, EMAIL) for each fieldvalue.""" +- all = COMMASPACE.join(str(v) for v in fieldvalues) +- a = _AddressList(all) +- return a.addresslist + If strict is true, use a strict parser which rejects malformed inputs. + """ + @@ -216,7 +208,7 @@ index cfdfeb3..9522341 100644 def _format_timetuple_and_zone(timetuple, zone): -@@ -205,16 +321,33 @@ def parsedate_to_datetime(data): +@@ -205,16 +320,33 @@ def parsedate_to_datetime(data): tzinfo=datetime.timezone(datetime.timedelta(seconds=tz))) @@ -255,7 +247,7 @@ index cfdfeb3..9522341 100644 diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py -index 677f209..20b6779 100644 +index 785696e..ad60ed3 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -17,6 +17,7 @@ from unittest.mock import patch @@ -266,7 +258,7 @@ index 677f209..20b6779 100644 from email.charset import Charset from email.generator import Generator, DecodedGenerator, BytesGenerator -@@ -3321,15 +3322,154 @@ Foo +@@ -3336,15 +3337,154 @@ Foo [('Al Person', 'aperson@dom.ain'), ('Bud Person', 'bperson@dom.ain')]) @@ -429,7 +421,7 @@ index 677f209..20b6779 100644 def test_getaddresses_embedded_comment(self): """Test proper handling of a nested comment""" -@@ -3520,6 +3660,54 @@ multipart/report +@@ -3535,6 +3675,54 @@ multipart/report m = cls(*constructor, policy=email.policy.default) self.assertIs(m.policy, email.policy.default) @@ -499,10 +491,10 @@ index 0000000..3d0e9e4 +if the *strict* paramater is available. Patch by Thomas Dwyer and Victor +Stinner to improve the CVE-2023-27043 fix. -- -2.43.0 +2.44.0 -From 6c34f5b95da90bd494e29776c0e807af44689fae Mon Sep 17 00:00:00 2001 +From d371679e7c485551c10380ac11e5039a9fb4515b Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 10 Jan 2024 08:53:53 +0100 Subject: [PATCH 2/2] Make it possible to disable strict parsing in email @@ -510,9 +502,9 @@ Subject: [PATCH 2/2] Make it possible to disable strict parsing in email --- Doc/library/email.utils.rst | 26 +++++++++++ - Lib/email/utils.py | 54 +++++++++++++++++++++- + Lib/email/utils.py | 55 ++++++++++++++++++++++- Lib/test/test_email/test_email.py | 74 ++++++++++++++++++++++++++++++- - 3 files changed, 150 insertions(+), 4 deletions(-) + 3 files changed, 151 insertions(+), 4 deletions(-) diff --git a/Doc/library/email.utils.rst b/Doc/library/email.utils.rst index 6723dc4..c89602d 100644 @@ -559,10 +551,10 @@ index 6723dc4..c89602d 100644 from email.utils import getaddresses diff --git a/Lib/email/utils.py b/Lib/email/utils.py -index 9522341..2e30e09 100644 +index 41bb3c9..09a414c 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py -@@ -48,6 +48,46 @@ TICK = "'" +@@ -48,6 +48,47 @@ TICK = "'" specialsre = re.compile(r'[][\\()<>@,:;".]') escapesre = re.compile(r'[\\"]') @@ -606,10 +598,11 @@ index 9522341..2e30e09 100644 + + return True + - ++ def _has_surrogates(s): - """Return True if s contains surrogate-escaped binary data.""" -@@ -149,7 +189,7 @@ def _strip_quoted_realnames(addr): + """Return True if s may contain surrogate-escaped binary data.""" + # This check is based on the fact that unless there are surrogates, utf8 +@@ -148,7 +189,7 @@ def _strip_quoted_realnames(addr): supports_strict_parsing = True @@ -618,7 +611,7 @@ index 9522341..2e30e09 100644 """Return a list of (REALNAME, EMAIL) or ('','') for each fieldvalue. When parsing fails for a fieldvalue, a 2-tuple of ('', '') is returned in -@@ -158,6 +198,11 @@ def getaddresses(fieldvalues, *, strict=True): +@@ -157,6 +198,11 @@ def getaddresses(fieldvalues, *, strict=True): If strict is true, use a strict parser which rejects malformed inputs. """ @@ -630,7 +623,7 @@ index 9522341..2e30e09 100644 # If strict is true, if the resulting list of parsed addresses is greater # than the number of fieldvalues in the input list, a parsing error has # occurred and consequently a list containing a single empty 2-tuple [('', -@@ -321,7 +366,7 @@ def parsedate_to_datetime(data): +@@ -320,7 +366,7 @@ def parsedate_to_datetime(data): tzinfo=datetime.timezone(datetime.timedelta(seconds=tz))) @@ -639,7 +632,7 @@ index 9522341..2e30e09 100644 """ Parse addr into its constituent realname and email address parts. -@@ -330,6 +375,11 @@ def parseaddr(addr, *, strict=True): +@@ -329,6 +375,11 @@ def parseaddr(addr, *, strict=True): If strict is True, use a strict parser which rejects malformed inputs. """ @@ -652,7 +645,7 @@ index 9522341..2e30e09 100644 addrs = _AddressList(addr).addresslist if not addrs: diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py -index 20b6779..d7d99f0 100644 +index ad60ed3..f85da56 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -8,6 +8,9 @@ import base64 @@ -676,7 +669,7 @@ index 20b6779..d7d99f0 100644 from test.test_email import openfile, TestEmailBase # These imports are documented to work, but we are testing them using a -@@ -3427,6 +3430,73 @@ Foo +@@ -3442,6 +3445,73 @@ Foo # Test email.utils.supports_strict_parsing attribute self.assertEqual(email.utils.supports_strict_parsing, True) @@ -751,5 +744,5 @@ index 20b6779..d7d99f0 100644 for addresses, expected in ( (['"Sürname, Firstname" '], -- -2.43.0 +2.44.0 diff --git a/SOURCES/00422-fix-expat-tests.patch b/SOURCES/00422-fix-expat-tests.patch new file mode 100644 index 0000000..64c8449 --- /dev/null +++ b/SOURCES/00422-fix-expat-tests.patch @@ -0,0 +1,75 @@ +From 670984c96eea60488c5355b4cf535c1ee3cf081a Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Wed, 24 Apr 2024 04:24:16 +0200 +Subject: [PATCH] Fix xml tests + +--- + Lib/test/test_pyexpat.py | 3 +++ + Lib/test/test_sax.py | 2 ++ + Lib/test/test_xml_etree.py | 6 ++++++ + 3 files changed, 11 insertions(+) + +diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py +index 44bd1de..5976fa0 100644 +--- a/Lib/test/test_pyexpat.py ++++ b/Lib/test/test_pyexpat.py +@@ -3,6 +3,7 @@ + + import os + import platform ++import pyexpat + import sys + import sysconfig + import unittest +@@ -793,6 +794,8 @@ class ReparseDeferralTest(unittest.TestCase): + + self.assertEqual(started, ['doc']) + ++ @unittest.skipIf(pyexpat.version_info < (2, 6, 0), ++ "Reparse deferral not defined for libexpat < 2.6.0") + def test_reparse_deferral_disabled(self): + started = [] + +diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py +index 9b3014a..5960de1 100644 +--- a/Lib/test/test_sax.py ++++ b/Lib/test/test_sax.py +@@ -1240,6 +1240,8 @@ class ExpatReaderTest(XmlTestBase): + + self.assertEqual(result.getvalue(), start + b"") + ++ @unittest.skipIf(pyexpat.version_info < (2, 6, 0), ++ "Reparse deferral not defined for libexpat < 2.6.0") + def test_flush_reparse_deferral_disabled(self): + result = BytesIO() + xmlgen = XMLGenerator(result) +diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py +index 8becafb..5e9b6b5 100644 +--- a/Lib/test/test_xml_etree.py ++++ b/Lib/test/test_xml_etree.py +@@ -1424,9 +1424,13 @@ class XMLPullParserTest(unittest.TestCase): + self.assert_event_tags(parser, [('end', 'root')]) + self.assertIsNone(parser.close()) + ++ @unittest.skipIf(pyexpat.version_info < (2, 6, 0), ++ "test not compatible with the latest expat security release") + def test_simple_xml_chunk_1(self): + self.test_simple_xml(chunk_size=1, flush=True) + ++ @unittest.skipIf(pyexpat.version_info < (2, 6, 0), ++ "test not compatible with the latest expat security release") + def test_simple_xml_chunk_5(self): + self.test_simple_xml(chunk_size=5, flush=True) + +@@ -1651,6 +1655,8 @@ class XMLPullParserTest(unittest.TestCase): + + self.assert_event_tags(parser, [('end', 'doc')]) + ++ @unittest.skipIf(pyexpat.version_info < (2, 6, 0), ++ "Reparse deferral not defined for libexpat < 2.6.0") + def test_flush_reparse_deferral_disabled(self): + parser = ET.XMLPullParser(events=('start', 'end')) + +-- +2.44.0 + diff --git a/SOURCES/00422-fix-tests-for-xmlpullparser-with-expat-2-6-0.patch b/SOURCES/00422-fix-tests-for-xmlpullparser-with-expat-2-6-0.patch deleted file mode 100644 index af460d1..0000000 --- a/SOURCES/00422-fix-tests-for-xmlpullparser-with-expat-2-6-0.patch +++ /dev/null @@ -1,77 +0,0 @@ -From c9364e8727ea2426519a74593ab03ebcb0da72b8 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar -Date: Fri, 3 May 2024 14:17:48 +0200 -Subject: [PATCH] Expect failures in tests not working properly with expat with - a fixed CVE in RHEL - ---- - Lib/test/test_xml_etree.py | 53 ++++++++++++++++++++++---------------- - 1 file changed, 31 insertions(+), 22 deletions(-) - -diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py -index 7c346f2..24e0bb8 100644 ---- a/Lib/test/test_xml_etree.py -+++ b/Lib/test/test_xml_etree.py -@@ -1391,28 +1391,37 @@ class XMLPullParserTest(unittest.TestCase): - self.assertEqual([(action, elem.tag) for action, elem in events], - expected) - -- def test_simple_xml(self): -- for chunk_size in (None, 1, 5): -- with self.subTest(chunk_size=chunk_size): -- parser = ET.XMLPullParser() -- self.assert_event_tags(parser, []) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, []) -- self._feed(parser, -- "\n text\n", chunk_size) -- self.assert_event_tags(parser, [('end', 'element')]) -- self._feed(parser, "texttail\n", chunk_size) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, [ -- ('end', 'element'), -- ('end', 'empty-element'), -- ]) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, [('end', 'root')]) -- self.assertIsNone(parser.close()) -+ def test_simple_xml(self, chunk_size=None): -+ parser = ET.XMLPullParser() -+ self.assert_event_tags(parser, []) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, []) -+ self._feed(parser, -+ "\n text\n", chunk_size) -+ self.assert_event_tags(parser, [('end', 'element')]) -+ self._feed(parser, "texttail\n", chunk_size) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, [ -+ ('end', 'element'), -+ ('end', 'empty-element'), -+ ]) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, [('end', 'root')]) -+ self.assertIsNone(parser.close()) -+ -+ @unittest.expectedFailure -+ def test_simple_xml_chunk_1(self): -+ self.test_simple_xml(chunk_size=1) -+ -+ @unittest.expectedFailure -+ def test_simple_xml_chunk_5(self): -+ self.test_simple_xml(chunk_size=5) -+ -+ def test_simple_xml_chunk_22(self): -+ self.test_simple_xml(chunk_size=22) - - def test_feed_while_iterating(self): - parser = ET.XMLPullParser() --- -2.45.0 - diff --git a/SOURCES/00426-CVE-2023-6597.patch b/SOURCES/00426-CVE-2023-6597.patch deleted file mode 100644 index 0d41083..0000000 --- a/SOURCES/00426-CVE-2023-6597.patch +++ /dev/null @@ -1,215 +0,0 @@ -From 5585334d772b253a01a6730e8202ffb1607c3d25 Mon Sep 17 00:00:00 2001 -From: Serhiy Storchaka -Date: Thu, 7 Dec 2023 18:37:10 +0200 -Subject: [PATCH] [3.11] gh-91133: tempfile.TemporaryDirectory: fix symlink bug - in cleanup (GH-99930) (GH-112839) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 81c16cd94ec38d61aa478b9a452436dc3b1b524d) - -Co-authored-by: Søren Løvborg ---- - Lib/tempfile.py | 27 +++-- - Lib/test/test_tempfile.py | 111 +++++++++++++++++- - ...2-12-01-16-57-44.gh-issue-91133.LKMVCV.rst | 2 + - 3 files changed, 125 insertions(+), 15 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2022-12-01-16-57-44.gh-issue-91133.LKMVCV.rst - -diff --git a/Lib/tempfile.py b/Lib/tempfile.py -index aace11fa7b19b9..f59a63a7b45b36 100644 ---- a/Lib/tempfile.py -+++ b/Lib/tempfile.py -@@ -270,6 +270,22 @@ def _mkstemp_inner(dir, pre, suf, flags, output_type): - raise FileExistsError(_errno.EEXIST, - "No usable temporary file name found") - -+def _dont_follow_symlinks(func, path, *args): -+ # Pass follow_symlinks=False, unless not supported on this platform. -+ if func in _os.supports_follow_symlinks: -+ func(path, *args, follow_symlinks=False) -+ elif _os.name == 'nt' or not _os.path.islink(path): -+ func(path, *args) -+ -+def _resetperms(path): -+ try: -+ chflags = _os.chflags -+ except AttributeError: -+ pass -+ else: -+ _dont_follow_symlinks(chflags, path, 0) -+ _dont_follow_symlinks(_os.chmod, path, 0o700) -+ - - # User visible interfaces. - -@@ -863,17 +879,10 @@ def __init__(self, suffix=None, prefix=None, dir=None, - def _rmtree(cls, name, ignore_errors=False): - def onerror(func, path, exc_info): - if issubclass(exc_info[0], PermissionError): -- def resetperms(path): -- try: -- _os.chflags(path, 0) -- except AttributeError: -- pass -- _os.chmod(path, 0o700) -- - try: - if path != name: -- resetperms(_os.path.dirname(path)) -- resetperms(path) -+ _resetperms(_os.path.dirname(path)) -+ _resetperms(path) - - try: - _os.unlink(path) -diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py -index 1242ec7e3cc9a1..675edc8de9cca5 100644 ---- a/Lib/test/test_tempfile.py -+++ b/Lib/test/test_tempfile.py -@@ -1565,6 +1565,103 @@ def test_cleanup_with_symlink_to_a_directory(self): - "were deleted") - d2.cleanup() - -+ @os_helper.skip_unless_symlink -+ def test_cleanup_with_symlink_modes(self): -+ # cleanup() should not follow symlinks when fixing mode bits (#91133) -+ with self.do_create(recurse=0) as d2: -+ file1 = os.path.join(d2, 'file1') -+ open(file1, 'wb').close() -+ dir1 = os.path.join(d2, 'dir1') -+ os.mkdir(dir1) -+ for mode in range(8): -+ mode <<= 6 -+ with self.subTest(mode=format(mode, '03o')): -+ def test(target, target_is_directory): -+ d1 = self.do_create(recurse=0) -+ symlink = os.path.join(d1.name, 'symlink') -+ os.symlink(target, symlink, -+ target_is_directory=target_is_directory) -+ try: -+ os.chmod(symlink, mode, follow_symlinks=False) -+ except NotImplementedError: -+ pass -+ try: -+ os.chmod(symlink, mode) -+ except FileNotFoundError: -+ pass -+ os.chmod(d1.name, mode) -+ d1.cleanup() -+ self.assertFalse(os.path.exists(d1.name)) -+ -+ with self.subTest('nonexisting file'): -+ test('nonexisting', target_is_directory=False) -+ with self.subTest('nonexisting dir'): -+ test('nonexisting', target_is_directory=True) -+ -+ with self.subTest('existing file'): -+ os.chmod(file1, mode) -+ old_mode = os.stat(file1).st_mode -+ test(file1, target_is_directory=False) -+ new_mode = os.stat(file1).st_mode -+ self.assertEqual(new_mode, old_mode, -+ '%03o != %03o' % (new_mode, old_mode)) -+ -+ with self.subTest('existing dir'): -+ os.chmod(dir1, mode) -+ old_mode = os.stat(dir1).st_mode -+ test(dir1, target_is_directory=True) -+ new_mode = os.stat(dir1).st_mode -+ self.assertEqual(new_mode, old_mode, -+ '%03o != %03o' % (new_mode, old_mode)) -+ -+ @unittest.skipUnless(hasattr(os, 'chflags'), 'requires os.chflags') -+ @os_helper.skip_unless_symlink -+ def test_cleanup_with_symlink_flags(self): -+ # cleanup() should not follow symlinks when fixing flags (#91133) -+ flags = stat.UF_IMMUTABLE | stat.UF_NOUNLINK -+ self.check_flags(flags) -+ -+ with self.do_create(recurse=0) as d2: -+ file1 = os.path.join(d2, 'file1') -+ open(file1, 'wb').close() -+ dir1 = os.path.join(d2, 'dir1') -+ os.mkdir(dir1) -+ def test(target, target_is_directory): -+ d1 = self.do_create(recurse=0) -+ symlink = os.path.join(d1.name, 'symlink') -+ os.symlink(target, symlink, -+ target_is_directory=target_is_directory) -+ try: -+ os.chflags(symlink, flags, follow_symlinks=False) -+ except NotImplementedError: -+ pass -+ try: -+ os.chflags(symlink, flags) -+ except FileNotFoundError: -+ pass -+ os.chflags(d1.name, flags) -+ d1.cleanup() -+ self.assertFalse(os.path.exists(d1.name)) -+ -+ with self.subTest('nonexisting file'): -+ test('nonexisting', target_is_directory=False) -+ with self.subTest('nonexisting dir'): -+ test('nonexisting', target_is_directory=True) -+ -+ with self.subTest('existing file'): -+ os.chflags(file1, flags) -+ old_flags = os.stat(file1).st_flags -+ test(file1, target_is_directory=False) -+ new_flags = os.stat(file1).st_flags -+ self.assertEqual(new_flags, old_flags) -+ -+ with self.subTest('existing dir'): -+ os.chflags(dir1, flags) -+ old_flags = os.stat(dir1).st_flags -+ test(dir1, target_is_directory=True) -+ new_flags = os.stat(dir1).st_flags -+ self.assertEqual(new_flags, old_flags) -+ - @support.cpython_only - def test_del_on_collection(self): - # A TemporaryDirectory is deleted when garbage collected -@@ -1737,10 +1834,7 @@ def test_modes(self): - d.cleanup() - self.assertFalse(os.path.exists(d.name)) - -- @unittest.skipUnless(hasattr(os, 'chflags'), 'requires os.chflags') -- def test_flags(self): -- flags = stat.UF_IMMUTABLE | stat.UF_NOUNLINK -- -+ def check_flags(self, flags): - # skip the test if these flags are not supported (ex: FreeBSD 13) - filename = os_helper.TESTFN - try: -@@ -1749,13 +1843,18 @@ def test_flags(self): - os.chflags(filename, flags) - except OSError as exc: - # "OSError: [Errno 45] Operation not supported" -- self.skipTest(f"chflags() doesn't support " -- f"UF_IMMUTABLE|UF_NOUNLINK: {exc}") -+ self.skipTest(f"chflags() doesn't support flags " -+ f"{flags:#b}: {exc}") - else: - os.chflags(filename, 0) - finally: - os_helper.unlink(filename) - -+ @unittest.skipUnless(hasattr(os, 'chflags'), 'requires os.chflags') -+ def test_flags(self): -+ flags = stat.UF_IMMUTABLE | stat.UF_NOUNLINK -+ self.check_flags(flags) -+ - d = self.do_create(recurse=3, dirs=2, files=2) - with d: - # Change files and directories flags recursively. -diff --git a/Misc/NEWS.d/next/Library/2022-12-01-16-57-44.gh-issue-91133.LKMVCV.rst b/Misc/NEWS.d/next/Library/2022-12-01-16-57-44.gh-issue-91133.LKMVCV.rst -new file mode 100644 -index 00000000000000..7991048fc48e03 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2022-12-01-16-57-44.gh-issue-91133.LKMVCV.rst -@@ -0,0 +1,2 @@ -+Fix a bug in :class:`tempfile.TemporaryDirectory` cleanup, which now no longer -+dereferences symlinks when working around file system permission errors. diff --git a/SOURCES/00431-CVE-2024-4032.patch b/SOURCES/00431-CVE-2024-4032.patch index 181ed15..62427f2 100644 --- a/SOURCES/00431-CVE-2024-4032.patch +++ b/SOURCES/00431-CVE-2024-4032.patch @@ -1,8 +1,8 @@ -From ba431579efdcbaed7a96f2ac4ea0775879a332fb Mon Sep 17 00:00:00 2001 +From 2963bbab04546f5aef6a37a3b027ae7a484deec1 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 25 Apr 2024 14:45:48 +0200 -Subject: [PATCH] [3.11] gh-113171: gh-65056: Fix "private" (non-global) IP - address ranges (GH-113179) (GH-113186) (GH-118177) (#118227) +Subject: [PATCH] gh-113171: gh-65056: Fix "private" (non-global) IP address + ranges (GH-113179) (GH-113186) (GH-118177) (#118227) --- Doc/library/ipaddress.rst | 43 +++++++- @@ -14,7 +14,7 @@ Subject: [PATCH] [3.11] gh-113171: gh-65056: Fix "private" (non-global) IP create mode 100644 Misc/NEWS.d/next/Library/2024-03-14-01-38-44.gh-issue-113171.VFnObz.rst diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst -index 03dc956cd1352a..f57fa15aa5b930 100644 +index 03dc956..f57fa15 100644 --- a/Doc/library/ipaddress.rst +++ b/Doc/library/ipaddress.rst @@ -178,18 +178,53 @@ write code that handles both IP versions correctly. Address objects are @@ -76,7 +76,7 @@ index 03dc956cd1352a..f57fa15aa5b930 100644 ``True`` if the address is unspecified. See :RFC:`5735` (for IPv4) diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst -index f670fa1f097aa1..42b61c75c7e621 100644 +index f670fa1..42b61c7 100644 --- a/Doc/whatsnew/3.11.rst +++ b/Doc/whatsnew/3.11.rst @@ -2727,3 +2727,12 @@ OpenSSL @@ -93,10 +93,10 @@ index f670fa1f097aa1..42b61c75c7e621 100644 +* Fixed ``is_global`` and ``is_private`` behavior in ``IPv4Address``, + ``IPv6Address``, ``IPv4Network`` and ``IPv6Network``. diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py -index 16ba16cd7de49a..567beb37e06318 100644 +index 16ba16c..567beb3 100644 --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py -@@ -1086,7 +1086,11 @@ def is_private(self): +@@ -1086,7 +1086,11 @@ class _BaseNetwork(_IPAddressBase): """ return any(self.network_address in priv_network and self.broadcast_address in priv_network @@ -109,7 +109,7 @@ index 16ba16cd7de49a..567beb37e06318 100644 @property def is_global(self): -@@ -1333,18 +1337,41 @@ def is_reserved(self): +@@ -1333,18 +1337,41 @@ class IPv4Address(_BaseV4, _BaseAddress): @property @functools.lru_cache() def is_private(self): @@ -185,7 +185,7 @@ index 16ba16cd7de49a..567beb37e06318 100644 _reserved_network = IPv4Network('240.0.0.0/4') _unspecified_address = IPv4Address('0.0.0.0') -@@ -2010,27 +2044,42 @@ def is_site_local(self): +@@ -2010,27 +2044,42 @@ class IPv6Address(_BaseV6, _BaseAddress): @property @functools.lru_cache() def is_private(self): @@ -273,10 +273,10 @@ index 16ba16cd7de49a..567beb37e06318 100644 IPv6Network('::/8'), IPv6Network('100::/8'), IPv6Network('200::/7'), IPv6Network('400::/6'), diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py -index fc27628af17f8d..16c34163a007a2 100644 +index fc27628..16c3416 100644 --- a/Lib/test/test_ipaddress.py +++ b/Lib/test/test_ipaddress.py -@@ -2269,6 +2269,10 @@ def testReservedIpv4(self): +@@ -2269,6 +2269,10 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual(True, ipaddress.ip_address( '172.31.255.255').is_private) self.assertEqual(False, ipaddress.ip_address('172.32.0.0').is_private) @@ -287,7 +287,7 @@ index fc27628af17f8d..16c34163a007a2 100644 self.assertEqual(True, ipaddress.ip_address('169.254.100.200').is_link_local) -@@ -2294,6 +2298,7 @@ def testPrivateNetworks(self): +@@ -2294,6 +2298,7 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual(True, ipaddress.ip_network("169.254.0.0/16").is_private) self.assertEqual(True, ipaddress.ip_network("172.16.0.0/12").is_private) self.assertEqual(True, ipaddress.ip_network("192.0.0.0/29").is_private) @@ -295,7 +295,7 @@ index fc27628af17f8d..16c34163a007a2 100644 self.assertEqual(True, ipaddress.ip_network("192.0.0.170/31").is_private) self.assertEqual(True, ipaddress.ip_network("192.0.2.0/24").is_private) self.assertEqual(True, ipaddress.ip_network("192.168.0.0/16").is_private) -@@ -2310,8 +2315,8 @@ def testPrivateNetworks(self): +@@ -2310,8 +2315,8 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual(True, ipaddress.ip_network("::/128").is_private) self.assertEqual(True, ipaddress.ip_network("::ffff:0:0/96").is_private) self.assertEqual(True, ipaddress.ip_network("100::/64").is_private) @@ -305,7 +305,7 @@ index fc27628af17f8d..16c34163a007a2 100644 self.assertEqual(True, ipaddress.ip_network("2001:db8::/32").is_private) self.assertEqual(True, ipaddress.ip_network("2001:10::/28").is_private) self.assertEqual(True, ipaddress.ip_network("fc00::/7").is_private) -@@ -2390,6 +2395,20 @@ def testReservedIpv6(self): +@@ -2390,6 +2395,20 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual(True, ipaddress.ip_address('0::0').is_unspecified) self.assertEqual(False, ipaddress.ip_address('::1').is_unspecified) @@ -328,7 +328,7 @@ index fc27628af17f8d..16c34163a007a2 100644 self.assertEqual(True, ipaddress.ip_network('4000::1/128').is_reserved) diff --git a/Misc/NEWS.d/next/Library/2024-03-14-01-38-44.gh-issue-113171.VFnObz.rst b/Misc/NEWS.d/next/Library/2024-03-14-01-38-44.gh-issue-113171.VFnObz.rst new file mode 100644 -index 00000000000000..f9a72473be4e2c +index 0000000..f9a7247 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-03-14-01-38-44.gh-issue-113171.VFnObz.rst @@ -0,0 +1,9 @@ @@ -341,3 +341,6 @@ index 00000000000000..f9a72473be4e2c + +Also in the corresponding :class:`ipaddress.IPv4Network` and :class:`ipaddress.IPv6Network` +attributes. +-- +2.45.2 + diff --git a/SOURCES/Python-3.11.7.tar.xz.asc b/SOURCES/Python-3.11.7.tar.xz.asc deleted file mode 100644 index 5d3dcbe..0000000 --- a/SOURCES/Python-3.11.7.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmVuFigACgkQ/+h0BBaL -2EeHPg/+LU5xs2ZDrQogDcH+A1v8RyursiggypdM5hXTrsFsTCIk4iekcI9xkhG1 -ltNX4UuCe5PUEbTgtaWP0ncXARrUnPCoQaQ1sHVDTYoHegancsk+sXZc1JM7qr0p -Y4Ig6mKjuHFMXCInQSI2GaH4t5r4Z1jGk/PGrecIHOPJgqfA/6Z3TBF5N+y3jEvS -2QazMB298q4RDhh9m3REe8LwFPHDlfw9eRohv0MB8xygg9KtxhLZrN7gLBQZvKGD -ihNw6EgJj5OZ0dvwKCCXnlZuwknuJW7vAOPHhYeenPdVdYCGoRSyN7JdD07L+5AG -O14l2rqZrz5Eu28by+kAUrcPYAfAXekw1PmtT3HSd9U/nqnUiTkkJcjyGG/e3cjJ -sUDKMNCSBq0G7j5DB3bB6VHkZjVuz+T+iR5QdfJ4kI2pYSuE/rUj1rhkUXApYsHl -7Wff0QbOW6QT1wCtQcMpJSzkTDVJVYxiqrko/ihlOhphDHYLdOIGOrxWAUwc06x/ -BhJD6tM1kEVZvifoJp1OsNwDzZ/Ku6CUs05E1vWxdeNVeANyKAgCZ5hOVmhnv866 -11zfgo/znRsMzMIyJuy0bhO0C6omVLzzfhipAbZM2jDorn37xxV0v/I0pceNtLrp -YR7Tjs7+Ihe6/oItjW53j9T7ANdgQ1RVDg98lKlPFNL+hxfctwY= -=0Pkd ------END PGP SIGNATURE----- diff --git a/SOURCES/Python-3.11.9.tar.xz.asc b/SOURCES/Python-3.11.9.tar.xz.asc new file mode 100644 index 0000000..c79d99b --- /dev/null +++ b/SOURCES/Python-3.11.9.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmYNMEcACgkQ/+h0BBaL +2EeHhxAAuuIM9bl0dgAWOjbgRjCeXR8aFdfcI4dkO7bZrUy8eKbM+XCvPUUvloRJ +vzGkxYyTmI4kcNPOHfscUwH7AVVij8nGv7WeaXBUZGIXNwfHwvqOxvYvSsNNNFnr +70yJB7Df8/2s0XqFx3X1aWcnyMDerWKpfJ/VI/NPmCVxkYXGshuTTSFcCMTSFBQB +sNrIb5NWAsBF4R85uRQDlCg1AoyaKOdJNQkPo1Nrjol1ExJ+MHE7+E+QL9pQkUWG +SBISPUhJySBAegxolw6YR5dz1L4nukueQDJz3NizUeQGDvH7h1ImY8cypRi44U61 +SUUHhBfmUBiC2dS/tTQawySULWcgbkV4GJ6cJZfDd95uffd4S/GDJCa2wCE2UTlA +XzQHwbcnIeoL064gX7ruBuFHJ6n/Oz7nZkFqbH2aqLTAWgLiUq31xH3HY734sL6X +zIJQRbcK1EM7cnNjKMVPlnHpAeKbsbHbU6yzWwZ7reIoyWlZ7vEGrfXO7Kmul93K +wVaWu0AiOY566ugekdDx4cKV+FQN6oppAN63yTfPJ2Ddcmxs4KNrtozw9OAgDTPE +GTPFD6V1CMuyQj/jOpAmbj+4bRD4Mx3u2PSittvrIeopxrXPsGGSZ5kdl62Xa2+A +DzKyYNXzcmxqS9lGdFb+OWCTyAIXxwZrdz1Q61g5xDvR9z/wZiI= +=Br9/ +-----END PGP SIGNATURE----- diff --git a/SPECS/python3.11.spec b/SPECS/python3.11.spec index 67e48db..011e2e4 100644 --- a/SPECS/python3.11.spec +++ b/SPECS/python3.11.spec @@ -16,11 +16,11 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well -%global general_version %{pybasever}.7 +%global general_version %{pybasever}.9 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist}.6 +Release: 7%{?dist}.1 License: Python @@ -63,7 +63,7 @@ License: Python # If the rpmwheels condition is disabled, we use the bundled wheel packages # from Python with the versions below. # This needs to be manually updated when we update Python. -%global pip_version 23.2.1 +%global pip_version 24.0 %global setuptools_version 65.5.0 # Expensive optimizations (mainly, profile-guided optimizations) @@ -145,6 +145,13 @@ License: Python %global py_INSTSONAME_optimized libpython%{LDVERSION_optimized}.so.%{py_SOVERSION} %global py_INSTSONAME_debug libpython%{LDVERSION_debug}.so.%{py_SOVERSION} +# The -O flag for the compiler, optimized builds +# https://fedoraproject.org/wiki/Changes/Python_built_with_gcc_O3 +%global optflags_optimized -O3 +# The -O flag for the compiler, debug builds +# -Wno-cpp avoids some warnings with -O0 +%global optflags_debug -O0 -Wno-cpp + # Disable automatic bytecompilation. The python3 binary is not yet be # available in /usr/bin when Python is built. Also, the bytecompilation fails # on files that test invalid syntax. @@ -357,22 +364,15 @@ Patch397: 00397-tarfile-filter.patch Patch415: 00415-cve-2023-27043-gh-102988-reject-malformed-addresses-in-email-parseaddr-111116.patch # 00422 # -# Fix tests for XMLPullParser with Expat 2.6.0 -# -# Feeding the parser by too small chunks defers parsing to prevent -# CVE-2023-52425. Future versions of Expat may be more reactive. -Patch422: 00422-fix-tests-for-xmlpullparser-with-expat-2-6-0.patch - -# 00426 # -# CVE-2023-6597: Path traversal on tempfile.TemporaryDirectory -# Fixed upstream: -# https://github.com/python/cpython/commit/5585334d772b253a01a6730e8202ffb1607c3d25 -# Tracking bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2276518 -Patch426: 00426-CVE-2023-6597.patch +# Fix the test suite for releases of expat < 2.6.0 +# which backport the CVE-2023-52425 fix. +# Downstream only. +Patch422: 00422-fix-expat-tests.patch # 00431 # -# CVE-2024-4032: incorrect IPv4 and IPv6 private ranges -# Upstream issue: https://github.com/python/cpython/issues/113171 +# Security fix for CVE-2024-4032: incorrect IPv4 and IPv6 private ranges +# Resolved upstream: https://github.com/python/cpython/issues/113171 +# Tracking bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2292921 Patch431: 00431-CVE-2024-4032.patch # 00435 # d33a3c90daa3d5d2d7e67f6e9264e5438d9608a0 @@ -773,6 +773,7 @@ BuildPython() { ConfName=$1 ExtraConfigArgs=$2 MoreCFlags=$3 + MoreCFlagsNodist=$4 # Each build is done in its own directory ConfDir=build/$ConfName @@ -812,7 +813,7 @@ BuildPython() { $ExtraConfigArgs \ %{nil} -%global flags_override EXTRA_CFLAGS="$MoreCFlags" CFLAGS_NODIST="$CFLAGS_NODIST $MoreCFlags" +%global flags_override EXTRA_CFLAGS="$MoreCFlags" CFLAGS_NODIST="$CFLAGS_NODIST $MoreCFlags $MoreCFlagsNodist" %if %{without bootstrap} # Regenerate generated files (needs python3) @@ -835,12 +836,14 @@ BuildPython() { # See also: https://bugzilla.redhat.com/show_bug.cgi?id=1818857 BuildPython debug \ "--without-ensurepip --with-pydebug" \ - "-O0 -Wno-cpp" + "%{optflags_debug}" \ + "" %endif # with debug_build BuildPython optimized \ "--without-ensurepip %{optimizations_flag}" \ - "" + "" \ + "%{optflags_optimized}" # ====================================================== # Installing the built code: @@ -939,7 +942,7 @@ EOF %if %{with debug_build} InstallPython debug \ %{py_INSTSONAME_debug} \ - -O0 \ + "%{optflags_debug}" \ %{LDVERSION_debug} %endif # with debug_build @@ -1678,30 +1681,38 @@ CheckPython optimized # ====================================================== %changelog -* Wed Oct 9 2024 Kiran Belle - 3.11.7-1.6 +* Wed Sep 11 2024 Lumír Balhar - 3.11.9-7.1 - Security fix for CVE-2024-6232 -Resolves: RHEL-57411 +Resolves: RHEL-57410 -* Fri Aug 23 2024 Charalampos Stratakis - 3.11.7-1.5 +* Fri Aug 23 2024 Charalampos Stratakis - 3.11.9-7 - Security fix for CVE-2024-8088 -Resolves: RHEL-55960 +Resolves: RHEL-55959 -* Thu Aug 15 2024 Charalampos Stratakis - 3.11.7-1.4 +* Thu Aug 15 2024 Charalampos Stratakis - 3.11.9-6 - Security fix for CVE-2024-6923 -Resolves: RHEL-53037 +Resolves: RHEL-53038 + +* Thu Jul 25 2024 Charalampos Stratakis - 3.11.9-5 +- Properly propagate the optimization flags to C extensions + +* Thu Jul 18 2024 Charalampos Stratakis - 3.11.9-4 +- Build Python with -O3 +- https://fedoraproject.org/wiki/Changes/Python_built_with_gcc_O3 -* Thu Jul 04 2024 Lumír Balhar - 3.11.7-1.3 +* Thu Jul 18 2024 Charalampos Stratakis - 3.11.9-3 - Security fix for CVE-2024-4032 -Resolves: RHEL-44097 +Resolves: RHEL-44099 -* Tue Jun 11 2024 Charalampos Stratakis - 3.11.7-1.2 +* Tue Jun 11 2024 Charalampos Stratakis - 3.11.9-2 - Enable importing of hash-based .pyc files under FIPS mode -Resolves: RHEL-40785 +Resolves: RHEL-40779 -* Thu May 16 2024 Charalampos Stratakis - 3.11.7-1.1 -- Security fix for CVE-2023-6597 -- Fix tests for XMLPullParser with Expat with fixed CVE -Resolves: RHEL-33884 +* Mon Apr 22 2024 Charalampos Stratakis - 3.11.9-1 +- Rebase to 3.11.9 +- Security fixes for CVE-2023-6597 and CVE-2024-0450 +- Fix expat tests for the latest expat security release +Resolves: RHEL-33677, RHEL-33689 * Mon Jan 22 2024 Charalampos Stratakis - 3.11.7-1 - Rebase to 3.11.7