import UBI python3.12-3.12.11-2.el9
This commit is contained in:
parent
fb597a3d87
commit
b52f59eea6
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/Python-3.12.9.tar.xz
|
SOURCES/Python-3.12.11.tar.xz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
465d8a664e63dc5aa1f0d90cd1d0000a970ee2fb SOURCES/Python-3.12.9.tar.xz
|
603f20426ba4942552a38493bb987c9b832ee321 SOURCES/Python-3.12.11.tar.xz
|
||||||
|
|||||||
@ -51,7 +51,7 @@ index aed254ad50..568dbdb945 100644
|
|||||||
if os.path.isdir(sitedir):
|
if os.path.isdir(sitedir):
|
||||||
addsitedir(sitedir, known_paths)
|
addsitedir(sitedir, known_paths)
|
||||||
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
|
||||||
index 517b13acaf..928d1a0541 100644
|
index acc8d4d182..6355669f62 100644
|
||||||
--- a/Lib/sysconfig.py
|
--- a/Lib/sysconfig.py
|
||||||
+++ b/Lib/sysconfig.py
|
+++ b/Lib/sysconfig.py
|
||||||
@@ -104,6 +104,11 @@
|
@@ -104,6 +104,11 @@
|
||||||
@ -86,7 +86,7 @@ index 517b13acaf..928d1a0541 100644
|
|||||||
_SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include',
|
_SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include',
|
||||||
'scripts', 'data')
|
'scripts', 'data')
|
||||||
|
|
||||||
@@ -261,11 +279,40 @@ def _extend_dict(target_dict, other_dict):
|
@@ -268,11 +286,40 @@ def _extend_dict(target_dict, other_dict):
|
||||||
target_dict[key] = value
|
target_dict[key] = value
|
||||||
|
|
||||||
|
|
||||||
@ -129,7 +129,7 @@ index 517b13acaf..928d1a0541 100644
|
|||||||
# On Windows we want to substitute 'lib' for schemes rather
|
# On Windows we want to substitute 'lib' for schemes rather
|
||||||
# than the native value (without modifying vars, in case it
|
# than the native value (without modifying vars, in case it
|
||||||
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
|
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
|
||||||
index 3468d0ce02..ff31010427 100644
|
index 67647e1b78..7baddaa9d6 100644
|
||||||
--- a/Lib/test/test_sysconfig.py
|
--- a/Lib/test/test_sysconfig.py
|
||||||
+++ b/Lib/test/test_sysconfig.py
|
+++ b/Lib/test/test_sysconfig.py
|
||||||
@@ -119,8 +119,19 @@ def test_get_path(self):
|
@@ -119,8 +119,19 @@ def test_get_path(self):
|
||||||
|
|||||||
@ -0,0 +1,51 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Charalampos Stratakis <cstratak@redhat.com>
|
||||||
|
Date: Wed, 8 Jan 2025 04:58:22 +0100
|
||||||
|
Subject: 00459: Apply Intel Control-flow Technology for x86-64
|
||||||
|
|
||||||
|
Required for mitigation against return-oriented programming (ROP) and Call or Jump Oriented Programming (COP/JOP) attacks
|
||||||
|
|
||||||
|
Proposed upstream: https://github.com/python/cpython/pull/128606
|
||||||
|
|
||||||
|
See also: https://sourceware.org/annobin/annobin.html/Test-cf-protection.html
|
||||||
|
---
|
||||||
|
Python/asm_trampoline.S | 22 ++++++++++++++++++++++
|
||||||
|
1 file changed, 22 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/Python/asm_trampoline.S b/Python/asm_trampoline.S
|
||||||
|
index 460707717d..341d0bbe51 100644
|
||||||
|
--- a/Python/asm_trampoline.S
|
||||||
|
+++ b/Python/asm_trampoline.S
|
||||||
|
@@ -9,6 +9,9 @@
|
||||||
|
# }
|
||||||
|
_Py_trampoline_func_start:
|
||||||
|
#ifdef __x86_64__
|
||||||
|
+#if defined(__CET__) && (__CET__ & 1)
|
||||||
|
+ endbr64
|
||||||
|
+#endif
|
||||||
|
sub $8, %rsp
|
||||||
|
call *%rcx
|
||||||
|
add $8, %rsp
|
||||||
|
@@ -26,3 +29,22 @@ _Py_trampoline_func_start:
|
||||||
|
.globl _Py_trampoline_func_end
|
||||||
|
_Py_trampoline_func_end:
|
||||||
|
.section .note.GNU-stack,"",@progbits
|
||||||
|
+# Note for indicating the assembly code supports CET
|
||||||
|
+#if defined(__x86_64__) && defined(__CET__) && (__CET__ & 1)
|
||||||
|
+ .section .note.gnu.property,"a"
|
||||||
|
+ .align 8
|
||||||
|
+ .long 1f - 0f
|
||||||
|
+ .long 4f - 1f
|
||||||
|
+ .long 5
|
||||||
|
+0:
|
||||||
|
+ .string "GNU"
|
||||||
|
+1:
|
||||||
|
+ .align 8
|
||||||
|
+ .long 0xc0000002
|
||||||
|
+ .long 3f - 2f
|
||||||
|
+2:
|
||||||
|
+ .long 0x3
|
||||||
|
+3:
|
||||||
|
+ .align 8
|
||||||
|
+4:
|
||||||
|
+#endif // __x86_64__
|
||||||
@ -0,0 +1,196 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: yevgeny hong <hongyevgeny@gmail.com>
|
||||||
|
Date: Tue, 26 Mar 2024 16:45:43 +0900
|
||||||
|
Subject: 00462: Fix PySSL_SetError handling SSL_ERROR_SYSCALL
|
||||||
|
|
||||||
|
Python 3.10 changed from using SSL_write() and SSL_read() to SSL_write_ex() and
|
||||||
|
SSL_read_ex(), but did not update handling of the return value.
|
||||||
|
|
||||||
|
Change error handling so that the return value is not examined.
|
||||||
|
OSError (not EOF) is now returned when retval is 0.
|
||||||
|
|
||||||
|
This resolves the issue of failing tests when a system is
|
||||||
|
stressed on OpenSSL 3.5.
|
||||||
|
|
||||||
|
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
|
||||||
|
Co-authored-by: Petr Viktorin <encukou@gmail.com>
|
||||||
|
---
|
||||||
|
Lib/test/test_ssl.py | 28 ++++++-----
|
||||||
|
...-02-18-09-50-31.gh-issue-115627.HGchj0.rst | 2 +
|
||||||
|
Modules/_ssl.c | 48 +++++++------------
|
||||||
|
3 files changed, 35 insertions(+), 43 deletions(-)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Library/2024-02-18-09-50-31.gh-issue-115627.HGchj0.rst
|
||||||
|
|
||||||
|
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
||||||
|
index b13e37d0cd..daeb8cba74 100644
|
||||||
|
--- a/Lib/test/test_ssl.py
|
||||||
|
+++ b/Lib/test/test_ssl.py
|
||||||
|
@@ -2427,16 +2427,18 @@ def run(self):
|
||||||
|
self.write(msg.lower())
|
||||||
|
except OSError as e:
|
||||||
|
# handles SSLError and socket errors
|
||||||
|
+ if isinstance(e, ConnectionError):
|
||||||
|
+ # OpenSSL 1.1.1 sometimes raises
|
||||||
|
+ # ConnectionResetError when connection is not
|
||||||
|
+ # shut down gracefully.
|
||||||
|
+ if self.server.chatty and support.verbose:
|
||||||
|
+ print(f" Connection reset by peer: {self.addr}")
|
||||||
|
+
|
||||||
|
+ self.close()
|
||||||
|
+ self.running = False
|
||||||
|
+ return
|
||||||
|
if self.server.chatty and support.verbose:
|
||||||
|
- if isinstance(e, ConnectionError):
|
||||||
|
- # OpenSSL 1.1.1 sometimes raises
|
||||||
|
- # ConnectionResetError when connection is not
|
||||||
|
- # shut down gracefully.
|
||||||
|
- print(
|
||||||
|
- f" Connection reset by peer: {self.addr}"
|
||||||
|
- )
|
||||||
|
- else:
|
||||||
|
- handle_error("Test server failure:\n")
|
||||||
|
+ handle_error("Test server failure:\n")
|
||||||
|
try:
|
||||||
|
self.write(b"ERROR\n")
|
||||||
|
except OSError:
|
||||||
|
@@ -3148,8 +3150,8 @@ def test_wrong_cert_tls13(self):
|
||||||
|
suppress_ragged_eofs=False) as s:
|
||||||
|
s.connect((HOST, server.port))
|
||||||
|
with self.assertRaisesRegex(
|
||||||
|
- ssl.SSLError,
|
||||||
|
- 'alert unknown ca|EOF occurred|TLSV1_ALERT_UNKNOWN_CA'
|
||||||
|
+ OSError,
|
||||||
|
+ 'alert unknown ca|EOF occurred|TLSV1_ALERT_UNKNOWN_CA|closed by the remote host|Connection reset by peer'
|
||||||
|
):
|
||||||
|
# TLS 1.3 perform client cert exchange after handshake
|
||||||
|
s.write(b'data')
|
||||||
|
@@ -4422,8 +4424,8 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
|
||||||
|
# test sometimes fails with EOF error. Test passes as long as
|
||||||
|
# server aborts connection with an error.
|
||||||
|
with self.assertRaisesRegex(
|
||||||
|
- ssl.SSLError,
|
||||||
|
- '(certificate required|EOF occurred)'
|
||||||
|
+ OSError,
|
||||||
|
+ 'certificate required|EOF occurred|closed by the remote host|Connection reset by peer'
|
||||||
|
):
|
||||||
|
# receive CertificateRequest
|
||||||
|
data = s.recv(1024)
|
||||||
|
diff --git a/Misc/NEWS.d/next/Library/2024-02-18-09-50-31.gh-issue-115627.HGchj0.rst b/Misc/NEWS.d/next/Library/2024-02-18-09-50-31.gh-issue-115627.HGchj0.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..75d926ab59
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Library/2024-02-18-09-50-31.gh-issue-115627.HGchj0.rst
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+Fix the :mod:`ssl` module error handling of connection terminate by peer.
|
||||||
|
+It now throws an OSError with the appropriate error code instead of an EOFError.
|
||||||
|
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
|
||||||
|
index 0b8cf0b6df..42a4c95890 100644
|
||||||
|
--- a/Modules/_ssl.c
|
||||||
|
+++ b/Modules/_ssl.c
|
||||||
|
@@ -573,7 +573,7 @@ PySSL_ChainExceptions(PySSLSocket *sslsock) {
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
-PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
|
||||||
|
+PySSL_SetError(PySSLSocket *sslsock, const char *filename, int lineno)
|
||||||
|
{
|
||||||
|
PyObject *type;
|
||||||
|
char *errstr = NULL;
|
||||||
|
@@ -586,7 +586,6 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
|
||||||
|
_sslmodulestate *state = get_state_sock(sslsock);
|
||||||
|
type = state->PySSLErrorObject;
|
||||||
|
|
||||||
|
- assert(ret <= 0);
|
||||||
|
e = ERR_peek_last_error();
|
||||||
|
|
||||||
|
if (sslsock->ssl != NULL) {
|
||||||
|
@@ -619,32 +618,21 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
|
||||||
|
case SSL_ERROR_SYSCALL:
|
||||||
|
{
|
||||||
|
if (e == 0) {
|
||||||
|
- PySocketSockObject *s = GET_SOCKET(sslsock);
|
||||||
|
- if (ret == 0 || (((PyObject *)s) == Py_None)) {
|
||||||
|
+ /* underlying BIO reported an I/O error */
|
||||||
|
+ ERR_clear_error();
|
||||||
|
+#ifdef MS_WINDOWS
|
||||||
|
+ if (err.ws) {
|
||||||
|
+ return PyErr_SetFromWindowsErr(err.ws);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+ if (err.c) {
|
||||||
|
+ errno = err.c;
|
||||||
|
+ return PyErr_SetFromErrno(PyExc_OSError);
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
p = PY_SSL_ERROR_EOF;
|
||||||
|
type = state->PySSLEOFErrorObject;
|
||||||
|
errstr = "EOF occurred in violation of protocol";
|
||||||
|
- } else if (s && ret == -1) {
|
||||||
|
- /* underlying BIO reported an I/O error */
|
||||||
|
- ERR_clear_error();
|
||||||
|
-#ifdef MS_WINDOWS
|
||||||
|
- if (err.ws) {
|
||||||
|
- return PyErr_SetFromWindowsErr(err.ws);
|
||||||
|
- }
|
||||||
|
-#endif
|
||||||
|
- if (err.c) {
|
||||||
|
- errno = err.c;
|
||||||
|
- return PyErr_SetFromErrno(PyExc_OSError);
|
||||||
|
- }
|
||||||
|
- else {
|
||||||
|
- p = PY_SSL_ERROR_EOF;
|
||||||
|
- type = state->PySSLEOFErrorObject;
|
||||||
|
- errstr = "EOF occurred in violation of protocol";
|
||||||
|
- }
|
||||||
|
- } else { /* possible? */
|
||||||
|
- p = PY_SSL_ERROR_SYSCALL;
|
||||||
|
- type = state->PySSLSyscallErrorObject;
|
||||||
|
- errstr = "Some I/O error occurred";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (ERR_GET_LIB(e) == ERR_LIB_SSL &&
|
||||||
|
@@ -1007,7 +995,7 @@ _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self)
|
||||||
|
err.ssl == SSL_ERROR_WANT_WRITE);
|
||||||
|
Py_XDECREF(sock);
|
||||||
|
if (ret < 1)
|
||||||
|
- return PySSL_SetError(self, ret, __FILE__, __LINE__);
|
||||||
|
+ return PySSL_SetError(self, __FILE__, __LINE__);
|
||||||
|
if (PySSL_ChainExceptions(self) < 0)
|
||||||
|
return NULL;
|
||||||
|
Py_RETURN_NONE;
|
||||||
|
@@ -2424,7 +2412,7 @@ _ssl__SSLSocket_write_impl(PySSLSocket *self, Py_buffer *b)
|
||||||
|
|
||||||
|
Py_XDECREF(sock);
|
||||||
|
if (retval == 0)
|
||||||
|
- return PySSL_SetError(self, retval, __FILE__, __LINE__);
|
||||||
|
+ return PySSL_SetError(self, __FILE__, __LINE__);
|
||||||
|
if (PySSL_ChainExceptions(self) < 0)
|
||||||
|
return NULL;
|
||||||
|
return PyLong_FromSize_t(count);
|
||||||
|
@@ -2454,7 +2442,7 @@ _ssl__SSLSocket_pending_impl(PySSLSocket *self)
|
||||||
|
self->err = err;
|
||||||
|
|
||||||
|
if (count < 0)
|
||||||
|
- return PySSL_SetError(self, count, __FILE__, __LINE__);
|
||||||
|
+ return PySSL_SetError(self, __FILE__, __LINE__);
|
||||||
|
else
|
||||||
|
return PyLong_FromLong(count);
|
||||||
|
}
|
||||||
|
@@ -2577,7 +2565,7 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
|
||||||
|
err.ssl == SSL_ERROR_WANT_WRITE);
|
||||||
|
|
||||||
|
if (retval == 0) {
|
||||||
|
- PySSL_SetError(self, retval, __FILE__, __LINE__);
|
||||||
|
+ PySSL_SetError(self, __FILE__, __LINE__);
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
if (self->exc != NULL)
|
||||||
|
@@ -2703,7 +2691,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self)
|
||||||
|
}
|
||||||
|
if (ret < 0) {
|
||||||
|
Py_XDECREF(sock);
|
||||||
|
- PySSL_SetError(self, ret, __FILE__, __LINE__);
|
||||||
|
+ PySSL_SetError(self, __FILE__, __LINE__);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
if (self->exc != NULL)
|
||||||
File diff suppressed because it is too large
Load Diff
18
SOURCES/Python-3.12.11.tar.xz.asc
Normal file
18
SOURCES/Python-3.12.11.tar.xz.asc
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQKTBAABCgB9FiEEcWlgX2LHUTVtBUomqCHmgOX6YwUFAmg/MbpfFIAAAAAALgAo
|
||||||
|
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDcx
|
||||||
|
Njk2MDVGNjJDNzUxMzU2RDA1NEEyNkE4MjFFNjgwRTVGQTYzMDUACgkQqCHmgOX6
|
||||||
|
YwXySQ/7Ba9qlnTLmxqTCO8C7Gf545WNMBL2Ep6JZPgjOcgNk9e1QdAnNV5OOtGm
|
||||||
|
gW5nNPSTNNcIcPn058GuI24D4RpTQCJfMbMLsfYgvio0E7ij1gC19PsJHb6ejtCS
|
||||||
|
H2kK237Y1kuqRUdbTZssFDoAR4R9+UCaDuo4XdW+UKQk2GgdNQDMWLKmWF/Xk6Ob
|
||||||
|
/LihMXj27mDU9nXVdWR55sJzTFzfGB015vmORvcpuctkf1lZ4AfVFMgGw1CgjRjF
|
||||||
|
kjrOkrDErjDUQ8BIhMh90deiTpigfg7cg1HBDI6GRzklFg6cMfIdfvmfM0MfamX3
|
||||||
|
Tow08TGBzmYXWgrqjYXW6JknKhBGOrjXMB7/yNDk9bJVLcOJaLbOmbcG0WRQF/Py
|
||||||
|
DMOCvr09l0yt5KFYpdKrDvyCuKYfpX33B4C60kU9JzmfXGyQ6LDTPXapZooJ+8Fg
|
||||||
|
GRTUsc0YWXoaDVCcxMIdiG+jEMQkjWVwW7E/nC/d7WT5L9KPoYFA1sZ834kKq3jr
|
||||||
|
NmZynbBnKH7m7L+u6HP6B+pa84FKEME69osAXZk0HJOIHB+SOX3E6BXRo6IV8Q/K
|
||||||
|
J6f5Ja26gJ7KXcUxTgkTkYh7tz0bhb+WeL3j6N/BC0eK7ZVsKRZ/3WnntGsG5B2m
|
||||||
|
FjVOYKolfkF4tf63SjdFuudgaKGCaDK1PvfwIr7k0oozxrB2ZEA=
|
||||||
|
=SYH/
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
@ -1,18 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQKTBAABCgB9FiEEcWlgX2LHUTVtBUomqCHmgOX6YwUFAmeiX7JfFIAAAAAALgAo
|
|
||||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDcx
|
|
||||||
Njk2MDVGNjJDNzUxMzU2RDA1NEEyNkE4MjFFNjgwRTVGQTYzMDUACgkQqCHmgOX6
|
|
||||||
YwXTqw//VlGJA5CRDfljMwN9BmG2hdXB1B7Lj0PssuAo4A/lH99gb4DRVDS9LNjr
|
|
||||||
99WdH/fQQovx6rTbtyJnN8Vh7SSduBi/vOc5n5VOXZB0buqR0l+0wu4m43Slu6xP
|
|
||||||
fXO349Hr6585lemU8x54TrP756rSVUhy3T+krUuNDL9W1Wrp2yDCpt4tUoEhNXGw
|
|
||||||
DoYS8MrK/ygLNV/7p2DeMWOHNdbjKNH6rfzl60IAwAp7oANcyoj6Pho960bbeUDo
|
|
||||||
tb47Pw0WWZv3EuITP6bPa8+Z6dj096cFL3AQJ3ap16OduwiaOsGhqTfe4+kbp6ut
|
|
||||||
Gp/1HeIHzPbEV0E5K78RWHuzBYgU1oPGiMjlp7WkA7bP2OSTF7nM4EBkiiihk2qx
|
|
||||||
3d5VF9wpVRJ4AuR/aWcWcMnvD2ziSWfzZM3Z3VLnTaWYpuRkQp8TTiFr1vHqxMYm
|
|
||||||
p/8AozzBJMfOS6u/Q0WNAdk6x3VB0DXnTAETXQVIrex4DXqX/3WSMWK5/x/OyCh9
|
|
||||||
ytdreIQYbv1KvlNQJkgpPb7jlUSXp8t9fHCXt4hszhJgtjwIj/+CuSeAgX0bhopV
|
|
||||||
XsqOBseDNhATg38mhwBVaeFKGRpxsKdpxcdqSEGKuhXtEI/hJmkpZGw49gy3xWxB
|
|
||||||
KlgRgKjCPw+BGAIVV9qvdtJzam8a09SKVcslqgF619q0byQoBmo=
|
|
||||||
=1TbP
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
@ -16,11 +16,11 @@ URL: https://www.python.org/
|
|||||||
|
|
||||||
# WARNING When rebasing to a new Python version,
|
# WARNING When rebasing to a new Python version,
|
||||||
# remember to update the python3-docs package as well
|
# remember to update the python3-docs package as well
|
||||||
%global general_version %{pybasever}.9
|
%global general_version %{pybasever}.11
|
||||||
#global prerel ...
|
#global prerel ...
|
||||||
%global upstream_version %{general_version}%{?prerel}
|
%global upstream_version %{general_version}%{?prerel}
|
||||||
Version: %{general_version}%{?prerel:~%{prerel}}
|
Version: %{general_version}%{?prerel:~%{prerel}}
|
||||||
Release: 1%{?dist}.2
|
Release: 2%{?dist}
|
||||||
License: Python-2.0.1
|
License: Python-2.0.1
|
||||||
|
|
||||||
|
|
||||||
@ -66,28 +66,28 @@ License: Python-2.0.1
|
|||||||
# If the rpmwheels condition is disabled, we use the bundled wheel packages
|
# If the rpmwheels condition is disabled, we use the bundled wheel packages
|
||||||
# from Python with the versions below.
|
# from Python with the versions below.
|
||||||
# This needs to be manually updated when we update Python.
|
# This needs to be manually updated when we update Python.
|
||||||
%global pip_version 24.3.1
|
%global pip_version 25.0.1
|
||||||
%global setuptools_version 67.6.1
|
%global setuptools_version 67.6.1
|
||||||
%global wheel_version 0.40.0
|
%global wheel_version 0.40.0
|
||||||
# All of those also include a list of indirect bundled libs:
|
# All of those also include a list of indirect bundled libs:
|
||||||
# pip
|
# pip
|
||||||
# $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt)
|
# $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt)
|
||||||
%global pip_bundled_provides %{expand:
|
%global pip_bundled_provides %{expand:
|
||||||
Provides: bundled(python3dist(cachecontrol)) = 0.14
|
Provides: bundled(python3dist(cachecontrol)) = 0.14.1
|
||||||
Provides: bundled(python3dist(certifi)) = 2024.8.30
|
Provides: bundled(python3dist(certifi)) = 2024.8.30
|
||||||
Provides: bundled(python3dist(distlib)) = 0.3.9
|
Provides: bundled(python3dist(distlib)) = 0.3.9
|
||||||
Provides: bundled(python3dist(distro)) = 1.9
|
Provides: bundled(python3dist(distro)) = 1.9
|
||||||
Provides: bundled(python3dist(idna)) = 3.7
|
Provides: bundled(python3dist(idna)) = 3.10
|
||||||
Provides: bundled(python3dist(msgpack)) = 1.0.8
|
Provides: bundled(python3dist(msgpack)) = 1.1
|
||||||
Provides: bundled(python3dist(packaging)) = 24.1
|
Provides: bundled(python3dist(packaging)) = 24.2
|
||||||
Provides: bundled(python3dist(platformdirs)) = 4.2.2
|
Provides: bundled(python3dist(platformdirs)) = 4.3.6
|
||||||
Provides: bundled(python3dist(pygments)) = 2.18
|
Provides: bundled(python3dist(pygments)) = 2.18
|
||||||
Provides: bundled(python3dist(pyproject-hooks)) = 1
|
Provides: bundled(python3dist(pyproject-hooks)) = 1.2
|
||||||
Provides: bundled(python3dist(requests)) = 2.32.3
|
Provides: bundled(python3dist(requests)) = 2.32.3
|
||||||
Provides: bundled(python3dist(resolvelib)) = 1.0.1
|
Provides: bundled(python3dist(resolvelib)) = 1.0.1
|
||||||
Provides: bundled(python3dist(rich)) = 13.7.1
|
Provides: bundled(python3dist(rich)) = 13.9.4
|
||||||
Provides: bundled(python3dist(setuptools)) = 70.3
|
Provides: bundled(python3dist(setuptools)) = 70.3
|
||||||
Provides: bundled(python3dist(tomli)) = 2.0.1
|
Provides: bundled(python3dist(tomli)) = 2.2.1
|
||||||
Provides: bundled(python3dist(truststore)) = 0.10
|
Provides: bundled(python3dist(truststore)) = 0.10
|
||||||
Provides: bundled(python3dist(typing-extensions)) = 4.12.2
|
Provides: bundled(python3dist(typing-extensions)) = 4.12.2
|
||||||
Provides: bundled(python3dist(urllib3)) = 1.26.20
|
Provides: bundled(python3dist(urllib3)) = 1.26.20
|
||||||
@ -279,6 +279,7 @@ BuildRequires: valgrind-devel
|
|||||||
BuildRequires: xz-devel
|
BuildRequires: xz-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
|
BuildRequires: systemtap-sdt-devel
|
||||||
BuildRequires: /usr/bin/dtrace
|
BuildRequires: /usr/bin/dtrace
|
||||||
|
|
||||||
# workaround http://bugs.python.org/issue19804 (test_uuid requires ifconfig)
|
# workaround http://bugs.python.org/issue19804 (test_uuid requires ifconfig)
|
||||||
@ -385,12 +386,28 @@ Patch397: 00397-tarfile-filter.patch
|
|||||||
# CVE-2023-52425. Future versions of Expat may be more reactive.
|
# CVE-2023-52425. Future versions of Expat may be more reactive.
|
||||||
Patch422: 00422-fix-tests-for-xmlpullparser-with-expat-2-6-0.patch
|
Patch422: 00422-fix-tests-for-xmlpullparser-with-expat-2-6-0.patch
|
||||||
|
|
||||||
# 00465 #
|
# 00459 # 906f6692bd85034012c9554f2434627ccfc04c67
|
||||||
# Security fixes for:
|
# Apply Intel Control-flow Technology for x86-64
|
||||||
# CVE-2025-4517, CVE-2025-4330, CVE-2025-4138, CVE-2024-12718 and CVE-2025-4435 in the tarfile module.
|
|
||||||
#
|
#
|
||||||
# Resolved upstream: https://github.com/python/cpython/pull/135066
|
# Required for mitigation against return-oriented programming (ROP) and Call or Jump Oriented Programming (COP/JOP) attacks
|
||||||
Patch465: 00465-tarfile-cves.patch
|
#
|
||||||
|
# Proposed upstream: https://github.com/python/cpython/pull/128606
|
||||||
|
#
|
||||||
|
# See also: https://sourceware.org/annobin/annobin.html/Test-cf-protection.html
|
||||||
|
Patch459: 00459-apply-intel-control-flow-technology-for-x86-64.patch
|
||||||
|
|
||||||
|
# 00462 # 5324dc5f57e0068f7e4f7b2f20006e88ff5f4e47
|
||||||
|
# Fix PySSL_SetError handling SSL_ERROR_SYSCALL
|
||||||
|
#
|
||||||
|
# Python 3.10 changed from using SSL_write() and SSL_read() to SSL_write_ex() and
|
||||||
|
# SSL_read_ex(), but did not update handling of the return value.
|
||||||
|
#
|
||||||
|
# Change error handling so that the return value is not examined.
|
||||||
|
# OSError (not EOF) is now returned when retval is 0.
|
||||||
|
#
|
||||||
|
# This resolves the issue of failing tests when a system is
|
||||||
|
# stressed on OpenSSL 3.5.
|
||||||
|
Patch462: 00462-fix-pyssl_seterror-handling-ssl_error_syscall.patch
|
||||||
|
|
||||||
# 00467 #
|
# 00467 #
|
||||||
# CVE-2025-8194
|
# CVE-2025-8194
|
||||||
@ -1714,13 +1731,27 @@ CheckPython optimized
|
|||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Aug 14 2025 Lumír Balhar <lbalhar@redhat.com> - 3.12.9-1.2
|
* Thu Aug 14 2025 Lumír Balhar <lbalhar@redhat.com> - 3.12.11-2
|
||||||
- Security fix for CVE-2025-8194
|
- Security fix for CVE-2025-8194
|
||||||
Resolves: RHEL-106370
|
Resolves: RHEL-106369
|
||||||
|
|
||||||
* Fri Jun 20 2025 Charalampos Stratakis <cstratak@redhat.com> - 3.12.9-1.1
|
* Wed Jun 04 2025 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.12.11-1
|
||||||
|
- Update to 3.12.11
|
||||||
- Security fixes for CVE-2025-4517, CVE-2025-4330, CVE-2025-4138, CVE-2024-12718, CVE-2025-4435
|
- Security fixes for CVE-2025-4517, CVE-2025-4330, CVE-2025-4138, CVE-2024-12718, CVE-2025-4435
|
||||||
- Resolves: RHEL-98058, RHEL-98020, RHEL-97809, RHEL-98184, RHEL-98211
|
Resolves: RHEL-98057, RHEL-98019, RHEL-97811, RHEL-98183, RHEL-98210
|
||||||
|
|
||||||
|
* Fri May 09 2025 Charalampos Stratakis <cstratak@redhat.com> - 3.12.10-3
|
||||||
|
- Fix PySSL_SetError handling SSL_ERROR_SYSCALL
|
||||||
|
- This fixes random flakiness of test_ssl on stressed machines
|
||||||
|
Resolves: RHEL-88897
|
||||||
|
|
||||||
|
* Tue Apr 22 2025 Charalampos Stratakis <cstratak@redhat.com> - 3.12.10-2
|
||||||
|
- Apply Intel's CET for mitigation against control-flow hijacking attacks
|
||||||
|
Resolves: RHEL-88326
|
||||||
|
|
||||||
|
* Wed Apr 09 2025 Miro Hrončok <mhroncok@redhat.com> - 3.12.10-1
|
||||||
|
- Update to 3.12.10
|
||||||
|
Resolves: RHEL-86887
|
||||||
|
|
||||||
* Tue Feb 04 2025 Charalampos Stratakis <cstratak@redhat.com> - 3.12.9-1
|
* Tue Feb 04 2025 Charalampos Stratakis <cstratak@redhat.com> - 3.12.9-1
|
||||||
- Update to 3.12.9
|
- Update to 3.12.9
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user