aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extra/python/checksums4
-rw-r--r--extra/python/patches/libressl-support.patch28
-rw-r--r--extra/python/sources2
-rw-r--r--extra/python/version2
4 files changed, 10 insertions, 26 deletions
diff --git a/extra/python/checksums b/extra/python/checksums
index 1fabe473..b2eac93e 100644
--- a/extra/python/checksums
+++ b/extra/python/checksums
@@ -1,4 +1,4 @@
%BLAKE3
-bdd281739bf27d17e02eb9c5041114205b6dfd19607416ef1583c225e66917dc Python-3.10.1.tar.xz
+b2364d23f55c9e263cab3507d250eec75d019228db57cf8275a5999ff8cbfd96 Python-3.10.2.tar.xz
3d764f2f6c4d40261a96617a6fa23456a7db841a919ed2589d15746b7ef26314 python3-always-pip.patch
-6176ac6bc4178963dcb8745297d110ac8ba412cea57ad6f339f0c6ffc39917e3 libressl-support.patch
+297f33579bcdbc530a1cd18040906d2ae26eef3c18e81d2cc0b557549a188242 libressl-support.patch
diff --git a/extra/python/patches/libressl-support.patch b/extra/python/patches/libressl-support.patch
index faa3a164..0a7461aa 100644
--- a/extra/python/patches/libressl-support.patch
+++ b/extra/python/patches/libressl-support.patch
@@ -1,21 +1,8 @@
-From 308e4f113891bea997bcac7e7e48a18956478265 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 5 Oct 2021 14:44:43 -0700
-Subject: [PATCH] Re-add support for libressl
-
----
- Modules/_hashopenssl.c | 4 +++
- Modules/_ssl.c | 58 +++++++++++++++++++++------------
- Modules/_ssl/debughelpers.c | 4 +++
- Modules/clinic/_hashopenssl.c.h | 10 +++++-
- Modules/clinic/_ssl.c.h | 28 ++++++++++++----
- 5 files changed, 77 insertions(+), 27 deletions(-)
-
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
-index b9e68c05c3..75eb76266a 100644
+index cb8460ab2f..2c245262f3 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
-@@ -40,10 +40,12 @@
+@@ -45,10 +45,12 @@
#define MUNCH_SIZE INT_MAX
@@ -26,9 +13,9 @@ index b9e68c05c3..75eb76266a 100644
#define PY_OPENSSL_HAS_BLAKE2 1
+#endif
- static PyModuleDef _hashlibmodule;
-
-@@ -1794,6 +1796,7 @@ hashlib_md_meth_names(PyObject *module)
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #define PY_EVP_MD EVP_MD
+@@ -1884,6 +1886,7 @@ hashlib_md_meth_names(PyObject *module)
return 0;
}
@@ -36,7 +23,7 @@ index b9e68c05c3..75eb76266a 100644
/*[clinic input]
_hashlib.get_fips_mode -> int
-@@ -1831,6 +1834,7 @@ _hashlib_get_fips_mode_impl(PyObject *module)
+@@ -1921,6 +1924,7 @@ _hashlib_get_fips_mode_impl(PyObject *module)
return result;
#endif
}
@@ -398,6 +385,3 @@ index b59b129af8..f6bcd09e03 100644
#endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
-/*[clinic end generated code: output=5a7d7bf5cf8ee092 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=0e12e5e4ee2221b5 input=a9049054013a1b77]*/
---
-2.32.0
-
diff --git a/extra/python/sources b/extra/python/sources
index 2a67000a..54c79b50 100644
--- a/extra/python/sources
+++ b/extra/python/sources
@@ -1,3 +1,3 @@
-https://www.python.org/ftp/python/3.10.1/Python-3.10.1.tar.xz
+https://www.python.org/ftp/python/3.10.2/Python-3.10.2.tar.xz
patches/python3-always-pip.patch
patches/libressl-support.patch
diff --git a/extra/python/version b/extra/python/version
index 35e3db04..c84c941b 100644
--- a/extra/python/version
+++ b/extra/python/version
@@ -1 +1 @@
-3.10.1 1
+3.10.2 1