forked from Lainports/freebsd-ports
- Update to 3.5.7
This commit is contained in:
Wen Heping
parent
03b3f26dff
commit
cdc91ebc4e
4 changed files with 5 additions and 103 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# Mk/Uses/python.mk includes this file, don't remove it!
|
||||
# $FreeBSD$
|
||||
|
||||
PYTHON_PORTVERSION= 3.5.6
|
||||
PYTHON_PORTVERSION= 3.5.7
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1533311485
|
||||
SHA256 (python/Python-3.5.6.tar.xz) = f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
|
||||
SIZE (python/Python-3.5.6.tar.xz) = 15412832
|
||||
TIMESTAMP = 1552961810
|
||||
SHA256 (python/Python-3.5.7.tar.xz) = 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
|
||||
SIZE (python/Python-3.5.7.tar.xz) = 15324736
|
||||
|
|
|
|||
|
|
@ -1,99 +0,0 @@
|
|||
From f5befbb0d1526f18eb2b24eabb48c3b761c624a2 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Heimes <christian@python.org>
|
||||
Date: Sat, 24 Mar 2018 18:38:14 +0100
|
||||
Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0
|
||||
(GH-6210) (GH-6214)
|
||||
|
||||
LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
|
||||
LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
|
||||
LibreSSL < 2.7.
|
||||
|
||||
Documentation updates and fixes for failing tests will be provided in
|
||||
another patch set.
|
||||
|
||||
Signed-off-by: Christian Heimes <christian@python.org>.
|
||||
(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1)
|
||||
|
||||
Co-authored-by: Christian Heimes <christian@python.org>
|
||||
---
|
||||
Lib/test/test_ssl.py | 1 +
|
||||
.../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 +
|
||||
Modules/_ssl.c | 24 ++++++++++++++--------
|
||||
Tools/ssl/multissltests.py | 3 ++-
|
||||
4 files changed, 20 insertions(+), 9 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
|
||||
|
||||
diff --git Lib/test/test_ssl.py Lib/test/test_ssl.py
|
||||
index 8dd3b41450..9785a59a7e 100644
|
||||
--- Lib/test/test_ssl.py
|
||||
+++ Lib/test/test_ssl.py
|
||||
@@ -1687,6 +1687,7 @@ class SimpleBackgroundTests(unittest.TestCase):
|
||||
self.assertEqual(len(ctx.get_ca_certs()), 1)
|
||||
|
||||
@needs_sni
|
||||
+ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2")
|
||||
def test_context_setget(self):
|
||||
# Check that the context of a connected socket can be replaced.
|
||||
ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
|
||||
diff --git Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.
|
||||
olJmHv.rst
|
||||
new file mode 100644
|
||||
index 0000000000..635aabbde0
|
||||
--- /dev/null
|
||||
+++ Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
|
||||
@@ -0,0 +1 @@
|
||||
+The ssl module now compiles with LibreSSL 2.7.1.
|
||||
diff --git Modules/_ssl.c Modules/_ssl.c
|
||||
index c54e43c2b4..5e007da858 100644
|
||||
--- Modules/_ssl.c
|
||||
+++ Modules/_ssl.c
|
||||
@@ -101,8 +101,14 @@
|
||||
|
||||
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
# define OPENSSL_VERSION_1_1 1
|
||||
+# define PY_OPENSSL_1_1_API 1
|
||||
#endif
|
||||
|
||||
+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
|
||||
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
|
||||
+# define PY_OPENSSL_1_1_API 1
|
||||
+#endif
|
||||
+
|
||||
/* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
|
||||
http://www.openssl.org/news/changelog.html
|
||||
*/
|
||||
@@ -129,16 +135,18 @@
|
||||
#define INVALID_SOCKET (-1)
|
||||
#endif
|
||||
|
||||
-#ifdef OPENSSL_VERSION_1_1
|
||||
-/* OpenSSL 1.1.0+ */
|
||||
-#ifndef OPENSSL_NO_SSL2
|
||||
-#define OPENSSL_NO_SSL2
|
||||
-#endif
|
||||
-#else /* OpenSSL < 1.1.0 */
|
||||
-#if defined(WITH_THREAD)
|
||||
+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */
|
||||
+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD)
|
||||
#define HAVE_OPENSSL_CRYPTO_LOCK
|
||||
#endif
|
||||
|
||||
+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2)
|
||||
+#define OPENSSL_NO_SSL2
|
||||
+#endif
|
||||
+
|
||||
+#ifndef PY_OPENSSL_1_1_API
|
||||
+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */
|
||||
+
|
||||
#define TLS_method SSLv23_method
|
||||
|
||||
static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
|
||||
@@ -187,7 +195,7 @@
|
||||
{
|
||||
return store->param;
|
||||
}
|
||||
-#endif /* OpenSSL < 1.1.0 or LibreSSL */
|
||||
+#endif /* OpenSSL < 1.1.0 or or LibreSSL < 2.7.0 */
|
||||
|
||||
|
||||
enum py_ssl_error {
|
||||
|
|
@ -4968,6 +4968,7 @@ lib/python%%XYDOT%%/test/support/__pycache__/script_helper.cpython-%%XY%%.opt-1.
|
|||
lib/python%%XYDOT%%/test/support/__pycache__/script_helper.cpython-%%XY%%.opt-2.pyc
|
||||
lib/python%%XYDOT%%/test/support/__pycache__/script_helper.cpython-%%XY%%.pyc
|
||||
lib/python%%XYDOT%%/test/support/script_helper.py
|
||||
lib/python%%XYDOT%%/test/talos-2019-0758.pem
|
||||
lib/python%%XYDOT%%/test/test___all__.py
|
||||
lib/python%%XYDOT%%/test/test___future__.py
|
||||
lib/python%%XYDOT%%/test/test__locale.py
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue