Multiple security fixes in this update. https://docs.python.org/release/3.9.4/whatsnew/changelog.html https://docs.python.org/release/3.9.5/whatsnew/changelog.html
3.9.3 apparently broke the API, so 3.9.4 replaced it with that fixed. Like the 3.8 update, tests run to completion which they never have before. ok? cc maintainer --Kurt Index: Makefile =================================================================== RCS file: /cvs/ports/lang/python/3.9/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 23 Mar 2021 11:44:00 -0000 1.5 +++ Makefile 6 Jun 2021 23:17:49 -0000 @@ -6,8 +6,7 @@ # Python itself. VERSION = 3.9 -PATCHLEVEL = .2 -REVISION-main = 0 +PATCHLEVEL = .5 SHARED_LIBS = python3.9 0.0 VERSION_SPEC = >=3.9,<3.10 #PSUBDIR = python/3.9.0 Index: distinfo =================================================================== RCS file: /cvs/ports/lang/python/3.9/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 21 Feb 2021 19:23:21 -0000 1.3 +++ distinfo 6 Jun 2021 23:17:49 -0000 @@ -1,2 +1,2 @@ -SHA256 (Python-3.9.2.tgz) = eJnopveUZ0iDDWZzny2PKzAhTa2Vbla5uiFrPeVYFRk= -SIZE (Python-3.9.2.tgz) = 25399571 +SHA256 (Python-3.9.5.tgz) = 4PvVtuHuJCUkQw3uPJG69Mu6ukpy3RZ0uQ/ah7cTx6s= +SIZE (Python-3.9.5.tgz) = 25627989 Index: files/CHANGES.OpenBSD =================================================================== RCS file: /cvs/ports/lang/python/3.9/files/CHANGES.OpenBSD,v retrieving revision 1.3 diff -u -p -r1.3 CHANGES.OpenBSD --- files/CHANGES.OpenBSD 21 Feb 2021 19:23:21 -0000 1.3 +++ files/CHANGES.OpenBSD 6 Jun 2021 23:17:49 -0000 @@ -6,12 +6,9 @@ of changes made to this version of Pytho 1. OpenBSD packages require that sonames are under control of the ports infrastructure, configure.ac was patched to do this. -2. Avoid "unsupported locale setting" in tests, see -http://bugs.python.org/issue25191 +2. #ifdef patches to work with LibreSSL. -3. #ifdef patches to work with LibreSSL. - -4. Disable libuuid, otherwise Python prefers it over the libc uuid +3. Disable libuuid, otherwise Python prefers it over the libc uuid functions. These changes are available in the OpenBSD CVS repository Index: patches/patch-Lib_test_test_locale_py =================================================================== RCS file: patches/patch-Lib_test_test_locale_py diff -N patches/patch-Lib_test_test_locale_py --- patches/patch-Lib_test_test_locale_py 5 Oct 2020 20:48:10 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-Lib_test_test_locale_py,v 1.1.1.1 2020/10/05 20:48:10 kmos Exp $ - -http://bugs.python.org/issue25191 - -Index: Lib/test/test_locale.py ---- Lib/test/test_locale.py.orig -+++ Lib/test/test_locale.py -@@ -563,8 +563,12 @@ class TestMiscellaneous(unittest.TestCase): - loc = locale.getlocale(locale.LC_CTYPE) - if verbose: - print('testing with %a' % (loc,), end=' ', flush=True) -- locale.setlocale(locale.LC_CTYPE, loc) -- self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE)) -+ try: -+ locale.setlocale(locale.LC_CTYPE, loc) -+ self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE)) -+ except locale.Error: -+ # Unsupported locale setting -+ self.skipTest('unsupported locale setting') - - def test_invalid_locale_format_in_localetuple(self): - with self.assertRaises(TypeError): Index: patches/patch-Makefile_pre_in =================================================================== RCS file: /cvs/ports/lang/python/3.9/patches/patch-Makefile_pre_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile_pre_in --- patches/patch-Makefile_pre_in 5 Oct 2020 20:48:10 -0000 1.1.1.1 +++ patches/patch-Makefile_pre_in 6 Jun 2021 23:17:49 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1.1. Index: Makefile.pre.in --- Makefile.pre.in.orig +++ Makefile.pre.in -@@ -671,7 +671,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py +@@ -674,7 +674,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py $(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS) Index: patches/patch-Modules__hashopenssl_c =================================================================== RCS file: /cvs/ports/lang/python/3.9/patches/patch-Modules__hashopenssl_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Modules__hashopenssl_c --- patches/patch-Modules__hashopenssl_c 5 Oct 2020 20:48:10 -0000 1.1.1.1 +++ patches/patch-Modules__hashopenssl_c 6 Jun 2021 23:17:49 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-Modules__hashopenssl_c,v Index: Modules/_hashopenssl.c --- Modules/_hashopenssl.c.orig +++ Modules/_hashopenssl.c -@@ -32,7 +32,8 @@ +@@ -38,7 +38,8 @@ # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" #endif Index: patches/patch-Modules__ssl_c =================================================================== RCS file: /cvs/ports/lang/python/3.9/patches/patch-Modules__ssl_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Modules__ssl_c --- patches/patch-Modules__ssl_c 5 Oct 2020 20:48:10 -0000 1.1.1.1 +++ patches/patch-Modules__ssl_c 6 Jun 2021 23:17:49 -0000 @@ -6,9 +6,9 @@ exactly what python's lock protects Index: Modules/_ssl.c --- Modules/_ssl.c.orig +++ Modules/_ssl.c -@@ -137,7 +137,8 @@ static void _PySSLFixErrno(void) { - /* Include generated data (error codes) */ +@@ -142,7 +142,8 @@ static void _PySSLFixErrno(void) { #include "_ssl_data.h" + #endif -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ @@ -16,7 +16,7 @@ Index: Modules/_ssl.c # define OPENSSL_VERSION_1_1 1 # define PY_OPENSSL_1_1_API 1 #endif -@@ -211,6 +212,9 @@ static void _PySSLFixErrno(void) { +@@ -212,6 +213,9 @@ extern const SSL_METHOD *TLSv1_2_method(void); #if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) #define OPENSSL_NO_SSL2 Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/lang/python/3.9/patches/patch-configure_ac,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure_ac --- patches/patch-configure_ac 28 Dec 2020 22:28:14 -0000 1.2 +++ patches/patch-configure_ac 6 Jun 2021 23:17:49 -0000 @@ -6,7 +6,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2020/ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -119,7 +119,7 @@ VERSION=PYTHON_VERSION +@@ -126,7 +126,7 @@ VERSION=PYTHON_VERSION # Version number of Python's own shared library file. AC_SUBST(SOVERSION) @@ -15,7 +15,7 @@ Index: configure.ac # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -2844,18 +2844,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/S +@@ -2855,18 +2855,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/S AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX # checks for uuid.h location Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v retrieving revision 1.4 diff -u -p -r1.4 PLIST-main --- pkg/PLIST-main 22 Mar 2021 17:35:26 -0000 1.4 +++ pkg/PLIST-main 6 Jun 2021 23:17:50 -0000 @@ -1853,8 +1853,8 @@ lib/python3.9/ensurepip/_bundled/__pycac lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-1.pyc lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-2.pyc lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.pyc -lib/python3.9/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl -lib/python3.9/ensurepip/_bundled/setuptools-49.2.1-py3-none-any.whl +lib/python3.9/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl +lib/python3.9/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl lib/python3.9/ensurepip/_uninstall.py lib/python3.9/enum.py lib/python3.9/filecmp.py @@ -2053,9 +2053,9 @@ lib/python3.9/lib-dynload/ @so lib/python3.9/lib-dynload/zlib.cpython-39.so lib/python3.9/lib2to3/ lib/python3.9/lib2to3/Grammar.txt -lib/python3.9/lib2to3/Grammar3.9.2.final.0.pickle +lib/python3.9/lib2to3/Grammar3.9.5.final.0.pickle lib/python3.9/lib2to3/PatternGrammar.txt -lib/python3.9/lib2to3/PatternGrammar3.9.2.final.0.pickle +lib/python3.9/lib2to3/PatternGrammar3.9.5.final.0.pickle lib/python3.9/lib2to3/__init__.py lib/python3.9/lib2to3/__main__.py lib/python3.9/lib2to3/__pycache__/ Index: pkg/PLIST-tests =================================================================== RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-tests,v retrieving revision 1.3 diff -u -p -r1.3 PLIST-tests --- pkg/PLIST-tests 21 Feb 2021 19:23:21 -0000 1.3 +++ pkg/PLIST-tests 6 Jun 2021 23:17:51 -0000 @@ -2352,6 +2352,7 @@ lib/python3.9/test/mp_fork_bomb.py lib/python3.9/test/mp_preload.py lib/python3.9/test/multibytecodec_support.py lib/python3.9/test/nokia.pem +lib/python3.9/test/nosan.pem lib/python3.9/test/nullbytecert.pem lib/python3.9/test/nullcert.pem lib/python3.9/test/pickletester.py @@ -3319,6 +3320,16 @@ lib/python3.9/test/test_importlib/namesp lib/python3.9/test/test_importlib/namespace_pkgs/project3/parent/child/__pycache__/three.cpython-39.pyc lib/python3.9/test/test_importlib/namespace_pkgs/project3/parent/child/three.py lib/python3.9/test/test_importlib/namespace_pkgs/top_level_portion1.zip +lib/python3.9/test/test_importlib/partial/ +lib/python3.9/test/test_importlib/partial/__pycache__/ +lib/python3.9/test/test_importlib/partial/__pycache__/cfimport.cpython-39.opt-1.pyc +lib/python3.9/test/test_importlib/partial/__pycache__/cfimport.cpython-39.opt-2.pyc +lib/python3.9/test/test_importlib/partial/__pycache__/cfimport.cpython-39.pyc +lib/python3.9/test/test_importlib/partial/__pycache__/pool_in_threads.cpython-39.opt-1.pyc +lib/python3.9/test/test_importlib/partial/__pycache__/pool_in_threads.cpython-39.opt-2.pyc +lib/python3.9/test/test_importlib/partial/__pycache__/pool_in_threads.cpython-39.pyc +lib/python3.9/test/test_importlib/partial/cfimport.py +lib/python3.9/test/test_importlib/partial/pool_in_threads.py lib/python3.9/test/test_importlib/source/ lib/python3.9/test/test_importlib/source/__init__.py lib/python3.9/test/test_importlib/source/__main__.py
