From 3499a956883fea1518153ea9db38a2dc97dc8ccf Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Wed, 15 Nov 2023 01:22:29 +0000
Subject: [PATCH] import python3.11-3.11.5-1.el8_9
---
.python3.11.checksum | 2 +-
.python3.11.metadata | 3 +-
SOURCES/00397-tarfile-filter.patch | 251 +++++++++++++++++++++++++++
SOURCES/Python-3.11.5.tar.xz.asc | 16 ++
SOURCES/check-pyc-timestamps.py | 1 +
SOURCES/import_all_modules_py3_11.py | 171 ++++++++++++++++++
SOURCES/macros.python3.11 | 2 +-
SPECS/python3.11.spec | 70 +++++---
8 files changed, 485 insertions(+), 31 deletions(-)
create mode 100644 SOURCES/00397-tarfile-filter.patch
create mode 100644 SOURCES/Python-3.11.5.tar.xz.asc
create mode 100644 SOURCES/import_all_modules_py3_11.py
diff --git a/.python3.11.checksum b/.python3.11.checksum
index 99cdb47..82d16af 100644
--- a/.python3.11.checksum
+++ b/.python3.11.checksum
@@ -1 +1 @@
-9ad7c1d8ef8775c3bc2d9bf6ec8726c6d5e03859477adead430d5b601aaed2ea
+e5feea809aad509f99943b68d44ac7c89eb943fbefb0f0ced5050675a6d1d16e
diff --git a/.python3.11.metadata b/.python3.11.metadata
index b1ee8e0..7802c5c 100644
--- a/.python3.11.metadata
+++ b/.python3.11.metadata
@@ -1 +1,2 @@
-29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af SOURCES/Python-3.11.2.tar.xz
+85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f SOURCES/Python-3.11.5.tar.xz
+fb28243ffeb9725b14b60586a9a123682a89604c025b7a9d4bcdeb67078203c6 SOURCES/pgp_keys.asc
diff --git a/SOURCES/00397-tarfile-filter.patch b/SOURCES/00397-tarfile-filter.patch
new file mode 100644
index 0000000..3c4ebf4
--- /dev/null
+++ b/SOURCES/00397-tarfile-filter.patch
@@ -0,0 +1,251 @@
+From 8b70605b594b3831331a9340ba764ff751871612 Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <encukou@gmail.com>
+Date: Mon, 6 Mar 2023 17:24:24 +0100
+Subject: [PATCH] CVE-2007-4559, PEP-706: Add filters for tarfile extraction
+ (downstream)
+
+Add and test RHEL-specific ways of configuring the default behavior: environment
+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(-)
+
+diff --git a/Lib/tarfile.py b/Lib/tarfile.py
+index 130b5e0..3b7d8d5 100755
+--- a/Lib/tarfile.py
++++ b/Lib/tarfile.py
+@@ -72,6 +72,13 @@ __all__ = ["TarFile", "TarInfo", "is_tarfile", "TarError", "ReadError",
+ "ENCODING", "USTAR_FORMAT", "GNU_FORMAT", "PAX_FORMAT",
+ "DEFAULT_FORMAT", "open"]
+
++# If true, use the safer (but backwards-incompatible) 'tar' extraction filter,
++# rather than 'fully_trusted', by default.
++# The emitted warning is changed to match.
++_RH_SAFER_DEFAULT = True
++
++# System-wide configuration file
++_CONFIG_FILENAME = '/etc/python/tarfile.cfg'
+
+ #---------------------------------------------------------
+ # tar constants
+@@ -2211,6 +2218,41 @@ class TarFile(object):
+ if filter is None:
+ filter = self.extraction_filter
+ if filter is None:
++ name = os.environ.get('PYTHON_TARFILE_EXTRACTION_FILTER')
++ if name is None:
++ try:
++ file = bltn_open(_CONFIG_FILENAME)
++ except FileNotFoundError:
++ pass
++ else:
++ import configparser
++ conf = configparser.ConfigParser(
++ interpolation=None,
++ comment_prefixes=('#', ),
++ )
++ with file:
++ conf.read_file(file)
++ name = conf.get('tarfile',
++ 'PYTHON_TARFILE_EXTRACTION_FILTER',
++ fallback='')
++ if name:
++ try:
++ filter = _NAMED_FILTERS[name]
++ except KeyError:
++ raise ValueError(f"filter {filter!r} not found") from None
++ self.extraction_filter = filter
++ return filter
++ if _RH_SAFER_DEFAULT:
++ warnings.warn(
++ 'The default behavior of tarfile extraction has been '
++ + 'changed to disallow common exploits '
++ + '(including CVE-2007-4559). '
++ + 'By default, absolute/parent paths are disallowed '
++ + 'and some mode bits are cleared. '
++ + 'See https://access.redhat.com/articles/7004769 '
++ + 'for more details.',
++ RuntimeWarning)
++ return tar_filter
+ return fully_trusted_filter
+ if isinstance(filter, str):
+ raise TypeError(
+diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
+index 9bf4145..f247b82 100644
+--- a/Lib/test/test_shutil.py
++++ b/Lib/test/test_shutil.py
+@@ -1665,7 +1665,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')
+- with warnings_helper.check_no_warnings(self):
++ with warnings_helper.check_warnings(
++ ('.*CVE-2007-4559', RuntimeWarning)):
+ self.check_unpack_archive(format)
+
+ def test_unpack_archive_tar(self):
+diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
+index cdea033..4724285 100644
+--- a/Lib/test/test_tarfile.py
++++ b/Lib/test/test_tarfile.py
+@@ -2,7 +2,7 @@ import sys
+ import os
+ import io
+ from hashlib import sha256
+-from contextlib import contextmanager
++from contextlib import contextmanager, ExitStack
+ from random import Random
+ import pathlib
+ import shutil
+@@ -2999,7 +2999,11 @@ class NoneInfoExtractTests(ReadTest):
+ tar = tarfile.open(tarname, mode='r', encoding="iso8859-1")
+ cls.control_dir = pathlib.Path(TEMPDIR) / "extractall_ctrl"
+ tar.errorlevel = 0
+- tar.extractall(cls.control_dir, filter=cls.extraction_filter)
++ with ExitStack() as cm:
++ if cls.extraction_filter is None:
++ cm.enter_context(warnings.catch_warnings())
++ warnings.simplefilter(action="ignore", category=RuntimeWarning)
++ tar.extractall(cls.control_dir, filter=cls.extraction_filter)
+ tar.close()
+ cls.control_paths = set(
+ p.relative_to(cls.control_dir)
+@@ -3674,7 +3678,8 @@ class TestExtractionFilters(unittest.TestCase):
+ """Ensure the default filter does not warn (like in 3.12)"""
+ with ArchiveMaker() as arc:
+ arc.add('foo')
+- with warnings_helper.check_no_warnings(self):
++ with warnings_helper.check_warnings(
++ ('.*CVE-2007-4559', RuntimeWarning)):
+ with self.check_context(arc.open(), None):
+ self.expect_file('foo')
+
+@@ -3844,6 +3849,123 @@ class TestExtractionFilters(unittest.TestCase):
+ 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
++
++ return a triple with:
++ - temporary directory
++ - EnvironmentVarGuard()
++ - a test archive for use with check_* methods below
++
++ If config_lines is given, write them to the config file. Otherwise
++ the config file is missing.
++ """
++ tempdir = pathlib.Path(TEMPDIR) / 'tmp'
++ configfile = tempdir / 'tarfile.cfg'
++ with ArchiveMaker() as arc:
++ arc.add('good')
++ arc.add('ugly', symlink_to='/etc/passwd')
++ arc.add('../bad')
++ with (
++ os_helper.temp_dir(tempdir),
++ support.swap_attr(tarfile, '_CONFIG_FILENAME', str(configfile)),
++ os_helper.EnvironmentVarGuard() as env,
++ arc.open() as tar,
++ ):
++ if config_lines is not None:
++ with configfile.open('w') as f:
++ for line in config_lines:
++ print(line, file=f)
++ yield tempdir, env, tar
++
++ def check_rh_default_behavior(self, tar, tempdir):
++ """Check RH default: warn and refuse to extract dangerous files."""
++ with (
++ warnings_helper.check_warnings(
++ ('.*CVE-2007-4559', RuntimeWarning)),
++ self.assertRaises(tarfile.OutsideDestinationError),
++ ):
++ tar.extractall(tempdir / 'outdir')
++
++ def check_trusted_default(self, tar, tempdir):
++ """Check 'fully_trusted' is configured as the default filter."""
++ with (
++ warnings_helper.check_no_warnings(self),
++ ):
++ tar.extractall(tempdir / 'outdir')
++ self.assertTrue((tempdir / 'outdir/good').exists())
++ self.assertEqual((tempdir / 'outdir/ugly').readlink(),
++ pathlib.Path('/etc/passwd'))
++ self.assertTrue((tempdir / 'bad').exists())
++
++ def test_rh_default_no_conf(self):
++ with self.rh_config_context() as (tempdir, env, tar):
++ self.check_rh_default_behavior(tar, tempdir)
++
++ def test_rh_default_from_file(self):
++ lines = ['[tarfile]', 'PYTHON_TARFILE_EXTRACTION_FILTER=fully_trusted']
++ with self.rh_config_context(lines) as (tempdir, env, tar):
++ self.check_trusted_default(tar, tempdir)
++
++ def test_rh_empty_config_file(self):
++ """Empty config file -> default behavior"""
++ lines = []
++ with self.rh_config_context(lines) as (tempdir, env, tar):
++ self.check_rh_default_behavior(tar, tempdir)
++
++ def test_empty_config_section(self):
++ """Empty section in config file -> default behavior"""
++ lines = ['[tarfile]']
++ with self.rh_config_context(lines) as (tempdir, env, tar):
++ self.check_rh_default_behavior(tar, tempdir)
++
++ def test_rh_default_empty_config_option(self):
++ """Empty option value in config file -> default behavior"""
++ lines = ['[tarfile]', 'PYTHON_TARFILE_EXTRACTION_FILTER=']
++ with self.rh_config_context(lines) as (tempdir, env, tar):
++ self.check_rh_default_behavior(tar, tempdir)
++
++ def test_bad_config_option(self):
++ """Bad option value in config file -> ValueError"""
++ lines = ['[tarfile]', 'PYTHON_TARFILE_EXTRACTION_FILTER=unknown!']
++ with self.rh_config_context(lines) as (tempdir, env, tar):
++ with self.assertRaises(ValueError):
++ tar.extractall(tempdir / 'outdir')
++
++ def test_default_from_envvar(self):
++ with self.rh_config_context() as (tempdir, env, tar):
++ env['PYTHON_TARFILE_EXTRACTION_FILTER'] = 'fully_trusted'
++ self.check_trusted_default(tar, tempdir)
++
++ def test_empty_envvar(self):
++ """Empty env variable -> default behavior"""
++ with self.rh_config_context() as (tempdir, env, tar):
++ env['PYTHON_TARFILE_EXTRACTION_FILTER'] = ''
++ self.check_rh_default_behavior(tar, tempdir)
++
++ def test_bad_envvar(self):
++ with self.rh_config_context() as (tempdir, env, tar):
++ env['PYTHON_TARFILE_EXTRACTION_FILTER'] = 'unknown!'
++ with self.assertRaises(ValueError):
++ tar.extractall(tempdir / 'outdir')
++
++ def test_envvar_overrides_file(self):
++ lines = ['[tarfile]', 'PYTHON_TARFILE_EXTRACTION_FILTER=data']
++ with self.rh_config_context(lines) as (tempdir, env, tar):
++ env['PYTHON_TARFILE_EXTRACTION_FILTER'] = 'fully_trusted'
++ self.check_trusted_default(tar, tempdir)
++
++ def test_monkeypatch_overrides_envvar(self):
++ with self.rh_config_context(None) as (tempdir, env, tar):
++ env['PYTHON_TARFILE_EXTRACTION_FILTER'] = 'data'
++ with support.swap_attr(
++ tarfile.TarFile, 'extraction_filter',
++ staticmethod(tarfile.fully_trusted_filter)
++ ):
++ self.check_trusted_default(tar, tempdir)
++
++
+ def setUpModule():
+ os_helper.unlink(TEMPDIR)
+ os.makedirs(TEMPDIR)
+--
+2.41.0
+
diff --git a/SOURCES/Python-3.11.5.tar.xz.asc b/SOURCES/Python-3.11.5.tar.xz.asc
new file mode 100644
index 0000000..aa1a63d
--- /dev/null
+++ b/SOURCES/Python-3.11.5.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmTnS9sACgkQ/+h0BBaL
+2EeG8g//Q6EC79SSFl4BPb064d8X1q8agfLN+D07N6ULsaOL1baOClLbMxiCgquQ
+R1CVzEXc0osL25Xw/7rTIBO0tCSS2yNcQ3GMuetBO4wfofDvs9V2ydaVQdrIHEQm
+OTOveioF9TOaQ/zozi9Hecl4RY289kCD64sWNkwPYBJzO9KQD/UGRS/b5a4CGKyP
+GSQEFdfevYsuLxLtwNh1z8af1LKRGhuWoZOBhDgpz4foH4EQdz80sssXzm2vG3tS
+hAeniPphjZyRfl8kC1C86M/hH08S3h4bf/LF/OQ0OYUrwOquqOsLlz03XzJ+COGK
+nBa/CGsFrxeby2oI/XF8YZrFzt9LKyWYc2p+AIU+u2EnYwOmAkrE4QaczqOV8ldD
+UvfZLTeMVG/Q6JGkNS/OyM3SZoVKDdGJlg5yVAQtbQjdsB5QjVDcysLhhZ+qnuJv
+pnQ6anbbX5r4X4ji/2Uar5cwO/jf7QenTKLtgGY67Q2oRE20w6F5rbYHEdO4a4MM
+OkI/0pUaU5MGRJfowwtcD5AbWPKo1XXqw2UY8p+biEaVQOj+kWhoB8YA5Qz1utHJ
+GiPP69oDIjfn3sPMxB/C1pBdB/m3i8za58b+G3aYtAWWP1q0abaHqPusACotvxPp
+3IvB3ryLlTyUYqqTiDp9wgYh2Nr+a9b6i6yW0ptcdycnzDWC1/E=
+=Lzjg
+-----END PGP SIGNATURE-----
diff --git a/SOURCES/check-pyc-timestamps.py b/SOURCES/check-pyc-timestamps.py
index 91af4fd..5b4c809 100644
--- a/SOURCES/check-pyc-timestamps.py
+++ b/SOURCES/check-pyc-timestamps.py
@@ -16,6 +16,7 @@ LEVELS = (None, 1, 2)
# list of globs of test and other files that we expect not to have bytecode
not_compiled = [
'/usr/bin/*',
+ '/usr/lib/rpm/redhat/*',
'*/test/bad_coding.py',
'*/test/bad_coding2.py',
'*/test/badsyntax_*.py',
diff --git a/SOURCES/import_all_modules_py3_11.py b/SOURCES/import_all_modules_py3_11.py
new file mode 100644
index 0000000..3930236
--- /dev/null
+++ b/SOURCES/import_all_modules_py3_11.py
@@ -0,0 +1,171 @@
+'''Script to perform import of each module given to %%py_check_import
+'''
+import argparse
+import importlib
+import fnmatch
+import os
+import re
+import site
+import sys
+
+from contextlib import contextmanager
+from pathlib import Path
+
+
+def read_modules_files(file_paths):
+ '''Read module names from the files (modules must be newline separated).
+
+ Return the module names list or, if no files were provided, an empty list.
+ '''
+
+ if not file_paths:
+ return []
+
+ modules = []
+ for file in file_paths:
+ file_contents = file.read_text()
+ modules.extend(file_contents.split())
+ return modules
+
+
+def read_modules_from_cli(argv):
+ '''Read module names from command-line arguments (space or comma separated).
+
+ Return the module names list.
+ '''
+
+ if not argv:
+ return []
+
+ # %%py3_check_import allows to separate module list with comma or whitespace,
+ # we need to unify the output to a list of particular elements
+ modules_as_str = ' '.join(argv)
+ modules = re.split(r'[\s,]+', modules_as_str)
+ # Because of shell expansion in some less typical cases it may happen
+ # that a trailing space will occur at the end of the list.
+ # Remove the empty items from the list before passing it further
+ modules = [m for m in modules if m]
+ return modules
+
+
+def filter_top_level_modules_only(modules):
+ '''Filter out entries with nested modules (containing dot) ie. 'foo.bar'.
+
+ Return the list of top-level modules.
+ '''
+
+ return [module for module in modules if '.' not in module]
+
+
+def any_match(text, globs):
+ '''Return True if any of given globs fnmatchcase's the given text.'''
+
+ return any(fnmatch.fnmatchcase(text, g) for g in globs)
+
+
+def exclude_unwanted_module_globs(globs, modules):
+ '''Filter out entries which match the either of the globs given as argv.
+
+ Return the list of filtered modules.
+ '''
+
+ return [m for m in modules if not any_match(m, globs)]
+
+
+def read_modules_from_all_args(args):
+ '''Return a joined list of modules from all given command-line arguments.
+ '''
+
+ modules = read_modules_files(args.filename)
+ modules.extend(read_modules_from_cli(args.modules))
+ if args.exclude:
+ modules = exclude_unwanted_module_globs(args.exclude, modules)
+
+ if args.top_level:
+ modules = filter_top_level_modules_only(modules)
+
+ # Error when someone accidentally managed to filter out everything
+ if len(modules) == 0:
+ raise ValueError('No modules to check were left')
+
+ return modules
+
+
+def import_modules(modules):
+ '''Procedure to perform import check for each module name from the given list of modules.
+ '''
+
+ for module in modules:
+ print('Check import:', module, file=sys.stderr)
+ importlib.import_module(module)
+
+
+def argparser():
+ parser = argparse.ArgumentParser(
+ description='Generate list of all importable modules for import check.'
+ )
+ parser.add_argument(
+ 'modules', nargs='*',
+ help=('Add modules to check the import (space or comma separated).'),
+ )
+ parser.add_argument(
+ '-f', '--filename', action='append', type=Path,
+ help='Add importable module names list from file.',
+ )
+ parser.add_argument(
+ '-t', '--top-level', action='store_true',
+ help='Check only top-level modules.',
+ )
+ parser.add_argument(
+ '-e', '--exclude', action='append',
+ help='Provide modules globs to be excluded from the check.',
+ )
+ return parser
+
+
+@contextmanager
+def remove_unwanteds_from_sys_path():
+ '''Remove cwd and this script's parent from sys.path for the import test.
+ Bring the original contents back after import is done (or failed)
+ '''
+
+ cwd_absolute = Path.cwd().absolute()
+ this_file_parent = Path(__file__).parent.absolute()
+ old_sys_path = list(sys.path)
+ for path in old_sys_path:
+ if Path(path).absolute() in (cwd_absolute, this_file_parent):
+ sys.path.remove(path)
+ try:
+ yield
+ finally:
+ sys.path = old_sys_path
+
+
+def addsitedirs_from_environ():
+ '''Load directories from the _PYTHONSITE environment variable (separated by :)
+ and load the ones already present in sys.path via site.addsitedir()
+ to handle .pth files in them.
+
+ This is needed to properly import old-style namespace packages with nspkg.pth files.
+ See https://bugzilla.redhat.com/2018551 for a more detailed rationale.'''
+ for path in os.getenv('_PYTHONSITE', '').split(':'):
+ if path in sys.path:
+ site.addsitedir(path)
+
+
+def main(argv=None):
+
+ cli_args = argparser().parse_args(argv)
+
+ if not cli_args.modules and not cli_args.filename:
+ raise ValueError('No modules to check were provided')
+
+ modules = read_modules_from_all_args(cli_args)
+
+ with remove_unwanteds_from_sys_path():
+ addsitedirs_from_environ()
+ import_modules(modules)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/SOURCES/macros.python3.11 b/SOURCES/macros.python3.11
index e802a8b..adf5837 100644
--- a/SOURCES/macros.python3.11
+++ b/SOURCES/macros.python3.11
@@ -61,7 +61,7 @@
if rpm.expand("%{?py3_shebang_flags}") ~= "" then
command = command .. "-%{py3_shebang_flags}"
end
- command = command .. " %{_rpmconfigdir}/redhat/import_all_modules.py "
+ command = command .. " %{_rpmconfigdir}/redhat/import_all_modules_py3_11.py "
-- handle multiline arguments correctly, see https://bugzilla.redhat.com/2018809
local args=rpm.expand('%{?**}'):gsub("[%s\\\\]*%s+", " ")
print(command .. args)
diff --git a/SPECS/python3.11.spec b/SPECS/python3.11.spec
index 653d9ba..c9e8d45 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}.2
+%global general_version %{pybasever}.5
#global prerel ...
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 2%{?dist}.2
+Release: 1%{?dist}
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 22.3.1
+%global pip_version 23.2.1
%global setuptools_version 65.5.0
# Expensive optimizations (mainly, profile-guided optimizations)
@@ -252,7 +252,10 @@ Source0: %{url}ftp/python/%{general_version}/Python-%{upstream_version}.tar.xz
Source1: %{url}ftp/python/%{general_version}/Python-%{upstream_version}.tar.xz.asc
# The release manager for Python 3.11 is pablogsal
Source2: https://keybase.io/pablogsal/pgp_keys.asc
+
+# Sources for the python3.11-rpm-macros
Source3: macros.python3.11
+Source4: import_all_modules_py3_11.py
# A simple script to check timestamps of bytecode files
# Run in check section with Python that is currently being built
@@ -358,27 +361,15 @@ Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-g
# Upstream: https://bugs.python.org/issue46811
Patch378: 00378-support-expat-2-4-5.patch
-# 00399 # 62614243969f1c717a02a1c65e55ef173ad9a6dd
-# CVE-2023-24329
-#
-# * gh-102153: Start stripping C0 control and space chars in `urlsplit` (GH-102508)
-#
-# `urllib.parse.urlsplit` has already been respecting the WHATWG spec a bit GH-25595.
-#
-# This adds more sanitizing to respect the "Remove any leading C0 control or space from input" [rule](https://url.spec.whatwg.org/GH-url-parsing:~:text=Remove%%20any%%20leading%%20and%%20trailing%%20C0%%20control%%20or%%20space%%20from%%20input.) in response to [CVE-2023-24329](https://nvd.nist.gov/vuln/detail/CVE-2023-24329).
-#
-# ---------
-Patch399: 00399-cve-2023-24329.patch
-
-# 00404 #
-# CVE-2023-40217
-#
-# Security fix for CVE-2023-40217: Bypass TLS handshake on closed sockets
-# Resolved upstream: https://github.com/python/cpython/issues/108310
-# Fixups added on top from:
-# https://github.com/python/cpython/issues/108342
-#
-Patch404: 00404-cve-2023-40217.patch
+# 00397 #
+# Filters for tarfile extraction (CVE-2007-4559, PEP-706)
+# First patch fixes determination of symlink targets, which were treated
+# as relative to the root of the archive,
+# rather than the directory containing the symlink.
+# Not yet upstream as of this writing.
+# The second patch is Red Hat configuration, see KB for documentation:
+# - https://access.redhat.com/articles/7004769
+Patch397: 00397-tarfile-filter.patch
# (New patches go here ^^^)
#
@@ -1120,6 +1111,10 @@ mkdir -p %{buildroot}%{rpmmacrodir}/
install -m 644 %{SOURCE3} \
%{buildroot}/%{rpmmacrodir}/
+# Add a script that is being used by python3.11-rpm-macros
+mkdir -p %{buildroot}%{_rpmconfigdir}/redhat
+install -m 644 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/redhat/
+
# All ghost files controlled by alternatives need to exist for the files
# section check to succeed
# - Don't list /usr/bin/python as a ghost file so `yum install /usr/bin/python`
@@ -1194,10 +1189,14 @@ CheckPython() {
# test_freeze_simple_script is skipped, because it fails when bundled wheels
# are removed in Fedora.
# upstream report: https://bugs.python.org/issue45783
+ # test_check_probes is failing since it was introduced in 3.11.5,
+ # the test is skipped until it is fixed in upstream.
+ # see: https://github.com/python/cpython/issues/104280#issuecomment-1669249980
LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
-wW --slowest -j0 --timeout=1800 \
-i test_freeze_simple_script \
+ -i test_check_probes \
%if %{with bootstrap}
-x test_distutils \
%endif
@@ -1318,6 +1317,7 @@ fi
%files -n %{pkgname}-rpm-macros
%{rpmmacrodir}/macros.python%{pybasever}
+%{_rpmconfigdir}/redhat/import_all_modules_py3_11.py
%files -n %{pkgname}
%doc README.rst
@@ -1821,11 +1821,25 @@ fi
# ======================================================
%changelog
-* Tue Sep 12 2023 Charalampos Stratakis <cstratak@redhat.com> - 3.11.2-2.2
-- Security fix for CVE-2023-40217
-Resolves: rhbz#2235789
+* Thu Sep 07 2023 Charalampos Stratakis <cstratak@redhat.com> - 3.11.5-1
+- Rebase to 3.11.5
+- Security fixes for CVE-2023-40217 and CVE-2023-41105
+Resolves: RHEL-3047, RHEL-3267
+
+* Thu Aug 10 2023 Tomas Orsava <torsava@redhat.com> - 3.11.4-4
+- Add the import_all_modules_py3_11.py file for the python3.11-rpm-macros subpackage
+Resolves: rhbz#2207631
+
+* Wed Aug 09 2023 Petr Viktorin <pviktori@redhat.com> - 3.11.4-3
+- Fix symlink handling in the fix for CVE-2023-24329
+Resolves: rhbz#263261
+
+* Fri Jun 30 2023 Charalampos Stratakis <cstratak@redhat.com> - 3.11.4-2
+- Security fix for CVE-2007-4559
+Resolves: rhbz#263261
-* Wed May 24 2023 Charalampos Stratakis <cstratak@redhat.com> - 3.11.2-2.1
+* Mon Jun 26 2023 Charalampos Stratakis <cstratak@redhat.com> - 3.11.4-1
+- Update to 3.11.4
- Security fix for CVE-2023-24329
Resolves: rhbz#2173917
--
GitLab