git: fa0dc79dca82 - main - lang/python39: Update to 3.9.11

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Wen Heping <wen_at_FreeBSD.org>
Date: Sat, 19 Mar 2022 13:57:54 UTC
The branch main has been updated by wen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fa0dc79dca8275032734aeaaf6f84a3eab7594d1

commit fa0dc79dca8275032734aeaaf6f84a3eab7594d1
Author:     Wen Heping <wen@FreeBSD.org>
AuthorDate: 2022-03-19 13:56:42 +0000
Commit:     Wen Heping <wen@FreeBSD.org>
CommitDate: 2022-03-19 13:56:42 +0000

    lang/python39: Update to 3.9.11
    
    Reviewed by:    yasu@
---
 lang/python-doc-html/distinfo        | 18 +++++++++---------
 lang/python39/Makefile               |  1 -
 lang/python39/Makefile.version       |  2 +-
 lang/python39/distinfo               |  6 +++---
 lang/python39/files/patch-freebsd-12 | 25 +++++++++----------------
 lang/python39/pkg-plist              | 16 +++++++++++++++-
 6 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index fecbe62c8ff2..820ed7be0277 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1647609820
+TIMESTAMP = 1647611600
 SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 20445e9a571cacdd350f702f0980e4dc559b6ff81f1d69affe9b0a862fef2f0e
 SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4634932
 SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = dbac6953e48aac341351067ba0938393e415b10bf48ac8cbbc7247deaf13ab67
@@ -31,11 +31,11 @@ SHA256 (python/python-3.8.12-docs-pdf-letter.tar.bz2) = b175c38c8e63dcded962e7ec
 SIZE (python/python-3.8.12-docs-pdf-letter.tar.bz2) = 14858127
 SHA256 (python/python-3.8.12-docs-text.tar.bz2) = a80a508abdb49d399bf186f2d518a7eee3931e8709b4454ace8079f17b5bc790
 SIZE (python/python-3.8.12-docs-text.tar.bz2) = 2423204
-SHA256 (python/python-3.9.9-docs-html.tar.bz2) = e1e4144010d6500fa95ebe5d95c1587f60861a8cf0b0b675a014e3b4f5435a66
-SIZE (python/python-3.9.9-docs-html.tar.bz2) = 6958136
-SHA256 (python/python-3.9.9-docs-pdf-a4.tar.bz2) = e05415ad2ca127c363cd182e1c74f9383595cc4499f250f41897babe04fad3fa
-SIZE (python/python-3.9.9-docs-pdf-a4.tar.bz2) = 15327944
-SHA256 (python/python-3.9.9-docs-pdf-letter.tar.bz2) = 8dc78757642da0026ef970dd6b39d98b33e6580cfef420e0ae638a13eeea217b
-SIZE (python/python-3.9.9-docs-pdf-letter.tar.bz2) = 15446735
-SHA256 (python/python-3.9.9-docs-text.tar.bz2) = 53612c165664f988523703bbadf9484d4742e5f8f197ba90f9de24855328ae3e
-SIZE (python/python-3.9.9-docs-text.tar.bz2) = 2520398
+SHA256 (python/python-3.9.11-docs-html.tar.bz2) = cd0d1cf07515964f82334f629c7bed8a651907677d6eb64cc179401273eb3051
+SIZE (python/python-3.9.11-docs-html.tar.bz2) = 6947094
+SHA256 (python/python-3.9.11-docs-pdf-a4.tar.bz2) = f54a4209230fdcd443654088d63302606bba6f228fb9216ea6e2ae47539ecc9d
+SIZE (python/python-3.9.11-docs-pdf-a4.tar.bz2) = 15356455
+SHA256 (python/python-3.9.11-docs-pdf-letter.tar.bz2) = d29b5f539171150c33299829fac7021ea734fbba419a13b11b9895bdf28d7f1f
+SIZE (python/python-3.9.11-docs-pdf-letter.tar.bz2) = 15465951
+SHA256 (python/python-3.9.11-docs-text.tar.bz2) = 1a0f28573466a73985da2720bbf867bbc1234a6e49794089e79dae9aef37dc09
+SIZE (python/python-3.9.11-docs-text.tar.bz2) = 2527615
diff --git a/lang/python39/Makefile b/lang/python39/Makefile
index 8185af11c466..8bcc0f0e8cd6 100644
--- a/lang/python39/Makefile
+++ b/lang/python39/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	python
 DISTVERSION=	${PYTHON_DISTVERSION}
-PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
diff --git a/lang/python39/Makefile.version b/lang/python39/Makefile.version
index a8144d049bb3..3e641308f0e1 100644
--- a/lang/python39/Makefile.version
+++ b/lang/python39/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_DISTVERSION=	3.9.9
+PYTHON_DISTVERSION=	3.9.11
diff --git a/lang/python39/distinfo b/lang/python39/distinfo
index 3607b0766271..9118f108863d 100644
--- a/lang/python39/distinfo
+++ b/lang/python39/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638749739
-SHA256 (python/Python-3.9.9.tar.xz) = 06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27
-SIZE (python/Python-3.9.9.tar.xz) = 19144372
+TIMESTAMP = 1647611118
+SHA256 (python/Python-3.9.11.tar.xz) = 66767a35309d724f370df9e503c172b4ee444f49d62b98bc4eca725123e26c49
+SIZE (python/Python-3.9.11.tar.xz) = 19724780
diff --git a/lang/python39/files/patch-freebsd-12 b/lang/python39/files/patch-freebsd-12
index 0a4332586a39..27d7fa761fa9 100644
--- a/lang/python39/files/patch-freebsd-12
+++ b/lang/python39/files/patch-freebsd-12
@@ -14,7 +14,7 @@ diff --git Modules/_hashopenssl.c Modules/_hashopenssl.c
 index 0dd1662101..adc8653773 100644
 --- Modules/_hashopenssl.c
 +++ Modules/_hashopenssl.c
-@@ -11,26 +11,20 @@
+@@ -11,13 +11,6 @@
   *
   */
  
@@ -25,16 +25,10 @@ index 0dd1662101..adc8653773 100644
 -#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>
+ #ifndef Py_BUILD_CORE_BUILTIN
+ #  define Py_BUILD_CORE_MODULE 1
+ #endif
+@@ -35,7 +28,7 @@
  #include <openssl/crypto.h>
  /* We use the object interface to discover what hashes OpenSSL supports. */
  #include <openssl/objects.h>
@@ -43,7 +37,7 @@ index 0dd1662101..adc8653773 100644
  
  #include <openssl/crypto.h>       // FIPS_mode()
  
-@@ -1817,11 +1811,12 @@ _hashlib_get_fips_mode_impl(PyObject *module)
+@@ -1932,11 +1925,12 @@ _hashlib_get_fips_mode_impl(PyObject *module)
  /*[clinic end generated code: output=87eece1bab4d3fa9 input=2db61538c41c6fef]*/
  
  {
@@ -91,7 +85,7 @@ index 97e314b21f..82069a5832 100644
  /* Include OpenSSL header files */
  #include "openssl/rsa.h"
  #include "openssl/crypto.h"
-@@ -147,20 +148,24 @@ static void _PySSLFixErrno(void) {
+@@ -147,19 +148,23 @@ static void _PySSLFixErrno(void) {
  #  define PY_OPENSSL_1_1_API 1
  #endif
  
@@ -116,13 +110,12 @@ index 97e314b21f..82069a5832 100644
 -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/python39/pkg-plist b/lang/python39/pkg-plist
index 3cbed6c5ac10..c0eb4bb7c6f9 100644
--- a/lang/python39/pkg-plist
+++ b/lang/python39/pkg-plist
@@ -2187,7 +2187,7 @@ 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-21.2.4-py3-none-any.whl
+lib/python%%XYDOT%%/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
 lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
 lib/python%%XYDOT%%/ensurepip/_uninstall.py
 lib/python%%XYDOT%%/enum.py
@@ -2432,6 +2432,9 @@ lib/python%%XYDOT%%/idlelib/__pycache__/tree.cpython-%%XY%%.pyc
 lib/python%%XYDOT%%/idlelib/__pycache__/undo.cpython-%%XY%%.opt-1.pyc
 lib/python%%XYDOT%%/idlelib/__pycache__/undo.cpython-%%XY%%.opt-2.pyc
 lib/python%%XYDOT%%/idlelib/__pycache__/undo.cpython-%%XY%%.pyc
+lib/python%%XYDOT%%/idlelib/__pycache__/util.cpython-%%XY%%.opt-1.pyc
+lib/python%%XYDOT%%/idlelib/__pycache__/util.cpython-%%XY%%.opt-2.pyc
+lib/python%%XYDOT%%/idlelib/__pycache__/util.cpython-%%XY%%.pyc
 lib/python%%XYDOT%%/idlelib/__pycache__/window.cpython-%%XY%%.opt-1.pyc
 lib/python%%XYDOT%%/idlelib/__pycache__/window.cpython-%%XY%%.opt-2.pyc
 lib/python%%XYDOT%%/idlelib/__pycache__/window.cpython-%%XY%%.pyc
@@ -2654,6 +2657,9 @@ lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_tree.cpython-%%XY%%.pyc
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_undo.cpython-%%XY%%.opt-1.pyc
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_undo.cpython-%%XY%%.opt-2.pyc
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_undo.cpython-%%XY%%.pyc
+lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_util.cpython-%%XY%%.opt-1.pyc
+lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_util.cpython-%%XY%%.opt-2.pyc
+lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_util.cpython-%%XY%%.pyc
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_warning.cpython-%%XY%%.opt-1.pyc
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_warning.cpython-%%XY%%.opt-2.pyc
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_warning.cpython-%%XY%%.pyc
@@ -2666,6 +2672,8 @@ lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_zoomheight.cpython-%%XY%%
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_zzdummy.cpython-%%XY%%.opt-1.pyc
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_zzdummy.cpython-%%XY%%.opt-2.pyc
 lib/python%%XYDOT%%/idlelib/idle_test/__pycache__/test_zzdummy.cpython-%%XY%%.pyc
+lib/python%%XYDOT%%/idlelib/idle_test/example_noext
+lib/python%%XYDOT%%/idlelib/idle_test/example_stub.pyi
 lib/python%%XYDOT%%/idlelib/idle_test/htest.py
 lib/python%%XYDOT%%/idlelib/idle_test/mock_idle.py
 lib/python%%XYDOT%%/idlelib/idle_test/mock_tk.py
@@ -2724,6 +2732,7 @@ lib/python%%XYDOT%%/idlelib/idle_test/test_textview.py
 lib/python%%XYDOT%%/idlelib/idle_test/test_tooltip.py
 lib/python%%XYDOT%%/idlelib/idle_test/test_tree.py
 lib/python%%XYDOT%%/idlelib/idle_test/test_undo.py
+lib/python%%XYDOT%%/idlelib/idle_test/test_util.py
 lib/python%%XYDOT%%/idlelib/idle_test/test_warning.py
 lib/python%%XYDOT%%/idlelib/idle_test/test_window.py
 lib/python%%XYDOT%%/idlelib/idle_test/test_zoomheight.py
@@ -2756,6 +2765,7 @@ lib/python%%XYDOT%%/idlelib/textview.py
 lib/python%%XYDOT%%/idlelib/tooltip.py
 lib/python%%XYDOT%%/idlelib/tree.py
 lib/python%%XYDOT%%/idlelib/undo.py
+lib/python%%XYDOT%%/idlelib/util.py
 lib/python%%XYDOT%%/idlelib/window.py
 lib/python%%XYDOT%%/idlelib/zoomheight.py
 lib/python%%XYDOT%%/idlelib/zzdummy.py
@@ -3518,6 +3528,9 @@ lib/python%%XYDOT%%/test/__pycache__/ann_module5.cpython-%%XY%%.pyc
 lib/python%%XYDOT%%/test/__pycache__/ann_module6.cpython-%%XY%%.opt-1.pyc
 lib/python%%XYDOT%%/test/__pycache__/ann_module6.cpython-%%XY%%.opt-2.pyc
 lib/python%%XYDOT%%/test/__pycache__/ann_module6.cpython-%%XY%%.pyc
+lib/python%%XYDOT%%/test/__pycache__/ann_module7.cpython-%%XY%%.opt-1.pyc
+lib/python%%XYDOT%%/test/__pycache__/ann_module7.cpython-%%XY%%.opt-2.pyc
+lib/python%%XYDOT%%/test/__pycache__/ann_module7.cpython-%%XY%%.pyc
 lib/python%%XYDOT%%/test/__pycache__/audiotests.cpython-%%XY%%.opt-1.pyc
 lib/python%%XYDOT%%/test/__pycache__/audiotests.cpython-%%XY%%.opt-2.pyc
 lib/python%%XYDOT%%/test/__pycache__/audiotests.cpython-%%XY%%.pyc
@@ -4960,6 +4973,7 @@ lib/python%%XYDOT%%/test/ann_module2.py
 lib/python%%XYDOT%%/test/ann_module3.py
 lib/python%%XYDOT%%/test/ann_module5.py
 lib/python%%XYDOT%%/test/ann_module6.py
+lib/python%%XYDOT%%/test/ann_module7.py
 lib/python%%XYDOT%%/test/audiodata/pluck-alaw.aifc
 lib/python%%XYDOT%%/test/audiodata/pluck-pcm16.aiff
 lib/python%%XYDOT%%/test/audiodata/pluck-pcm16.au