lol

python310: 3.10.16 -> 3.10.17

https://docs.python.org/release/3.10.16/whatsnew/changelog.html

+3 -34
-28
pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch
··· 1 - diff --git a/Modules/_ssl.c b/Modules/_ssl.c 2 - index e637830..80728d2 100644 3 - --- a/Modules/_ssl.c 4 - +++ b/Modules/_ssl.c 5 - @@ -656,6 +656,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno) 6 - errstr = "Some I/O error occurred"; 7 - } 8 - } else { 9 - + if (ERR_GET_LIB(e) == ERR_LIB_SYS) { 10 - + // A system error is being reported; reason is set to errno 11 - + errno = ERR_GET_REASON(e); 12 - + return PyErr_SetFromErrno(PyExc_OSError); 13 - + } 14 - p = PY_SSL_ERROR_SYSCALL; 15 - } 16 - break; 17 - @@ -681,6 +686,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno) 18 - errstr = "EOF occurred in violation of protocol"; 19 - } 20 - #endif 21 - + if (ERR_GET_LIB(e) == ERR_LIB_SYS) { 22 - + // A system error is being reported; reason is set to errno 23 - + errno = ERR_GET_REASON(e); 24 - + return PyErr_SetFromErrno(PyExc_OSError); 25 - + } 26 - break; 27 - } 28 - default:
+1 -4
pkgs/development/interpreters/python/cpython/default.nix
··· 327 327 # libuuid, slowing down program startup a lot). 328 328 noldconfigPatch 329 329 ] 330 - ++ optionals (pythonAtLeast "3.10" && pythonOlder "3.12") [ 330 + ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.12") [ 331 331 # https://www.cve.org/CVERecord?id=CVE-2025-0938 332 332 ./CVE-2025-0938.patch 333 333 ] ··· 382 382 ./loongarch-support.patch 383 383 # fix failing tests with openssl >= 3.4 384 384 # https://github.com/python/cpython/pull/127361 385 - ] 386 - ++ optionals (pythonAtLeast "3.10" && pythonOlder "3.11") [ 387 - ./3.10/raise-OSError-for-ERR_LIB_SYS.patch 388 385 ] 389 386 ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.12") [ 390 387 (fetchpatch {
+2 -2
pkgs/development/interpreters/python/default.nix
··· 61 61 sourceVersion = { 62 62 major = "3"; 63 63 minor = "10"; 64 - patch = "16"; 64 + patch = "17"; 65 65 suffix = ""; 66 66 }; 67 - hash = "sha256-v7JJYJmQIgSRobkoUKBxNe0IMeQXOM9oHWPPAbKo+9E="; 67 + hash = "sha256-TGgFDwSdG0rFqt0N9fJ5QcA1DSqeerCQfuXrUiXZ1rA="; 68 68 inherit passthruFun; 69 69 }; 70 70