Attachment #224819 for bug #255729




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

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.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

Lines 2-5 Link Here

(-)b/lang/python38/Makefile.version (-1 / +1 lines)
2		2
3	# Do not forget to update python documentation (lang/python-doc-*)	3	# Do not forget to update python documentation (lang/python-doc-*)
4	# Run "make -C lang/python-doc-html makesum"	4	# Run "make -C lang/python-doc-html makesum"
5	PYTHON_PORTVERSION= 3.8.9	5	PYTHON_PORTVERSION= 3.8.10

Lines 1-3 Link Here

(-)b/lang/python38/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1618019194	1	TIMESTAMP = 1620584856
2	SHA256 (python/Python-3.8.9.tar.xz) = 5e391f3ec45da2954419cab0beaefd8be38895ea5ce33577c3ec14940c4b9572	2	SHA256 (python/Python-3.8.10.tar.xz) = 6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9
3	SIZE (python/Python-3.8.9.tar.xz) = 18271948	3	SIZE (python/Python-3.8.10.tar.xz) = 18433456




From 9fa60bf7361d3244c19ed273fd4f1df7dd9698b0 Mon Sep 17 00:00:00 2001
From: Yasuhiro Kimura <yasu@utahime.org>
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 <openssl/hmac.h>
 /* We use the object interface to discover what hashes OpenSSL supports. */
 #include <openssl/objects.h>
-#include <openssl/err.h>
+#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 <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"
@@ -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





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-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

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
- 

Return to bug 255729

Lines 1-4 Link Here

(-)b/lang/python-doc-html/distinfo (-9 / +9 lines)
1	TIMESTAMP = 1618020033	1	TIMESTAMP = 1620670526
2	SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 3d05142817615e77cec99f686dca58289bbfe008af22f94a93262e8663db81c7	2	SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 3d05142817615e77cec99f686dca58289bbfe008af22f94a93262e8663db81c7
3	SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4732851	3	SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4732851
4	SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = ead357695e43c824ae1a83dd6cd3b4a47215658f3fa20111726ff7ef16a16dd2	4	SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = ead357695e43c824ae1a83dd6cd3b4a47215658f3fa20111726ff7ef16a16dd2
Lines 23-36 SHA256 (python/python-3.7.10-docs-pdf-letter.tar.bz2) = 96de9c6e92754e8f0ab27cb7 Link Here
23	SIZE (python/python-3.7.10-docs-pdf-letter.tar.bz2) = 14359866	23	SIZE (python/python-3.7.10-docs-pdf-letter.tar.bz2) = 14359866
24	SHA256 (python/python-3.7.10-docs-text.tar.bz2) = cf6e58134550e92b6e25d365010834c8abdbed1479edf7a566fa841fcec6b960	24	SHA256 (python/python-3.7.10-docs-text.tar.bz2) = cf6e58134550e92b6e25d365010834c8abdbed1479edf7a566fa841fcec6b960
25	SIZE (python/python-3.7.10-docs-text.tar.bz2) = 2293462	25	SIZE (python/python-3.7.10-docs-text.tar.bz2) = 2293462
26	SHA256 (python/python-3.8.9-docs-html.tar.bz2) = 0bece0235bdbddea03bfb855ee192ae9889745585dc47bfcae2e29856d212c09	26	SHA256 (python/python-3.8.10-docs-html.tar.bz2) = 5a24209934220c13e9ed531c50ae4ba80d7179fbbee383949873be785fe5b27d
27	SIZE (python/python-3.8.9-docs-html.tar.bz2) = 6593775	27	SIZE (python/python-3.8.10-docs-html.tar.bz2) = 6604538
28	SHA256 (python/python-3.8.9-docs-pdf-a4.tar.bz2) = b018e3ad4253207929d622401d9db76ea0d8782d516c431309294d9b3a8c2f8f	28	SHA256 (python/python-3.8.10-docs-pdf-a4.tar.bz2) = a8e3e50608f7c99525040eee88d3dfea8d85ad6f6962a1d96d5e1d6e434ec60b
29	SIZE (python/python-3.8.9-docs-pdf-a4.tar.bz2) = 14737815	29	SIZE (python/python-3.8.10-docs-pdf-a4.tar.bz2) = 14748468
30	SHA256 (python/python-3.8.9-docs-pdf-letter.tar.bz2) = fa9486d866cd97c41ff5b97799a01285dbba7b8e976e28a8d2de83ce22b17395	30	SHA256 (python/python-3.8.10-docs-pdf-letter.tar.bz2) = dd463cd678e3d1e911dd9cc06fdc7967cf7c8754d76959a2a3075dcaa04ff8ca
31	SIZE (python/python-3.8.9-docs-pdf-letter.tar.bz2) = 14852518	31	SIZE (python/python-3.8.10-docs-pdf-letter.tar.bz2) = 14858809
32	SHA256 (python/python-3.8.9-docs-text.tar.bz2) = ae788a774188bb39c9d28522d01c1522772d1191bb4424bbe703875dcdcc6d06	32	SHA256 (python/python-3.8.10-docs-text.tar.bz2) = b5e2151e5cfb41bce2a71b5a8c97e0315740656e4d5aeb9dbbf72cc21a4eb99b
33	SIZE (python/python-3.8.9-docs-text.tar.bz2) = 2419398	33	SIZE (python/python-3.8.10-docs-text.tar.bz2) = 2422201
34	SHA256 (python/python-3.9.4-docs-html.tar.bz2) = e80e096db83180a74bfa7ae924e1e4aaea5e641a45e1919d526cfd1502161ad0	34	SHA256 (python/python-3.9.4-docs-html.tar.bz2) = e80e096db83180a74bfa7ae924e1e4aaea5e641a45e1919d526cfd1502161ad0
35	SIZE (python/python-3.9.4-docs-html.tar.bz2) = 6831159	35	SIZE (python/python-3.9.4-docs-html.tar.bz2) = 6831159
36	SHA256 (python/python-3.9.4-docs-pdf-a4.tar.bz2) = cf3b8859949b6dc101390bba9857cb355a0af97a0a5e647d7deb80a13e4afc14	36	SHA256 (python/python-3.9.4-docs-pdf-a4.tar.bz2) = cf3b8859949b6dc101390bba9857cb355a0af97a0a5e647d7deb80a13e4afc14

Added Link Here

(-)b/lang/python38/files/patch-fix-build-with-12.x (+107 lines)
1	From 9fa60bf7361d3244c19ed273fd4f1df7dd9698b0 Mon Sep 17 00:00:00 2001
2	From: Yasuhiro Kimura <yasu@utahime.org>
3	Date: Tue, 11 May 2021 04:17:33 +0900
4	Subject: [PATCH] Revert "[3.8] bpo-43799: OpenSSL 3.0.0: declare
5	OPENSSL_API_COMPAT 1.1.1 (GH-25329) (GH-25383)"
6
7	This reverts commit b71aaa0df0f3a9640b034b4774651cd8c54d2fb9.
8	---
9	Modules/_hashopenssl.c \| 9 +--------
10	Modules/_ssl.c \| 33 +++++++++++++++++++--------------
11	2 files changed, 20 insertions(+), 22 deletions(-)
12
13	diff --git Modules/_hashopenssl.c Modules/_hashopenssl.c
14	index 93bf25fee3..edadbcb393 100644
15	--- Modules/_hashopenssl.c
16	+++ Modules/_hashopenssl.c
17	@@ -11,13 +11,6 @@
18	*
19	*/
20
21	-/* Don't warn about deprecated functions, */
22	-#ifndef OPENSSL_API_COMPAT
23	- // 0x10101000L == 1.1.1, 30000 == 3.0.0
24	- #define OPENSSL_API_COMPAT 0x10101000L
25	-#endif
26	-#define OPENSSL_NO_DEPRECATED 1
27	-
28	#define PY_SSIZE_T_CLEAN
29
30	#include "Python.h"
31	@@ -31,7 +24,7 @@
32	#include <openssl/hmac.h>
33	/* We use the object interface to discover what hashes OpenSSL supports. */
34	#include <openssl/objects.h>
35	-#include <openssl/err.h>
36	+#include "openssl/err.h"
37
38	#ifndef OPENSSL_THREADS
39	# error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL"
40	diff --git Modules/_ssl.c Modules/_ssl.c
41	index d6a2fb814a..5cbc2b65be 100644
42	--- Modules/_ssl.c
43	+++ Modules/_ssl.c
44	@@ -14,13 +14,6 @@
45	http://bugs.python.org/issue8108#msg102867 ?
46	*/
47
48	-/* Don't warn about deprecated functions, */
49	-#ifndef OPENSSL_API_COMPAT
50	- // 0x10101000L == 1.1.1, 30000 == 3.0.0
51	- #define OPENSSL_API_COMPAT 0x10101000L
52	-#endif
53	-#define OPENSSL_NO_DEPRECATED 1
54	-
55	#define PY_SSIZE_T_CLEAN
56
57	#include "Python.h"
58	@@ -52,6 +45,14 @@ static PySocketModule_APIObject PySocketModule;
59	#include <sys/poll.h>
60	#endif
61
62	+/* Don't warn about deprecated functions */
63	+#ifdef __GNUC__
64	+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
65	+#endif
66	+#ifdef __clang__
67	+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
68	+#endif
69	+
70	/* Include OpenSSL header files */
71	#include "openssl/rsa.h"
72	#include "openssl/crypto.h"
73	@@ -149,20 +150,24 @@ static void _PySSLFixErrno(void) {
74	# define PY_OPENSSL_1_1_API 1
75	#endif
76
77	-/* OpenSSL API 1.1.0+ does not include version methods. Define the methods
78	- * unless OpenSSL is compiled without the methods. It's the easiest way to
79	- * make 1.0.2, 1.1.0, 1.1.1, and 3.0.0 happy without deprecation warnings.
80	- */
81	+/* OpenSSL API compat */
82	+#ifdef OPENSSL_API_COMPAT
83	+#if OPENSSL_API_COMPAT >= 0x10100000L
84	+
85	+/* OpenSSL API 1.1.0+ does not include version methods */
86	#ifndef OPENSSL_NO_TLS1_METHOD
87	-extern const SSL_METHOD *TLSv1_method(void);
88	+#define OPENSSL_NO_TLS1_METHOD 1
89	#endif
90	#ifndef OPENSSL_NO_TLS1_1_METHOD
91	-extern const SSL_METHOD *TLSv1_1_method(void);
92	+#define OPENSSL_NO_TLS1_1_METHOD 1
93	#endif
94	#ifndef OPENSSL_NO_TLS1_2_METHOD
95	-extern const SSL_METHOD *TLSv1_2_method(void);
96	+#define OPENSSL_NO_TLS1_2_METHOD 1
97	#endif
98
99	+#endif /* >= 1.1.0 compcat */
100	+#endif /* OPENSSL_API_COMPAT */
101	+
102	/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
103	#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
104	# define PY_OPENSSL_1_1_API 1
105	--
106	2.31.1
107

Lines 2166-2173 lib/python%%XYDOT%%/ensurepip/__pycache__/__main__.cpython-%%XY%%.pyc Link Here

(-)b/lang/python38/pkg-plist (-3 / +3 lines)
2166	lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-1.pyc	2166	lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-1.pyc
2167	lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-2.pyc	2167	lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-2.pyc
2168	lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.pyc	2168	lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.pyc
2169	lib/python%%XYDOT%%/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl	2169	lib/python%%XYDOT%%/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl
2170	lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-49.2.1-py3-none-any.whl	2170	lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
2171	lib/python%%XYDOT%%/ensurepip/_uninstall.py	2171	lib/python%%XYDOT%%/ensurepip/_uninstall.py
2172	lib/python%%XYDOT%%/enum.py	2172	lib/python%%XYDOT%%/enum.py
2173	lib/python%%XYDOT%%/filecmp.py	2173	lib/python%%XYDOT%%/filecmp.py
Lines 5302-5307 lib/python%%XYDOT%%/test/mp_fork_bomb.py Link Here
5302	lib/python%%XYDOT%%/test/mp_preload.py	5302	lib/python%%XYDOT%%/test/mp_preload.py
5303	lib/python%%XYDOT%%/test/multibytecodec_support.py	5303	lib/python%%XYDOT%%/test/multibytecodec_support.py
5304	lib/python%%XYDOT%%/test/nokia.pem	5304	lib/python%%XYDOT%%/test/nokia.pem
		5305	lib/python%%XYDOT%%/test/nosan.pem
5305	lib/python%%XYDOT%%/test/nullbytecert.pem	5306	lib/python%%XYDOT%%/test/nullbytecert.pem
5306	lib/python%%XYDOT%%/test/nullcert.pem	5307	lib/python%%XYDOT%%/test/nullcert.pem
5307	lib/python%%XYDOT%%/test/outstanding_bugs.py	5308	lib/python%%XYDOT%%/test/outstanding_bugs.py
5308	-