gentoo (valentine's day) resync : 14.02.2021

3 files changed, 43 insertions, 2 deletions

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 7093d6c7a1fe..61917669a73c 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -2,9 +2,10 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
 AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecdafc17c76dde4d23169ecbde86ec6ca3e5a9646a719ea91ada57b8a7bf151ee3d63420730aae0a6003136551f7 SHA512 ce8258ac5c87b9c978ce780120c31848306a652d9b87ece90ba17ebbaee545806fc62e6f63538fc0cdf557c6b98eec8c0978fe4fbe3b24ea8e2ab9617c99b1ef
 AUX 7.3.2-py37-distutils-cxx.patch 14756 BLAKE2B 3524f2fbeef2b23a17c2248fbe07e0b194f2d6cc8be9c4ffec9c7a745421577d0c246a82c61afbd4af116f6ec756ce11988093e3e0a74337868530382206dd7d SHA512 e590266f1f6f5571b0056fbbf38c54bd7f07bebcdc009dbfaa3203aaeb3f70eac0f9b281df3ec04771960dea930b30ae861bb1dbc886fa28dfb8c58e484f6a8d
+AUX 7.3.3_p37-sni-handle.patch 1971 BLAKE2B 953b55283d9aceddf0dd6e6e6b786c3a472b012cb78e2398d58bc7f3be13438fc74aeb2c7d34de45d59546087b78b0f1babca0038c6f097f629273f41bf259be SHA512 6573a966a6a3f1256cdd8a97ac43088b1328fc8d7c3b386b784a2e4ffdfbdafc791f37e5ac3dca0cd0ad0b12e2aa9992e4188fce1a67e57f79c7cdaae7fcc44d
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e2565555e5f73218e3c35ae1ebd SHA512 3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
 EBUILD pypy3-7.3.3.ebuild 6592 BLAKE2B 6495b67c88ef6ca88f490d55a129b41ca6913d2c9d229d7af88db36efb8b5aec6642d503029dcf774660d6ca512490fbb377563b17343e2f85dd0ecda6ef5643 SHA512 ce4b59bd08bbe62853a166bc010ea5474996da48df396c945bbf1fb3dc413f8e85351fd991433d43155f486f058bab52cffefbf1d1041b369147db37f5c0921b
-EBUILD pypy3-7.3.3_p37.ebuild 5423 BLAKE2B 1c0a61ad14c9f76d069aebf3c7d2f55d4278936f3a591eedcf10d58070d3508504122e5e32775e1f262ad7eccdb7c26795518b1edfb8e162aee3fc6324d3533a SHA512 840e0fc134f7523e0dc6780c7ff38b81c1033468570f3b48326de5f0ea5c64ca9c34e7cb8603ba85084a412c84f44043f966ff411b632388752692c8feb30896
+EBUILD pypy3-7.3.3_p37-r1.ebuild 5525 BLAKE2B 81f8f24b6d86d769f24fba4549ba2f5566a4a6b6417d8cf39b7b3c46fd7adebc4194ef8c1d9617dd09c0a29f63be21ad4349cb9c14a777d6583232d5498265cc SHA512 f78a86ac32512a4f153189eff473f5f2ea18791a30f446ca44e3127cedeb8219142e6531e83ddf1be88cbfd0b11df65a166623655a604a0946db4256a6fd0b7e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch b/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch
new file mode 100644
index 000000000000..c4e377c3d8d8
--- /dev/null
+++ b/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch
@@ -0,0 +1,38 @@
+diff -dupr a/lib_pypy/_cffi_ssl/_stdssl/__init__.py b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py	2021-02-10 00:15:40.815208732 +0100
++++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py	2021-02-10 00:19:27.963109365 +0100
+@@ -1008,10 +1008,10 @@ for name in SSL_CTX_STATS_NAMES:
+     SSL_CTX_STATS.append((name, getattr(lib, attr)))
+ 
+ class _SSLContext(object):
+-    __slots__ = ('ctx', '_check_hostname', 'servername_callback',
++    __slots__ = ('ctx', '_check_hostname',
+                  'alpn_protocols', '_alpn_protocols_handle', '_protocol'
+                  'npn_protocols', 'set_hostname', '_post_handshake_auth',
+-                 '_sni_cb', '_npn_protocols_handle')
++                 '_sni_cb', '_sni_cb_handle', '_npn_protocols_handle')
+     def __new__(cls, protocol):
+         self = object.__new__(cls)
+         self.ctx = ffi.NULL
+@@ -1451,15 +1451,17 @@ class _SSLContext(object):
+                     "is not in the current OpenSSL library.")
+         if cb is None:
+             lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, ffi.NULL)
+-            self._sni_cb= None
++            self._sni_cb = None
++            lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, ffi.NULL)
++            self._sni_cb_handle = None
+             return
+         if not callable(cb):
+             lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, ffi.NULL)
+             raise TypeError("not a callable object")
+-        self.scb = ServernameCallback(cb, self)
+-        sni_cb = ffi.new_handle(self.scb)
++        self._sni_cb = ServernameCallback(cb, self)
++        self._sni_cb_handle = ffi.new_handle(self._sni_cb)
+         lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, _servername_callback)
+-        lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, sni_cb)
++        lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, self._sni_cb_handle)
+ 
+     def cert_store_stats(self):
+         store = lib.SSL_CTX_get_cert_store(self.ctx)
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
index 9c1fc7d860ba..a5d9d3cf0aa9 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,8 @@ src_prepare() {
 	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
+	# https://foss.heptapod.net/pypy/pypy/-/issues/3396
+	eapply "${FILESDIR}/7.3.3_p37-sni-handle.patch"
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
 		-i lib-python/3/distutils/command/install.py || die