1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

lang/python39: Update to 3.9.5

Changes:	https://docs.python.org/release/3.9.5/whatsnew/changelog.html
PR:		255730
This commit is contained in:
Yasuhiro Kimura 2021-05-12 05:46:14 +08:00 committed by Po-Chuan Hsieh
parent 9738c1c2ea
commit 3e66373124
No known key found for this signature in database
GPG Key ID: 9A4BD10F002DD04B
6 changed files with 144 additions and 16 deletions

View File

@ -1,4 +1,4 @@
TIMESTAMP = 1618020033
TIMESTAMP = 1620670761
SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 3d05142817615e77cec99f686dca58289bbfe008af22f94a93262e8663db81c7
SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4732851
SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = ead357695e43c824ae1a83dd6cd3b4a47215658f3fa20111726ff7ef16a16dd2
@ -31,11 +31,11 @@ SHA256 (python/python-3.8.9-docs-pdf-letter.tar.bz2) = fa9486d866cd97c41ff5b9779
SIZE (python/python-3.8.9-docs-pdf-letter.tar.bz2) = 14852518
SHA256 (python/python-3.8.9-docs-text.tar.bz2) = ae788a774188bb39c9d28522d01c1522772d1191bb4424bbe703875dcdcc6d06
SIZE (python/python-3.8.9-docs-text.tar.bz2) = 2419398
SHA256 (python/python-3.9.4-docs-html.tar.bz2) = e80e096db83180a74bfa7ae924e1e4aaea5e641a45e1919d526cfd1502161ad0
SIZE (python/python-3.9.4-docs-html.tar.bz2) = 6831159
SHA256 (python/python-3.9.4-docs-pdf-a4.tar.bz2) = cf3b8859949b6dc101390bba9857cb355a0af97a0a5e647d7deb80a13e4afc14
SIZE (python/python-3.9.4-docs-pdf-a4.tar.bz2) = 15294004
SHA256 (python/python-3.9.4-docs-pdf-letter.tar.bz2) = c2822b4961c1ec04363b69347eb0fca0f3deac1326824005f44742d9197df1e0
SIZE (python/python-3.9.4-docs-pdf-letter.tar.bz2) = 15401013
SHA256 (python/python-3.9.4-docs-text.tar.bz2) = 93215e805f91a9ddbc5d8b486c3eca2e4af2716736bc165047f684977627747b
SIZE (python/python-3.9.4-docs-text.tar.bz2) = 2501885
SHA256 (python/python-3.9.5-docs-html.tar.bz2) = 6b98811ac14cef35f4c9a8e6c26397ecc926e3891555ed10e0aaa7100543fce6
SIZE (python/python-3.9.5-docs-html.tar.bz2) = 6839136
SHA256 (python/python-3.9.5-docs-pdf-a4.tar.bz2) = 96dc7c461304dc68110dfdf9f4b3715df869602f5c75e824a7b6aa80051bde6c
SIZE (python/python-3.9.5-docs-pdf-a4.tar.bz2) = 15301681
SHA256 (python/python-3.9.5-docs-pdf-letter.tar.bz2) = 8d971b80801b490bb371f614bf54020d3461795d88abaccc093d6cf234793ebe
SIZE (python/python-3.9.5-docs-pdf-letter.tar.bz2) = 15410760
SHA256 (python/python-3.9.5-docs-text.tar.bz2) = 57dd338762351a359128c99bb4d8bb8c68f99e15a4a521261c88608b19fc7ae4
SIZE (python/python-3.9.5-docs-text.tar.bz2) = 2504264

View File

@ -2,7 +2,6 @@
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}

View File

@ -2,4 +2,4 @@
# Do not forget to update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
PYTHON_PORTVERSION= 3.9.4
PYTHON_PORTVERSION= 3.9.5

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1617950542
SHA256 (python/Python-3.9.4.tar.xz) = 4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134
SIZE (python/Python-3.9.4.tar.xz) = 18900304
TIMESTAMP = 1620588345
SHA256 (python/Python-3.9.5.tar.xz) = 0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83
SIZE (python/Python-3.9.5.tar.xz) = 19058600

View File

@ -0,0 +1,128 @@
From 138af6f7696e5450d11a6ef4cdca869a26fefe13 Mon Sep 17 00:00:00 2001
From: Yasuhiro Kimura <yasu@utahime.org>
Date: Tue, 11 May 2021 05:47:21 +0900
Subject: [PATCH] Revert "[3.9] bpo-43799: OpenSSL 3.0.0: declare
OPENSSL_API_COMPAT 1.1.1 (GH-25329) (GH-25382)"
This reverts commit 7d9d5bf863bb0af26b74b0732ab89b2053d2fbec.
---
Modules/_hashopenssl.c | 15 +++++----------
Modules/_ssl.c | 33 +++++++++++++++++++--------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git Modules/_hashopenssl.c Modules/_hashopenssl.c
index 0dd1662101..adc8653773 100644
--- Modules/_hashopenssl.c
+++ Modules/_hashopenssl.c
@@ -11,26 +11,20 @@
*
*/
-/* Don't warn about deprecated functions, */
-#ifndef OPENSSL_API_COMPAT
- // 0x10101000L == 1.1.1, 30000 == 3.0.0
- #define OPENSSL_API_COMPAT 0x10101000L
-#endif
-#define OPENSSL_NO_DEPRECATED 1
-
#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "hashlib.h"
#include "pystrhex.h"
+
/* EVP is the preferred interface to hashing in OpenSSL */
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include <openssl/crypto.h>
/* We use the object interface to discover what hashes OpenSSL supports. */
#include <openssl/objects.h>
-#include <openssl/err.h>
+#include "openssl/err.h"
#include <openssl/crypto.h> // FIPS_mode()
@@ -1817,11 +1811,12 @@ _hashlib_get_fips_mode_impl(PyObject *module)
/*[clinic end generated code: output=87eece1bab4d3fa9 input=2db61538c41c6fef]*/
{
+ int result;
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- return EVP_default_properties_is_fips_enabled(NULL);
+ result = EVP_default_properties_is_fips_enabled(NULL);
#else
ERR_clear_error();
- int result = FIPS_mode();
+ result = FIPS_mode();
if (result == 0) {
// "If the library was built without support of the FIPS Object Module,
// then the function will return 0 with an error code of
diff --git Modules/_ssl.c Modules/_ssl.c
index 97e314b21f..82069a5832 100644
--- Modules/_ssl.c
+++ Modules/_ssl.c
@@ -14,13 +14,6 @@
http://bugs.python.org/issue8108#msg102867 ?
*/
-/* Don't warn about deprecated functions, */
-#ifndef OPENSSL_API_COMPAT
- // 0x10101000L == 1.1.1, 30000 == 3.0.0
- #define OPENSSL_API_COMPAT 0x10101000L
-#endif
-#define OPENSSL_NO_DEPRECATED 1
-
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -50,6 +43,14 @@ static PySocketModule_APIObject PySocketModule;
#include <sys/poll.h>
#endif
+/* Don't warn about deprecated functions */
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
/* Include OpenSSL header files */
#include "openssl/rsa.h"
#include "openssl/crypto.h"
@@ -147,20 +148,24 @@ static void _PySSLFixErrno(void) {
# define PY_OPENSSL_1_1_API 1
#endif
-/* OpenSSL API 1.1.0+ does not include version methods. Define the methods
- * unless OpenSSL is compiled without the methods. It's the easiest way to
- * make 1.0.2, 1.1.0, 1.1.1, and 3.0.0 happy without deprecation warnings.
- */
+/* OpenSSL API compat */
+#ifdef OPENSSL_API_COMPAT
+#if OPENSSL_API_COMPAT >= 0x10100000L
+
+/* OpenSSL API 1.1.0+ does not include version methods */
#ifndef OPENSSL_NO_TLS1_METHOD
-extern const SSL_METHOD *TLSv1_method(void);
+#define OPENSSL_NO_TLS1_METHOD 1
#endif
#ifndef OPENSSL_NO_TLS1_1_METHOD
-extern const SSL_METHOD *TLSv1_1_method(void);
+#define OPENSSL_NO_TLS1_1_METHOD 1
#endif
#ifndef OPENSSL_NO_TLS1_2_METHOD
-extern const SSL_METHOD *TLSv1_2_method(void);
+#define OPENSSL_NO_TLS1_2_METHOD 1
#endif
+#endif /* >= 1.1.0 compcat */
+#endif /* OPENSSL_API_COMPAT */
+
/* 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
--
2.31.1

View File

@ -2186,8 +2186,8 @@ lib/python%%XYDOT%%/ensurepip/_bundled/__init__.py
lib/python%%XYDOT%%/ensurepip/_bundled/__pycache__/__init__.cpython-%%XY%%.opt-1.pyc
lib/python%%XYDOT%%/ensurepip/_bundled/__pycache__/__init__.cpython-%%XY%%.opt-2.pyc
lib/python%%XYDOT%%/ensurepip/_bundled/__pycache__/__init__.cpython-%%XY%%.pyc
lib/python%%XYDOT%%/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl
lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-49.2.1-py3-none-any.whl
lib/python%%XYDOT%%/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl
lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
lib/python%%XYDOT%%/ensurepip/_uninstall.py
lib/python%%XYDOT%%/enum.py
lib/python%%XYDOT%%/filecmp.py
@ -5318,6 +5318,7 @@ lib/python%%XYDOT%%/test/mp_fork_bomb.py
lib/python%%XYDOT%%/test/mp_preload.py
lib/python%%XYDOT%%/test/multibytecodec_support.py
lib/python%%XYDOT%%/test/nokia.pem
lib/python%%XYDOT%%/test/nosan.pem
lib/python%%XYDOT%%/test/nullbytecert.pem
lib/python%%XYDOT%%/test/nullcert.pem
lib/python%%XYDOT%%/test/pickletester.py