diff --git a/lang/python/3.10/Makefile b/lang/python/3.10/Makefile index 1c62d1e3cc0..58caae08817 100644 --- a/lang/python/3.10/Makefile +++ b/lang/python/3.10/Makefile @@ -1,18 +1,15 @@ -# $OpenBSD: Makefile,v 1.4 2022/01/23 21:32:07 daniel Exp $ +# $OpenBSD: Makefile,v 1.5 2022/01/27 01:37:47 kmos Exp $ # IMPORTANT! If you make any changes to the Python ports, be sure # to also update files/CHANGES.OpenBSD for your change. This is a # requirement of the PSF license, if it constitutes a change to # Python itself. -FULL_VERSION = 3.10.0 +FULL_VERSION = 3.10.2 SHARED_LIBS = python3.10 0.0 VERSION_SPEC = >=3.10,<3.11 #PSUBDIR = python/3.10.0 -REVISION-main = 1 - - CONFIGURE_ARGS += --with-ensurepip=no CONFIGURE_ARGS += --enable-loadable-sqlite-extensions diff --git a/lang/python/3.10/distinfo b/lang/python/3.10/distinfo index 6280d228463..cca97ad25e6 100644 --- a/lang/python/3.10/distinfo +++ b/lang/python/3.10/distinfo @@ -1,2 +1,2 @@ -SHA256 (Python-3.10.0.tgz) = xODLrVfJBpDLgT+0Zj72cLTQ9YfYFx4sQr1MkkW9J1g= -SIZE (Python-3.10.0.tgz) = 25007016 +SHA256 (Python-3.10.2.tgz) = PA7eiTARMZ+bCla0SVOj1Sx6v5ZXwj+0vJztk7hunJc= +SIZE (Python-3.10.2.tgz) = 25067363 diff --git a/lang/python/3.10/patches/patch-Makefile_pre_in b/lang/python/3.10/patches/patch-Makefile_pre_in index ef25b870b7d..435bb868f5b 100644 --- a/lang/python/3.10/patches/patch-Makefile_pre_in +++ b/lang/python/3.10/patches/patch-Makefile_pre_in @@ -1,4 +1,4 @@ -$OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2021/11/01 14:16:09 kmos Exp $ +$OpenBSD: patch-Makefile_pre_in,v 1.2 2022/01/27 01:37:47 kmos Exp $ Index: Makefile.pre.in --- Makefile.pre.in.orig @@ -13,8 +13,8 @@ Index: Makefile.pre.in +PY_LDFLAGS= $(LDFLAGS) PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST) NO_AS_NEEDED= @NO_AS_NEEDED@ - SGI_ABI= @SGI_ABI@ -@@ -671,7 +671,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py + CCSHARED= @CCSHARED@ +@@ -670,7 +670,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py $(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS) diff --git a/lang/python/3.10/patches/patch-Modules__hashopenssl_c b/lang/python/3.10/patches/patch-Modules__hashopenssl_c index b8780110a5e..bf3bf853800 100644 --- a/lang/python/3.10/patches/patch-Modules__hashopenssl_c +++ b/lang/python/3.10/patches/patch-Modules__hashopenssl_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-Modules__hashopenssl_c,v 1.1.1.1 2021/11/01 14:16:09 kmos Exp $ +$OpenBSD: patch-Modules__hashopenssl_c,v 1.2 2022/01/27 01:37:47 kmos Exp $ Index: Modules/_hashopenssl.c --- Modules/_hashopenssl.c.orig +++ Modules/_hashopenssl.c -@@ -40,11 +40,6 @@ +@@ -45,11 +45,6 @@ #define MUNCH_SIZE INT_MAX @@ -12,6 +12,6 @@ Index: Modules/_hashopenssl.c -#define PY_OPENSSL_HAS_SHAKE 1 -#define PY_OPENSSL_HAS_BLAKE2 1 - - static PyModuleDef _hashlibmodule; - - typedef struct { + #if OPENSSL_VERSION_NUMBER >= 0x30000000L + #define PY_EVP_MD EVP_MD + #define PY_EVP_MD_fetch(algorithm, properties) EVP_MD_fetch(NULL, algorithm, properties) diff --git a/lang/python/3.10/patches/patch-configure_ac b/lang/python/3.10/patches/patch-configure_ac index a2653c6c375..8e41e0a5d02 100644 --- a/lang/python/3.10/patches/patch-configure_ac +++ b/lang/python/3.10/patches/patch-configure_ac @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure_ac,v 1.1.1.1 2021/11/01 14:16:09 kmos Exp $ +$OpenBSD: patch-configure_ac,v 1.2 2022/01/27 01:37:47 kmos Exp $ #1: Set ports library version #2: Don't pick up an installed linux/e2fsprogs libuuid.so @@ -16,27 +16,15 @@ 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). -@@ -717,7 +717,7 @@ then - fi - - --MULTIARCH=$($CC --print-multiarch 2>/dev/null) -+MULTIARCH=$(false) - AC_SUBST(MULTIARCH) - - AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -@@ -733,8 +733,8 @@ cat >> conftest.c </dev/null)] + ) + AC_SUBST([MULTIARCH]) +@@ -2905,18 +2906,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 @@ -54,5 +42,5 @@ Index: configure.ac -) +AC_CHECK_HEADERS([uuid.h]) - # AIX provides support for RFC4122 (uuid) in libc.a starting with AIX 6.1 (anno 2007) - # FreeBSD and OpenBSD provides support as well + # check for libuuid from util-linux + save_LIBS=$LIBS diff --git a/lang/python/3.10/patches/patch-setup_py b/lang/python/3.10/patches/patch-setup_py index 4747dae162c..7894b88ca0f 100644 --- a/lang/python/3.10/patches/patch-setup_py +++ b/lang/python/3.10/patches/patch-setup_py @@ -1,9 +1,9 @@ -$OpenBSD: patch-setup_py,v 1.1.1.1 2021/11/01 14:16:09 kmos Exp $ +$OpenBSD: patch-setup_py,v 1.2 2022/01/27 01:37:47 kmos Exp $ Index: setup.py --- setup.py.orig +++ setup.py -@@ -1135,6 +1135,8 @@ class PyBuildExt(build_ext): +@@ -1149,6 +1149,8 @@ class PyBuildExt(build_ext): 'termcap'): readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], @@ -12,16 +12,16 @@ Index: setup.py library_dirs=['/usr/lib/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs)) -@@ -1851,7 +1853,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: -- if self.compiler.find_library_file(self.lib_dirs, 'uuid'): -+ if self.compiler.find_library_file(self.lib_dirs, 'uuid') and not HOST_PLATFORM.startswith('openbsd'): - uuid_libs = ['uuid'] +@@ -1868,7 +1870,7 @@ class PyBuildExt(build_ext): + uuid_h = sysconfig.get_config_var("HAVE_UUID_H") + uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H") + if uuid_h or uuid_uuid_h: +- if sysconfig.get_config_var("HAVE_LIBUUID"): ++ if sysconfig.get_config_var("HAVE_LIBUUID") and not HOST_PLATFORM.startswith('openbsd'): + uuid_libs = ["uuid"] else: uuid_libs = [] -@@ -2101,8 +2103,7 @@ class PyBuildExt(build_ext): +@@ -2114,8 +2116,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 diff --git a/lang/python/3.10/pkg/PLIST-main b/lang/python/3.10/pkg/PLIST-main index 1d460a71b27..11e34085932 100644 --- a/lang/python/3.10/pkg/PLIST-main +++ b/lang/python/3.10/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.3 2022/01/23 21:32:07 daniel Exp $ +@comment $OpenBSD: PLIST-main,v 1.4 2022/01/27 01:37:48 kmos Exp $ @option no-default-conflict @option is-branch @conflict python-${VERSION_SPEC} @@ -1847,8 +1847,8 @@ lib/python3.10/ensurepip/_bundled/__pycache__/ lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-1.pyc lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-2.pyc lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.pyc -lib/python3.10/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl -lib/python3.10/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl +lib/python3.10/ensurepip/_bundled/pip-21.2.4-py3-none-any.whl +lib/python3.10/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl lib/python3.10/ensurepip/_uninstall.py lib/python3.10/enum.py lib/python3.10/filecmp.py @@ -2034,7 +2034,6 @@ lib/python3.10/lib-dynload/ @so lib/python3.10/lib-dynload/_dbm.cpython-310.so @so lib/python3.10/lib-dynload/_decimal.cpython-310.so @so lib/python3.10/lib-dynload/_elementtree.cpython-310.so -@so lib/python3.10/lib-dynload/_hashlib.cpython-310.so @so lib/python3.10/lib-dynload/_heapq.cpython-310.so @so lib/python3.10/lib-dynload/_json.cpython-310.so @so lib/python3.10/lib-dynload/_lsprof.cpython-310.so diff --git a/lang/python/3.10/pkg/PLIST-tests b/lang/python/3.10/pkg/PLIST-tests index fefc156b763..25244385210 100644 --- a/lang/python/3.10/pkg/PLIST-tests +++ b/lang/python/3.10/pkg/PLIST-tests @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-tests,v 1.1.1.1 2021/11/01 14:16:12 kmos Exp $ +@comment $OpenBSD: PLIST-tests,v 1.2 2022/01/27 01:37:48 kmos Exp $ @option no-default-conflict @option is-branch @conflict python-tests-${VERSION_SPEC} @@ -539,6 +539,12 @@ lib/python3.10/test/__pycache__/ann_module3.cpython-310.pyc lib/python3.10/test/__pycache__/ann_module4.cpython-310.opt-1.pyc lib/python3.10/test/__pycache__/ann_module4.cpython-310.opt-2.pyc lib/python3.10/test/__pycache__/ann_module4.cpython-310.pyc +lib/python3.10/test/__pycache__/ann_module5.cpython-310.opt-1.pyc +lib/python3.10/test/__pycache__/ann_module5.cpython-310.opt-2.pyc +lib/python3.10/test/__pycache__/ann_module5.cpython-310.pyc +lib/python3.10/test/__pycache__/ann_module6.cpython-310.opt-1.pyc +lib/python3.10/test/__pycache__/ann_module6.cpython-310.opt-2.pyc +lib/python3.10/test/__pycache__/ann_module6.cpython-310.pyc lib/python3.10/test/__pycache__/audiotests.cpython-310.opt-1.pyc lib/python3.10/test/__pycache__/audiotests.cpython-310.opt-2.pyc lib/python3.10/test/__pycache__/audiotests.cpython-310.pyc @@ -1998,6 +2004,8 @@ lib/python3.10/test/ann_module.py lib/python3.10/test/ann_module2.py lib/python3.10/test/ann_module3.py lib/python3.10/test/ann_module4.py +lib/python3.10/test/ann_module5.py +lib/python3.10/test/ann_module6.py lib/python3.10/test/audiodata/ lib/python3.10/test/audiodata/pluck-alaw.aifc lib/python3.10/test/audiodata/pluck-pcm16.aiff @@ -3996,16 +4004,12 @@ lib/python3.10/tkinter/test/__pycache__/ lib/python3.10/tkinter/test/__pycache__/__init__.cpython-310.opt-1.pyc lib/python3.10/tkinter/test/__pycache__/__init__.cpython-310.opt-2.pyc lib/python3.10/tkinter/test/__pycache__/__init__.cpython-310.pyc -lib/python3.10/tkinter/test/__pycache__/runtktests.cpython-310.opt-1.pyc -lib/python3.10/tkinter/test/__pycache__/runtktests.cpython-310.opt-2.pyc -lib/python3.10/tkinter/test/__pycache__/runtktests.cpython-310.pyc lib/python3.10/tkinter/test/__pycache__/support.cpython-310.opt-1.pyc lib/python3.10/tkinter/test/__pycache__/support.cpython-310.opt-2.pyc lib/python3.10/tkinter/test/__pycache__/support.cpython-310.pyc lib/python3.10/tkinter/test/__pycache__/widget_tests.cpython-310.opt-1.pyc lib/python3.10/tkinter/test/__pycache__/widget_tests.cpython-310.opt-2.pyc lib/python3.10/tkinter/test/__pycache__/widget_tests.cpython-310.pyc -lib/python3.10/tkinter/test/runtktests.py lib/python3.10/tkinter/test/support.py lib/python3.10/tkinter/test/test_tkinter/ lib/python3.10/tkinter/test/test_tkinter/__init__.py @@ -4066,9 +4070,6 @@ lib/python3.10/tkinter/test/test_ttk/__pycache__/__init__.cpython-310.pyc lib/python3.10/tkinter/test/test_ttk/__pycache__/test_extensions.cpython-310.opt-1.pyc lib/python3.10/tkinter/test/test_ttk/__pycache__/test_extensions.cpython-310.opt-2.pyc lib/python3.10/tkinter/test/test_ttk/__pycache__/test_extensions.cpython-310.pyc -lib/python3.10/tkinter/test/test_ttk/__pycache__/test_functions.cpython-310.opt-1.pyc -lib/python3.10/tkinter/test/test_ttk/__pycache__/test_functions.cpython-310.opt-2.pyc -lib/python3.10/tkinter/test/test_ttk/__pycache__/test_functions.cpython-310.pyc lib/python3.10/tkinter/test/test_ttk/__pycache__/test_style.cpython-310.opt-1.pyc lib/python3.10/tkinter/test/test_ttk/__pycache__/test_style.cpython-310.opt-2.pyc lib/python3.10/tkinter/test/test_ttk/__pycache__/test_style.cpython-310.pyc @@ -4076,7 +4077,6 @@ lib/python3.10/tkinter/test/test_ttk/__pycache__/test_widgets.cpython-310.opt-1. lib/python3.10/tkinter/test/test_ttk/__pycache__/test_widgets.cpython-310.opt-2.pyc lib/python3.10/tkinter/test/test_ttk/__pycache__/test_widgets.cpython-310.pyc lib/python3.10/tkinter/test/test_ttk/test_extensions.py -lib/python3.10/tkinter/test/test_ttk/test_functions.py lib/python3.10/tkinter/test/test_ttk/test_style.py lib/python3.10/tkinter/test/test_ttk/test_widgets.py lib/python3.10/tkinter/test/widget_tests.py