3.8.9 fixed some security issues and 3.8.10 is the final maintenance release of 3.8.x (now only security fixes).
https://www.python.org/downloads/release/python-389/ https://www.python.org/downloads/release/python-3810/ One of the patches we had seems to have been upstreamed, so I removed it. I think one of our recent changes in base makes it so the tests run to completion now (which they've never done before). ok? (cc maintainer) --Kurt Index: Makefile =================================================================== RCS file: /cvs/ports/lang/python/3.8/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile 22 Mar 2021 17:35:26 -0000 1.14 +++ Makefile 6 Jun 2021 23:00:07 -0000 @@ -6,10 +6,9 @@ # Python itself. VERSION = 3.8 -PATCHLEVEL = .8 +PATCHLEVEL = .10 SHARED_LIBS = python3.8 0.0 VERSION_SPEC = >=3.8,<3.9 -REVISION-main = 0 CONFIGURE_ARGS += --with-ensurepip=no CONFIGURE_ARGS += --enable-loadable-sqlite-extensions Index: distinfo =================================================================== RCS file: /cvs/ports/lang/python/3.8/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 21 Feb 2021 19:24:26 -0000 1.8 +++ distinfo 6 Jun 2021 23:00:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (Python-3.8.8.tgz) = dsB2PwSOT5uGHSTadrfdXHo7p+wIb0DK7e6jWSYydvc= -SIZE (Python-3.8.8.tgz) = 24483485 +SHA256 (Python-3.8.10.tgz) = s3rHTSy60lkOfNDdKzgmwpr+iac0CQqHv4wDxFBmy2U= +SIZE (Python-3.8.10.tgz) = 24720640 Index: files/CHANGES.OpenBSD =================================================================== RCS file: /cvs/ports/lang/python/3.8/files/CHANGES.OpenBSD,v retrieving revision 1.3 diff -u -p -r1.3 CHANGES.OpenBSD --- files/CHANGES.OpenBSD 21 Feb 2021 19:24:26 -0000 1.3 +++ files/CHANGES.OpenBSD 6 Jun 2021 23:00:07 -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 7 Nov 2019 16:14:09 -0000 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 2019/11/07 16:14:09 kmos Exp $ - -http://bugs.python.org/issue25191 - -Index: Lib/test/test_locale.py ---- Lib/test/test_locale.py.orig -+++ Lib/test/test_locale.py -@@ -564,8 +564,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.8/patches/patch-Makefile_pre_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-Makefile_pre_in --- patches/patch-Makefile_pre_in 7 Nov 2019 16:14:09 -0000 1.1 +++ patches/patch-Makefile_pre_in 6 Jun 2021 23:00:07 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1 20 Index: Makefile.pre.in --- Makefile.pre.in.orig +++ Makefile.pre.in -@@ -643,7 +643,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py +@@ -646,7 +646,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.8/patches/patch-Modules__hashopenssl_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-Modules__hashopenssl_c --- patches/patch-Modules__hashopenssl_c 16 Feb 2021 18:49:49 -0000 1.2 +++ patches/patch-Modules__hashopenssl_c 6 Jun 2021 23:00:07 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-Modules__hashopenssl_c,v Index: Modules/_hashopenssl.c --- Modules/_hashopenssl.c.orig +++ Modules/_hashopenssl.c -@@ -30,7 +30,8 @@ +@@ -37,7 +37,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.8/patches/patch-Modules__ssl_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-Modules__ssl_c --- patches/patch-Modules__ssl_c 16 Feb 2021 18:49:49 -0000 1.2 +++ patches/patch-Modules__ssl_c 6 Jun 2021 23:00:07 -0000 @@ -6,9 +6,9 @@ exactly what python's lock protects Index: Modules/_ssl.c --- Modules/_ssl.c.orig +++ Modules/_ssl.c -@@ -139,7 +139,8 @@ static void _PySSLFixErrno(void) { - /* Include generated data (error codes) */ +@@ -144,7 +144,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 -@@ -213,6 +214,9 @@ static void _PySSLFixErrno(void) { +@@ -214,6 +215,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.8/patches/patch-configure_ac,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure_ac --- patches/patch-configure_ac 16 Feb 2021 18:49:49 -0000 1.2 +++ patches/patch-configure_ac 6 Jun 2021 23:00:07 -0000 @@ -6,7 +6,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2021/ 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). -@@ -2788,18 +2788,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/S +@@ -2811,18 +2811,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: patches/patch-setup_py =================================================================== RCS file: /cvs/ports/lang/python/3.8/patches/patch-setup_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-setup_py --- patches/patch-setup_py 7 Nov 2019 16:14:09 -0000 1.1 +++ patches/patch-setup_py 6 Jun 2021 23:00:07 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.1 2019/11/0 Index: setup.py --- setup.py.orig +++ setup.py -@@ -957,6 +957,8 @@ class PyBuildExt(build_ext): +@@ -942,6 +942,8 @@ class PyBuildExt(build_ext): 'termcap'): readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], @@ -12,7 +12,7 @@ Index: setup.py library_dirs=['/usr/lib/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs)) -@@ -1675,7 +1677,7 @@ class PyBuildExt(build_ext): +@@ -1660,7 +1662,7 @@ class PyBuildExt(build_ext): # Build the _uuid module if possible uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"]) if uuid_incs is not None: @@ -21,7 +21,7 @@ Index: setup.py uuid_libs = ['uuid'] else: uuid_libs = [] -@@ -1858,8 +1860,7 @@ class PyBuildExt(build_ext): +@@ -1843,8 +1845,7 @@ class PyBuildExt(build_ext): # The versions with dots are used on Unix, and the versions without # dots on Windows, for detection by cygwin. tcllib = tklib = tcl_includes = tk_includes = None Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-main,v retrieving revision 1.14 diff -u -p -r1.14 PLIST-main --- pkg/PLIST-main 22 Mar 2021 17:35:26 -0000 1.14 +++ pkg/PLIST-main 6 Jun 2021 23:00:08 -0000 @@ -1830,8 +1830,8 @@ lib/python3.8/ensurepip/__pycache__/_uni lib/python3.8/ensurepip/__pycache__/_uninstall.cpython-38.opt-2.pyc lib/python3.8/ensurepip/__pycache__/_uninstall.cpython-38.pyc lib/python3.8/ensurepip/_bundled/ -lib/python3.8/ensurepip/_bundled/pip-20.2.3-py2.py3-none-any.whl -lib/python3.8/ensurepip/_bundled/setuptools-49.2.1-py3-none-any.whl +lib/python3.8/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl +lib/python3.8/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl lib/python3.8/ensurepip/_uninstall.py lib/python3.8/enum.py lib/python3.8/filecmp.py @@ -2023,9 +2023,9 @@ lib/python3.8/lib-dynload/ @so lib/python3.8/lib-dynload/zlib.cpython-38.so lib/python3.8/lib2to3/ lib/python3.8/lib2to3/Grammar.txt -lib/python3.8/lib2to3/Grammar3.8.8.final.0.pickle +lib/python3.8/lib2to3/Grammar3.8.10.final.0.pickle lib/python3.8/lib2to3/PatternGrammar.txt -lib/python3.8/lib2to3/PatternGrammar3.8.8.final.0.pickle +lib/python3.8/lib2to3/PatternGrammar3.8.10.final.0.pickle lib/python3.8/lib2to3/__init__.py lib/python3.8/lib2to3/__main__.py lib/python3.8/lib2to3/__pycache__/ Index: pkg/PLIST-tests =================================================================== RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-tests,v retrieving revision 1.8 diff -u -p -r1.8 PLIST-tests --- pkg/PLIST-tests 21 Feb 2021 19:24:26 -0000 1.8 +++ pkg/PLIST-tests 6 Jun 2021 23:00:09 -0000 @@ -2370,6 +2370,7 @@ lib/python3.8/test/mp_fork_bomb.py lib/python3.8/test/mp_preload.py lib/python3.8/test/multibytecodec_support.py lib/python3.8/test/nokia.pem +lib/python3.8/test/nosan.pem lib/python3.8/test/nullbytecert.pem lib/python3.8/test/nullcert.pem lib/python3.8/test/outstanding_bugs.py
