gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python310: 3.10.16 -> 3.10.17

Browse Source 
https://docs.python.org/release/3.10.16/whatsnew/changelog.html
This commit is contained in:
Martin Weinelt
2025-04-09 14:01:34 +02:00
parent 51b69a3198
commit 2eeda516c8
3 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch
-28
View File
@@ -1,28 +0,0 @@
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index e637830..80728d2 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -656,6 +656,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
errstr = "Some I/O error occurred";
}
} else {
+ if (ERR_GET_LIB(e) == ERR_LIB_SYS) {
+ // A system error is being reported; reason is set to errno
+ errno = ERR_GET_REASON(e);
+ return PyErr_SetFromErrno(PyExc_OSError);
+ }
p = PY_SSL_ERROR_SYSCALL;
}
break;
@@ -681,6 +686,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
errstr = "EOF occurred in violation of protocol";
}
#endif
+ if (ERR_GET_LIB(e) == ERR_LIB_SYS) {
+ // A system error is being reported; reason is set to errno
+ errno = ERR_GET_REASON(e);
+ return PyErr_SetFromErrno(PyExc_OSError);
+ }
break;
}
default:
pkgs/development/interpreters/python/cpython/default.nix
+1 -4
View File
@@ -327,7 +327,7 @@ stdenv.mkDerivation (finalAttrs: {
# libuuid, slowing down program startup a lot).
noldconfigPatch
]
++ optionals (pythonAtLeast "3.10" && pythonOlder "3.12") [
++ optionals (pythonAtLeast "3.11" && pythonOlder "3.12") [
# https://www.cve.org/CVERecord?id=CVE-2025-0938
./CVE-2025-0938.patch
]
@@ -383,9 +383,6 @@ stdenv.mkDerivation (finalAttrs: {
# fix failing tests with openssl >= 3.4
# https://github.com/python/cpython/pull/127361
]
++ optionals (pythonAtLeast "3.10" && pythonOlder "3.11") [
./3.10/raise-OSError-for-ERR_LIB_SYS.patch
]
++ optionals (pythonAtLeast "3.11" && pythonOlder "3.12") [
(fetchpatch {
url = "https://github.com/python/cpython/commit/f4b31edf2d9d72878dab1f66a36913b5bcc848ec.patch";