From fe6d4cfa2cba44108111279afc23aa46acaa6d36 Mon Sep 17 00:00:00 2001 From: Yasuhiro Kimura Date: Mon, 10 May 2021 04:19:28 +0900 Subject: [PATCH] lang/python38: Update to 3.8.10 Update to 3.8.10. Change Log: https://docs.python.org/release/3.8.10/whatsnew/changelog.html#python-3-8-10-final Security: bffa40db-ad50-11eb-86b8-080027846a02 --- lang/python-doc-html/distinfo | 18 +-- lang/python38/Makefile.version | 2 +- lang/python38/distinfo | 6 +- lang/python38/files/patch-fix-build-with-12.x | 107 ++++++++++++++++++ lang/python38/pkg-plist | 5 +- 5 files changed, 123 insertions(+), 15 deletions(-) create mode 100644 lang/python38/files/patch-fix-build-with-12.x diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo index ba5ecf5b1a03..d886ab6bc972 100644 --- a/lang/python-doc-html/distinfo +++ b/lang/python-doc-html/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1618020033 +TIMESTAMP = 1620670526 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 @@ -23,14 +23,14 @@ SHA256 (python/python-3.7.10-docs-pdf-letter.tar.bz2) = 96de9c6e92754e8f0ab27cb7 SIZE (python/python-3.7.10-docs-pdf-letter.tar.bz2) = 14359866 SHA256 (python/python-3.7.10-docs-text.tar.bz2) = cf6e58134550e92b6e25d365010834c8abdbed1479edf7a566fa841fcec6b960 SIZE (python/python-3.7.10-docs-text.tar.bz2) = 2293462 -SHA256 (python/python-3.8.9-docs-html.tar.bz2) = 0bece0235bdbddea03bfb855ee192ae9889745585dc47bfcae2e29856d212c09 -SIZE (python/python-3.8.9-docs-html.tar.bz2) = 6593775 -SHA256 (python/python-3.8.9-docs-pdf-a4.tar.bz2) = b018e3ad4253207929d622401d9db76ea0d8782d516c431309294d9b3a8c2f8f -SIZE (python/python-3.8.9-docs-pdf-a4.tar.bz2) = 14737815 -SHA256 (python/python-3.8.9-docs-pdf-letter.tar.bz2) = fa9486d866cd97c41ff5b97799a01285dbba7b8e976e28a8d2de83ce22b17395 -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.8.10-docs-html.tar.bz2) = 5a24209934220c13e9ed531c50ae4ba80d7179fbbee383949873be785fe5b27d +SIZE (python/python-3.8.10-docs-html.tar.bz2) = 6604538 +SHA256 (python/python-3.8.10-docs-pdf-a4.tar.bz2) = a8e3e50608f7c99525040eee88d3dfea8d85ad6f6962a1d96d5e1d6e434ec60b +SIZE (python/python-3.8.10-docs-pdf-a4.tar.bz2) = 14748468 +SHA256 (python/python-3.8.10-docs-pdf-letter.tar.bz2) = dd463cd678e3d1e911dd9cc06fdc7967cf7c8754d76959a2a3075dcaa04ff8ca +SIZE (python/python-3.8.10-docs-pdf-letter.tar.bz2) = 14858809 +SHA256 (python/python-3.8.10-docs-text.tar.bz2) = b5e2151e5cfb41bce2a71b5a8c97e0315740656e4d5aeb9dbbf72cc21a4eb99b +SIZE (python/python-3.8.10-docs-text.tar.bz2) = 2422201 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 diff --git a/lang/python38/Makefile.version b/lang/python38/Makefile.version index 5587d0177cf9..12ed93354d24 100644 --- a/lang/python38/Makefile.version +++ b/lang/python38/Makefile.version @@ -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.8.9 +PYTHON_PORTVERSION= 3.8.10 diff --git a/lang/python38/distinfo b/lang/python38/distinfo index 528aa0cecb5e..afc231401866 100644 --- a/lang/python38/distinfo +++ b/lang/python38/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618019194 -SHA256 (python/Python-3.8.9.tar.xz) = 5e391f3ec45da2954419cab0beaefd8be38895ea5ce33577c3ec14940c4b9572 -SIZE (python/Python-3.8.9.tar.xz) = 18271948 +TIMESTAMP = 1620584856 +SHA256 (python/Python-3.8.10.tar.xz) = 6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9 +SIZE (python/Python-3.8.10.tar.xz) = 18433456 diff --git a/lang/python38/files/patch-fix-build-with-12.x b/lang/python38/files/patch-fix-build-with-12.x new file mode 100644 index 000000000000..eb10e947872e --- /dev/null +++ b/lang/python38/files/patch-fix-build-with-12.x @@ -0,0 +1,107 @@ +From 9fa60bf7361d3244c19ed273fd4f1df7dd9698b0 Mon Sep 17 00:00:00 2001 +From: Yasuhiro Kimura +Date: Tue, 11 May 2021 04:17:33 +0900 +Subject: [PATCH] Revert "[3.8] bpo-43799: OpenSSL 3.0.0: declare + OPENSSL_API_COMPAT 1.1.1 (GH-25329) (GH-25383)" + +This reverts commit b71aaa0df0f3a9640b034b4774651cd8c54d2fb9. +--- + Modules/_hashopenssl.c | 9 +-------- + Modules/_ssl.c | 33 +++++++++++++++++++-------------- + 2 files changed, 20 insertions(+), 22 deletions(-) + +diff --git Modules/_hashopenssl.c Modules/_hashopenssl.c +index 93bf25fee3..edadbcb393 100644 +--- Modules/_hashopenssl.c ++++ Modules/_hashopenssl.c +@@ -11,13 +11,6 @@ + * + */ + +-/* 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" +@@ -31,7 +24,7 @@ + #include + /* We use the object interface to discover what hashes OpenSSL supports. */ + #include +-#include ++#include "openssl/err.h" + + #ifndef OPENSSL_THREADS + # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" +diff --git Modules/_ssl.c Modules/_ssl.c +index d6a2fb814a..5cbc2b65be 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" +@@ -52,6 +45,14 @@ static PySocketModule_APIObject PySocketModule; + #include + #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" +@@ -149,20 +150,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 + diff --git a/lang/python38/pkg-plist b/lang/python38/pkg-plist index 64c024f3a697..dd3642dbbdcf 100644 --- a/lang/python38/pkg-plist +++ b/lang/python38/pkg-plist @@ -2166,8 +2166,8 @@ lib/python%%XYDOT%%/ensurepip/__pycache__/__main__.cpython-%%XY%%.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.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 @@ -5302,6 +5302,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/outstanding_bugs.py -- 2.31.1