CVS commit: pkgsrc/lang/python310

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec  7 09:31:09 UTC 2021

Modified Files:
        pkgsrc/lang/python310: PLIST dist.mk distinfo
        pkgsrc/lang/python310/patches: patch-Makefile.pre.in patch-configure
            patch-setup.py

Log Message:
python310: updated to 3.10.1

Python 3.10.1 final
Release date: 2021-12-06

Core and Builtins
bpo-42268: Fail the configure step if the selected compiler doesn’t support memory sanitizer. Patch by Pablo Galindo

bpo-45727: Refine the custom syntax error that suggests that a comma may be missing to trigger only when the expressions are detected between parentheses or brackets. Patch by Pablo Galindo

bpo-45614: Fix traceback display for exceptions with invalid module name.

bpo-45848: Allow the parser to obtain error lines directly from encoded files. Patch by Pablo Galindo

bpo-45826: Fixed a crash when calling .with_traceback(None) on NameError. This occurs internally in unittest.TestCase.assertRaises().

bpo-45822: Fixed a bug in the parser that was causing it to not respect PEP 263 coding cookies when no flags are provided. Patch by Pablo Galindo

bpo-45820: Fix a segfault when the parser fails without reading any input. Patch by Pablo Galindo

bpo-42540: Fix crash when os.fork() is called with an active non-default memory allocator.

bpo-45738: Fix computation of error location for invalid continuation characters in the parser. Patch by Pablo Galindo.

bpo-45773: Fix a compiler hang when attempting to optimize certain jump patterns.

bpo-45716: Improve the SyntaxError message when using True, None or False as keywords in a function call. Patch by Pablo Galindo.

bpo-45688: sys.stdlib_module_names now contains the macOS-specific module _scproxy.

bpo-30570: Fixed a crash in issubclass() from infinite recursion when searching pathological __bases__ tuples.

bpo-45521: Fix a bug in the obmalloc radix tree code. On 64-bit machines, the bug causes the tree to hold 46-bits of virtual addresses, rather than the intended 48-bits.

bpo-45494: Fix parser crash when reporting errors involving invalid continuation characters. Patch by Pablo Galindo.

bpo-45408: Fix a crash in the parser when reporting tokenizer errors that occur at the same time unclosed parentheses are detected. Patch by Pablo Galindo.

bpo-45385: Fix reference leak from descr_check. Patch by Dong-hee Na.

bpo-45167: Fix deepcopying of types.GenericAlias objects.

bpo-44219: Release the GIL while performing isatty system calls on arbitrary file descriptors. In particular, this affects os.isatty(), os.device_encoding() and io.TextIOWrapper. By extension, 
io.open() in text mode is also affected. This change solves a deadlock in os.isatty(). Patch by Vincent Michel in bpo-44219.

bpo-44959: Added fallback to extension modules with ‘.sl’ suffix on HP-UX

bpo-44050: Extensions that indicate they use global state (by setting m_size to -1) can again be used in multiple interpreters. This reverts to behavior of Python 3.8.

bpo-45121: Fix issue where Protocol.__init__ raises RecursionError when it’s called directly or via super(). Patch provided by Yurii Karabas.

bpo-45083: When the interpreter renders an exception, its name now has a complete qualname. Previously only the class name was concatenated to the module name, which sometimes resulted in an 
incorrect full name being displayed.

(This issue impacted only the C code exception rendering, the traceback module was using qualname already).

bpo-45056: Compiler now removes trailing unused constants from co_consts.
Library
bpo-27946: Fix possible crash when getting an attribute of class:xml.etree.ElementTree.Element simultaneously with replacing the attrib dict.

bpo-37658: Fix issue when on certain conditions asyncio.wait_for() may allow a coroutine to complete successfully, but fail to return the result, potentially causing memory leaks or other issues.

bpo-44649: Handle dataclass(slots=True) with a field that has default a default value, but for which init=False.

bpo-45803: Added missing kw_only parameter to dataclasses.make_dataclass().

bpo-45831: faulthandler can now write ASCII-only strings (like filenames and function names) with a single write() syscall when dumping a traceback. It reduces the risk of getting an unreadable dump 
when two threads or two processes dump a traceback to the same file (like stderr) at the same time. Patch by Victor Stinner.

bpo-41735: Fix thread lock in zlib.Decompress.flush() method before PyObject_GetBuffer.

bpo-45235: Reverted an argparse bugfix that caused regression in the handling of default arguments for subparsers. This prevented leaf level arguments from taking precedence over root level arguments.

bpo-45765: In importlib.metadata, fix distribution discovery for an empty path.

bpo-45757: Fix bug where dis produced an incorrect oparg when EXTENDED_ARG is followed by an opcode that does not use its argument.

bpo-45644: In-place JSON file formatting using python3 -m json.tool infile infile now works correctly, previously it left the file empty. Patch by Chris Wesseling.

bpo-45679: Fix caching of multi-value typing.Literal. Literal[True, 2] is no longer equal to Literal[1, 2].

bpo-45664: Fix types.resolve_bases() and types.new_class() for types.GenericAlias instance as a base.

bpo-45663: Fix dataclasses.is_dataclass() for dataclasses which are subclasses of types.GenericAlias.

bpo-45662: Fix the repr of dataclasses.InitVar with a type alias to the built-in class, e.g. InitVar[list[int]].

bpo-45438: Fix typing.Signature string representation for generic builtin types.

bpo-45574: Fix warning about print_escape being unused.

bpo-45581: sqlite3.connect() now correctly raises MemoryError if the underlying SQLite API signals memory error. Patch by Erlend E. Aasland.

bpo-45557: pprint.pprint() now handles underscore_numbers correctly. Previously it was always setting it to False.

bpo-45515: Add references to zoneinfo in the datetime documentation, mostly replacing outdated references to dateutil.tz. Change by Paul Ganssle.

bpo-45475: Reverted optimization of iterating gzip.GzipFile, bz2.BZ2File, and lzma.LZMAFile (see bpo-43787) because it caused regression when user iterate them without having reference of them. Patch 
by Inada Naoki.

bpo-45428: Fix a regression in py_compile when reading filenames from standard input.

bpo-45467: Fix incremental decoder and stream reader in the “raw-unicode-escape” codec. Previously they failed if the escape sequence was split.

bpo-45461: Fix incremental decoder and stream reader in the “unicode-escape” codec. Previously they failed if the escape sequence was split.

bpo-45239: Fixed email.utils.parsedate_tz() crashing with UnboundLocalError on certain invalid input instead of returning None. Patch by Ben Hoyt.

bpo-45249: Fix the behaviour of traceback.print_exc() when displaying the caret when the end_offset in the exception is set to 0. Patch by Pablo Galindo

bpo-45416: Fix use of asyncio.Condition with explicit asyncio.Lock objects, which was a regression due to removal of explicit loop arguments. Patch by Joongi Kim.

bpo-45419: Correct interfaces on DegenerateFiles.Path.

bpo-44904: Fix bug in the doctest module that caused it to fail if a docstring included an example with a classmethod property. Patch by Alex Waygood.

bpo-45406: Make inspect.getmodule() catch FileNotFoundError raised by :’func:inspect.getabsfile, and return None to indicate that the module could not be determined.

bpo-45262: Prevent use-after-free in asyncio. Make sure the cached running loop holder gets cleared on dealloc to prevent use-after-free in get_running_loop

bpo-45386: Make xmlrpc.client more robust to C runtimes where the underlying C strftime function results in a ValueError when testing for year formatting options.

bpo-45371: Fix clang rpath issue in distutils. The UnixCCompiler now uses correct clang option to add a runtime library directory (rpath) to a shared library.

bpo-20028: Improve error message of csv.Dialect when initializing. Patch by Vajrasky Kok and Dong-hee Na.

bpo-45343: Update bundled pip to 21.2.4 and setuptools to 58.1.0

bpo-45329: Fix freed memory access in pyexpat.xmlparser when building it with an installed expat library <= 2.2.0.

bpo-41710: On Unix, if the sem_clockwait() function is available in the C library (glibc 2.30 and newer), the threading.Lock.acquire() method now uses the monotonic clock (time.CLOCK_MONOTONIC) for 
the timeout, rather than using the system clock (time.CLOCK_REALTIME), to not be affected by system clock changes. Patch by Victor Stinner.

bpo-45328: Fixed http.client.HTTPConnection to work properly in OSs that don’t support the TCP_NODELAY socket option.

bpo-1596321: Fix the threading._shutdown() function when the threading module was imported first from a thread different than the main thread: no longer log an error at Python exit.

bpo-45274: Fix a race condition in the Thread.join() method of the threading module. If the function is interrupted by a signal and the signal handler raises an exception, make sure that the thread 
remains in a consistent state to prevent a deadlock. Patch by Victor Stinner.

bpo-45238: Fix unittest.IsolatedAsyncioTestCase.debug(): it runs now asynchronous methods and callbacks.

bpo-36674: unittest.TestCase.debug() raises now a unittest.SkipTest if the class or the test method are decorated with the skipping decorator.

bpo-45235: Fix an issue where argparse would not preserve values in a provided namespace when using a subparser with defaults.

bpo-45183: Have zipimport.zipimporter.find_spec() not raise an exception when the underlying zip file has been deleted and the internal cache has been reset via invalidate_cache().

bpo-45234: Fixed a regression in copyfile(), copy(), copy2() raising FileNotFoundError when source is a directory, which should raise IsADirectoryError

bpo-45228: Fix stack buffer overflow in parsing J1939 network address.

bpo-45192: Fix the tempfile._infer_return_type function so that the dir argument of the tempfile functions accepts an object implementing the os.PathLike protocol.

Patch by Kyungmin Lee.

bpo-42135: Fix typo: importlib.find_loader is really slated for removal in Python 3.12 not 3.10, like the others in GH-25169.

Patch by Hugo van Kemenade.

bpo-45160: When tracing a tkinter variable used by a ttk OptionMenu, callbacks are no longer made twice.

bpo-35474: Calling mimetypes.guess_all_extensions() with strict=False no longer affects the result of the following call with strict=True. Also, mutating the returned list no longer affects the 
global state.

bpo-45166: typing.get_type_hints() now works with Final wrapped in ForwardRef.

bpo-20499: Improve the speed and accuracy of statistics.pvariance().

bpo-24444: Fixed an error raised in argparse help display when help for an option is set to 1+ blank spaces or when choices arg is an empty container.

bpo-45021: Fix a potential deadlock at shutdown of forked children when using concurrent.futures module

bpo-39039: tarfile.open raises ReadError when a zlib error occurs during file extraction.

bpo-44594: Fix an edge case of ExitStack and AsyncExitStack exception chaining. They will now match with block behavior when __context__ is explicitly set to None when the exception is in flight.

bpo-44295: Ensure deprecation warning from assertDictContainsSubset() points at calling code - by Anthony Sottile.

bpo-43498: Avoid a possible “RuntimeError: dictionary changed size during iteration” when adjusting the process count of ProcessPoolExecutor.
Documentation
bpo-45640: Properly marked-up grammar tokens in the documentation are now clickable and take you to the definition of a given piece of grammar. Patch by Arthur Milchior.
bpo-45788: Link doc for sys.prefix to sysconfig doc on installation paths.
bpo-45772: socket.socket documentation is corrected to a class from a function.
bpo-45392: Update the docstring of the type built-in to remove a redundant line and to mention keyword arguments for the constructor.
bpo-45726: Improve documentation for functools.singledispatch() and functools.singledispatchmethod.
bpo-45680: Amend the docs on GenericAlias objects to clarify that non-container classes can also implement __class_getitem__. Patch contributed by Alex Waygood.
bpo-45655: Add a new “relevant PEPs” section to the top of the documentation for the typing module. Patch by Alex Waygood.
bpo-45604: Add level argument to multiprocessing.log_to_stderr function docs.
bpo-45250: Update the documentation to note that CPython does not consistently require iterators to define __iter__.
bpo-45464: Mention in the documentation of Built-in Exceptions that inheriting from multiple exception types in a single subclass is not recommended due to possible memory layout incompatibility.
bpo-45449: Add note about PEP 585 in collections.abc.
bpo-45516: Add protocol description to the importlib.abc.Traversable documentation.
bpo-20692: Add Programming FAQ entry explaining that int literal attribute access requires either a space after or parentheses around the literal.
bpo-45216: Remove extra documentation listing methods in difflib. It was rendering twice in pydoc and was outdated in some places.
bpo-45024: collections.abc documentation has been expanded to explicitly cover how instance and subclass checks work, with additional doctest examples and an exhaustive list of ABCs which test 
membership purely by presence of the right special methods. Patch by Raymond Hettinger.
bpo-25381: In the extending chapter of the extending doc, update a paragraph about the global variables containing exception information.
bpo-43905: Expanded astuple() and asdict() docs, warning about deepcopy being applied and providing a workaround.
Tests
bpo-19460: Add new Test for email.mime.nonmultipart.MIMENonMultipart.
bpo-45835: Fix race condition in test_queue tests with multiple “feeder” threads.
bpo-45678: Add tests for scenarios in which functools.singledispatchmethod is stacked on top of a method that has already been wrapped by two other decorators. Patch by Alex Waygood.
bpo-45578: Add tests for dis.distb()
bpo-45678: Add tests to ensure that functools.singledispatchmethod correctly wraps the attributes of the target function.
bpo-45577: Add subtests for all pickle protocols in test_zoneinfo.
bpo-45566: Fix test_frozen_pickle in test_dataclasses to check all pickle versions.
bpo-43592: test.libregrtest now raises the soft resource limit for the maximum number of file descriptors when the default is too low for our test suite as was often the case on macOS.
bpo-39679: Add more test cases for @functools.singledispatchmethod when combined with @classmethod or @staticmethod.
bpo-45400: Fix test_name_error_suggestions_do_not_trigger_for_too_many_locals() of test_exceptions if a directory name contains “a1” (like “Python-3.11.0a1”): use a stricter regular expression. Patch 
by Victor Stinner.
bpo-40173: Fix test.support.import_helper.import_fresh_module().
bpo-45280: Add a test case for empty typing.NamedTuple.
bpo-45269: Cover case when invalid markers type is supplied to c_make_encoder.
bpo-45128: Fix test_multiprocessing_fork failure due to test_logging and sys.modules manipulation.
bpo-45209: Fix UserWarning: resource_tracker warning in _test_multiprocessing._TestSharedMemory.test_shared_memory_cleaned_after_process_termination
bpo-45195: Fix test_readline.test_nonascii(): sometimes, the newline character is not written at the end, so don’t expect it in the output. Patch by Victor Stinner.
bpo-45156: Fixes infinite loop on unittest.mock.seal() of mocks created by create_autospec().
bpo-45125: Improves pickling tests and docs of SharedMemory and SharableList objects.
bpo-44860: Update test_sysconfig.test_user_similar() for the posix_user scheme: platlib doesn’t use sys.platlibdir. Patch by Victor Stinner.
bpo-25130: Add calls of gc.collect() in tests to support PyPy.
Build
bpo-44035: CI now verifies that autoconf files have been regenerated with a current and unpatched autoconf package.

bpo-33393: Update config.guess to 2021-06-03 and config.sub to 2021-08-14. Makefile now has an update-config target to make updating more convenient.

bpo-45866: make regen-all now produces the same output when run from a directory other than the source tree: when building Python out of the source tree. pegen now strips directory of the “generated 
by pygen from <FILENAME>” header Patch by Victor Stinner.

bpo-41498: Python now compiles on platforms without sigset_t. Several functions in signal are not available when sigset_t is missing.

Based on patch by Roman Yurchak for pyodide.

bpo-45881: setup.py now uses CC from environment first to discover multiarch and cross compile paths.

bpo-43158: setup.py now uses values from configure script to build the _uuid extension module. Configure now detects util-linux’s libuuid, too.

bpo-45571: Modules/Setup now use PY_CFLAGS_NODIST instead of PY_CFLAGS to compile shared modules.

bpo-45561: Run smelly.py tool from $(srcdir).

bpo-45532: Update sys.version to use main as fallback information. Patch by Jeong YunWon.

bpo-45536: The configure script now checks whether OpenSSL headers and libraries provide required APIs. Most common APIs are verified. The check detects outdated or missing OpenSSL. Failures do not 
stop configure.

bpo-45221: Fixed regression in handling of LDFLAGS and CPPFLAGS options where argparse.parse_known_args() could interpret an option as one of the built-in command line argument, for example -h for 
help.

bpo-45405: Prevent internal configure error when running configure with recent versions of non-Apple clang. Patch by David Bohman.

bpo-45220: Avoid building with the Windows 11 SDK previews automatically. This may be overridden by setting the DefaultWindowsSDKVersion environment variable before building.

bpo-45067: The ncurses function extended_color_content was introduced in 2017

(https://invisible-island.net/ncurses/NEWS.html#index-t20170401). The

ncurses-devel package in CentOS 7 had a older version ncurses resulted in compilation error. For compiling ncurses with extended color support, we verify the version of the ncurses library >= 
20170401.
Windows
bpo-45901: When installed through the Microsoft Store and set as the default app for *.py files, command line arguments will now be passed to Python when invoking a script without explicitly 
launching Python (that is, script.py args rather than python script.py args).
bpo-45616: Fix Python Launcher’s ability to distinguish between versions 3.1 and 3.10 when either one is explicitly requested. Previously, 3.1 would be used if 3.10 was requested but not installed, 
and 3.10 would be used if 3.1 was requested but 3.10 was installed.
bpo-45732: Updates bundled Tcl/Tk to 8.6.12.
bpo-45720: Internal reference to shlwapi.dll was dropped to help improve startup time. This DLL will no longer be loaded at the start of every Python process.
bpo-43652: Update Tcl/Tk to 8.6.11, actually this time. The previous update incorrectly included 8.6.10.
bpo-45337: venv now warns when the created environment may need to be accessed at a different path, due to redirections, links or junctions. It also now correctly installs or upgrades components when 
the alternate path is required.
macOS
bpo-45732: Update python.org macOS installer to use Tcl/Tk 8.6.12.
bpo-44828: Avoid tkinter file dialog failure on macOS 12 Monterey when using the Tk 8.6.11 provided by python.org macOS installers. Patch by Marc Culler of the Tk project.
bpo-34602: When building CPython on macOS with ./configure --with-undefined-behavior-sanitizer --with-pydebug, the stack size is now quadrupled to allow for the entire test suite to pass.
IDLE
bpo-45495: Add context keywords ‘case’ and ‘match’ to completions list.
bpo-45296: On Windows, change exit/quit message to suggest Ctrl-D, which works, instead of <Ctrl-Z Return>, which does not work in IDLE.
bpo-45193: Make completion boxes appear on Ubuntu again.
Tools/Demos
bpo-44786: Fix a warning in regular expression in the c-analyzer script.
C API
bpo-39026: Fix Python.h to build C extensions with Xcode: remove a relative include from Include/cpython/pystate.h.
bpo-45307: Restore the private C API function _PyImport_FindExtensionObject(). It will be removed in Python 3.11.
bpo-44687: BufferedReader.peek() no longer raises ValueError when the entire file has already been buffered.
bpo-44751: Remove crypt.h include from the public Python.h header.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python310/PLIST \
    pkgsrc/lang/python310/dist.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python310/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python310/patches/patch-Makefile.pre.in \
    pkgsrc/lang/python310/patches/patch-configure \
    pkgsrc/lang/python310/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python310/PLIST
diff -u pkgsrc/lang/python310/PLIST:1.1 pkgsrc/lang/python310/PLIST:1.2
--- pkgsrc/lang/python310/PLIST:1.1     Tue Oct  5 19:07:13 2021
+++ pkgsrc/lang/python310/PLIST Tue Dec  7 09:31:09 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/10/05 19:07:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/12/07 09:31:09 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1420,8 +1420,8 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__m
 lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.py
 lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-21.2.4-py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
@@ -2698,6 +2698,12 @@ lib/python${PY_VER_SUFFIX}/test/ann_modu
 lib/python${PY_VER_SUFFIX}/test/ann_module4.py
 lib/python${PY_VER_SUFFIX}/test/ann_module4.pyc
 lib/python${PY_VER_SUFFIX}/test/ann_module4.pyo
+lib/python${PY_VER_SUFFIX}/test/ann_module5.py
+lib/python${PY_VER_SUFFIX}/test/ann_module5.pyc
+lib/python${PY_VER_SUFFIX}/test/ann_module5.pyo
+lib/python${PY_VER_SUFFIX}/test/ann_module6.py
+lib/python${PY_VER_SUFFIX}/test/ann_module6.pyc
+lib/python${PY_VER_SUFFIX}/test/ann_module6.pyo
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-alaw.aifc
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.aiff
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.au
@@ -5347,9 +5353,6 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/
 lib/python${PY_VER_SUFFIX}/tkinter/test/__init__.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/__init__.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/__init__.pyo
-lib/python${PY_VER_SUFFIX}/tkinter/test/runtktests.py
-lib/python${PY_VER_SUFFIX}/tkinter/test/runtktests.pyc
-lib/python${PY_VER_SUFFIX}/tkinter/test/runtktests.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/support.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/support.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/support.pyo
@@ -5395,9 +5398,6 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_extensions.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_extensions.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_extensions.pyo
-lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_functions.py
-lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_functions.pyc
-lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_functions.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_style.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_style.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_style.pyo
Index: pkgsrc/lang/python310/dist.mk
diff -u pkgsrc/lang/python310/dist.mk:1.1 pkgsrc/lang/python310/dist.mk:1.2
--- pkgsrc/lang/python310/dist.mk:1.1   Tue Oct  5 19:07:13 2021
+++ pkgsrc/lang/python310/dist.mk       Tue Dec  7 09:31:09 2021
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.1 2021/10/05 19:07:13 adam Exp $
+# $NetBSD: dist.mk,v 1.2 2021/12/07 09:31:09 adam Exp $
 
-PY_DISTVERSION=        3.10.0
+PY_DISTVERSION=        3.10.1
 DISTNAME=      Python-${PY_DISTVERSION}
 EXTRACT_SUFX=  .tar.xz
 DISTINFO_FILE= ${.CURDIR}/../../lang/python310/distinfo

Index: pkgsrc/lang/python310/distinfo
diff -u pkgsrc/lang/python310/distinfo:1.3 pkgsrc/lang/python310/distinfo:1.4
--- pkgsrc/lang/python310/distinfo:1.3  Tue Oct 26 10:51:52 2021
+++ pkgsrc/lang/python310/distinfo      Tue Dec  7 09:31:09 2021
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:51:52 nia Exp $
+$NetBSD: distinfo,v 1.4 2021/12/07 09:31:09 adam Exp $
 
-BLAKE2s (Python-3.10.0.tar.xz) = 471660d88c68a21fb19399fcb42ffe3a628656564fe6bc8211039e9784c1d330
-SHA512 (Python-3.10.0.tar.xz) = 82b2729afc7d72a80882f199970667dce7d971a2e5ecfe6cf84f7b68612ab2caf6ed6d7a8cb81f24ea85cb0816464bb2e8b2e6884eda62fa40742edc674193bd
-Size (Python-3.10.0.tar.xz) = 18726176 bytes
+BLAKE2s (Python-3.10.1.tar.xz) = a7004c16f0c40d927424d512cd5130cd2955315f50d804c289fc10d48f5a1d5c
+SHA512 (Python-3.10.1.tar.xz) = 1c559e33f1252e51bafb941c380de16f142c0735858363c84cb8dbed6767843de3af126889c2826ffb94bd4777d7cdfc31040301c8c74de56af52b80b1aa9e76
+Size (Python-3.10.1.tar.xz) = 18775460 bytes
 SHA1 (patch-Lib_ctypes_util.py) = 3dec1b6b7a36e46cbfa0dfcd71c5e7fac9f60764
 SHA1 (patch-Lib_distutils_command_install.py) = 2c73a416e07ff8532a002f2e3f7a44dc79d51186
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 8a91e8f4f86517a62408c3a10ed5eb50c4091fbf
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 593c4e93c5653ab400f0a98b91db92630c0a7390
 SHA1 (patch-Lib_sysconfig.py) = bc6d91bf8f7121456b26ea7f080f588c96f2596f
-SHA1 (patch-Makefile.pre.in) = 3eb0725c23e3ddffc09ba523fac8238931fa444b
+SHA1 (patch-Makefile.pre.in) = 932a89313e8f26c435675f2487eb2141876a5f5a
 SHA1 (patch-Modules_makesetup) = e1a2297899e3cfd4bf35de50d8490e0cc6d26b0f
 SHA1 (patch-Modules_nismodule.c) = cb6bdabd1693dd3298f17b18a85f0fd611967161
 SHA1 (patch-Modules_socketmodule.c) = 4529c487b33d19b87106a0c006520cc5c45b9dfd
 SHA1 (patch-Modules_socketmodule.h) = 8761c7238bc74e45adefb6e647dc3b39b7bdd81c
 SHA1 (patch-Python_thread__pthread.h) = 64a710bdb3eea135f63db86f0ff3b8d514a0277a
-SHA1 (patch-configure) = 705517316d94affb03b7de95579a208611730daa
+SHA1 (patch-configure) = db79c9e00f2f804ff8497dbad0874658cc363db6
 SHA1 (patch-pyconfig.h.in) = 1ab77914315acbf0352d242ed66200bea54548f6
-SHA1 (patch-setup.py) = a4fb5265e9afbeadbfaa9eed185b3e11306019cb
+SHA1 (patch-setup.py) = b91c42fca28f13a1ef765e35b21d8fe28d86b941

Index: pkgsrc/lang/python310/patches/patch-Makefile.pre.in
diff -u pkgsrc/lang/python310/patches/patch-Makefile.pre.in:1.1 pkgsrc/lang/python310/patches/patch-Makefile.pre.in:1.2
--- pkgsrc/lang/python310/patches/patch-Makefile.pre.in:1.1     Tue Oct  5 19:07:13 2021
+++ pkgsrc/lang/python310/patches/patch-Makefile.pre.in Tue Dec  7 09:31:09 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.pre.in,v 1.1 2021/10/05 19:07:13 adam Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.2 2021/12/07 09:31:09 adam Exp $
 
 Use only one optimisation level; needed for PLIST and setuptools compatibility.
 Do not build/install libpython3.so.
 Simplify _sysconfigdata to include only platform name.
 Swap targets libinstall and libainstall, to byte-compile python-config.py.
 
---- Makefile.pre.in.orig       2021-07-10 00:51:07.000000000 +0000
+--- Makefile.pre.in.orig       2021-12-06 18:23:39.000000000 +0000
 +++ Makefile.pre.in
 @@ -100,7 +100,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
  # be able to build extension modules using the directories specified in the
@@ -15,8 +15,8 @@ Swap targets libinstall and libainstall,
 +PY_LDFLAGS=   -L. $(CONFIGURE_LDFLAGS) $(LDFLAGS)
  PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
  NO_AS_NEEDED= @NO_AS_NEEDED@
- SGI_ABI=      @SGI_ABI@
-@@ -236,7 +236,7 @@ DIST=              $(DISTFILES) $(DISTDIRS)
+ CCSHARED=     @CCSHARED@
+@@ -235,7 +235,7 @@ DIST=              $(DISTFILES) $(DISTDIRS)
  LIBRARY=      @LIBRARY@
  LDLIBRARY=      @LDLIBRARY@
  BLDLIBRARY=     @BLDLIBRARY@
@@ -25,7 +25,7 @@ Swap targets libinstall and libainstall,
  DLLLIBRARY=   @DLLLIBRARY@
  LDLIBRARYDIR=   @LDLIBRARYDIR@
  INSTSONAME=   @INSTSONAME@
-@@ -991,8 +991,6 @@ regen-opcode-targets:
+@@ -990,8 +990,6 @@ regen-opcode-targets:
                $(srcdir)/Python/opcode_targets.h.new
        $(UPDATE_FILE) $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/opcode_targets.h.new
  
@@ -34,7 +34,7 @@ Swap targets libinstall and libainstall,
  
  Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h \
                $(srcdir)/Python/importlib_zipimport.h $(srcdir)/Python/frozen_hello.h
-@@ -1002,7 +1000,7 @@ Python/frozen.o: $(srcdir)/Python/import
+@@ -1001,7 +999,7 @@ Python/frozen.o: $(srcdir)/Python/import
  # an include guard, so we can't use a pipeline to transform its output.
  Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
        $(MKDIR_P) Include
@@ -43,7 +43,7 @@ Swap targets libinstall and libainstall,
        : sed in-place edit with POSIX-only tools
        sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
        mv $@.tmp $@
-@@ -1012,7 +1010,7 @@ Python/import.o: $(srcdir)/Include/pydtr
+@@ -1011,7 +1009,7 @@ Python/import.o: $(srcdir)/Include/pydtr
  Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h
  
  Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
@@ -52,7 +52,7 @@ Swap targets libinstall and libainstall,
  
  Objects/typeobject.o: Objects/typeslots.inc
  
-@@ -1286,7 +1284,7 @@ altinstall: commoninstall
+@@ -1285,7 +1283,7 @@ altinstall: commoninstall
        fi
  
  commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
@@ -61,7 +61,7 @@ Swap targets libinstall and libainstall,
                sharedinstall oldsharedinstall altmaninstall \
                @FRAMEWORKALTINSTALLLAST@
  
-@@ -1346,7 +1344,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+@@ -1345,7 +1343,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
                        if test -n "$(PY3LIBRARY)"; then \
                                $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
                        fi; \
@@ -71,7 +71,7 @@ Swap targets libinstall and libainstall,
                fi; \
        fi
        if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -1594,7 +1593,7 @@ libinstall:      build_all $(srcdir)/Modules/
+@@ -1593,7 +1592,7 @@ libinstall:      build_all $(srcdir)/Modules/
                        esac; \
                done; \
        done
@@ -80,7 +80,7 @@ Swap targets libinstall and libainstall,
                $(DESTDIR)$(LIBDEST); \
        $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
        if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
-@@ -1612,11 +1611,6 @@ libinstall:     build_all $(srcdir)/Modules/
+@@ -1611,11 +1610,6 @@ libinstall:     build_all $(srcdir)/Modules/
                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
                $(DESTDIR)$(LIBDEST)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -92,7 +92,7 @@ Swap targets libinstall and libainstall,
                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
                -j0 -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-@@ -1625,10 +1619,6 @@ libinstall:     build_all $(srcdir)/Modules/
+@@ -1624,10 +1618,6 @@ libinstall:     build_all $(srcdir)/Modules/
                -j0 -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -103,7 +103,7 @@ Swap targets libinstall and libainstall,
                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
-@@ -1752,7 +1742,7 @@ sharedinstall: sharedmods
+@@ -1751,7 +1741,7 @@ sharedinstall: sharedmods
                --install-scripts=$(BINDIR) \
                --install-platlib=$(DESTSHARED) \
                --root=$(DESTDIR)/
Index: pkgsrc/lang/python310/patches/patch-configure
diff -u pkgsrc/lang/python310/patches/patch-configure:1.1 pkgsrc/lang/python310/patches/patch-configure:1.2
--- pkgsrc/lang/python310/patches/patch-configure:1.1   Tue Oct  5 19:07:13 2021
+++ pkgsrc/lang/python310/patches/patch-configure       Tue Dec  7 09:31:09 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2021/10/05 19:07:13 adam Exp $
+$NetBSD: patch-configure,v 1.2 2021/12/07 09:31:09 adam Exp $
 
 Use gnu99 instead of c99 to avoid "alloca() undefined" problems.
 Fix linking on Darwin; don't use -stack_size.
@@ -6,9 +6,9 @@ Changes for consistency across pkgsrc pl
 Simplify _sysconfigdata to include only platform name.
 detect netcan/can.h on NetBSD
 
---- configure.orig     2021-09-07 13:18:28.000000000 +0000
+--- configure.orig     2021-12-06 18:23:39.000000000 +0000
 +++ configure
-@@ -7028,7 +7028,7 @@ UNIVERSAL_ARCH_FLAGS=
+@@ -7040,7 +7040,7 @@ UNIVERSAL_ARCH_FLAGS=
  # tweak BASECFLAGS based on compiler and platform
  case $GCC in
  yes)
@@ -17,7 +17,7 @@ detect netcan/can.h on NetBSD
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5
  $as_echo_n "checking for -Wextra... " >&6; }
-@@ -8652,6 +8652,17 @@ if test "x$ac_cv_type___uint128_t" = xye
+@@ -8664,6 +8664,17 @@ if test "x$ac_cv_type___uint128_t" = xye
  $as_echo "#define HAVE_GCC_UINT128_T 1" >>confdefs.h
  
  fi
@@ -35,15 +35,22 @@ detect netcan/can.h on NetBSD
  
  
  # Sizes and alignments of various common basic types
-@@ -9778,7 +9789,6 @@ then
+@@ -9884,13 +9895,12 @@ then
+               # small for the default recursion limit. Increase the stack size
                # to ensure that tests don't crash
-               # Note: This matches the value of THREAD_STACK_SIZE in
-               # thread_pthread.h
--              LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
- 
-               if test "$enable_framework"
-               then
-@@ -14520,10 +14530,10 @@ _ACEOF
+     stack_size="1000000"  # 16 MB
+-    if test "$with_ubsan" == "yes"
++    if test "$with_ubsan" = "yes"
+     then
+         # Undefined behavior sanitizer requires an even deeper stack
+         stack_size="4000000"  # 64 MB
+     fi
+ 
+-    LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED"
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -14751,10 +14761,10 @@ _ACEOF
  if ac_fn_c_try_compile "$LINENO"; then :
  
  
@@ -56,7 +63,7 @@ detect netcan/can.h on NetBSD
    if test "$ax_cv_c_float_words_bigendian" = unknown; then
      ax_cv_c_float_words_bigendian=no
    else
-@@ -15424,7 +15434,7 @@ _ACEOF
+@@ -15655,7 +15665,7 @@ _ACEOF
  fi
  
  
@@ -65,7 +72,7 @@ detect netcan/can.h on NetBSD
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5
  $as_echo_n "checking LDVERSION... " >&6; }
-@@ -15477,11 +15487,7 @@ fi
+@@ -15708,11 +15718,7 @@ fi
  
  
  
Index: pkgsrc/lang/python310/patches/patch-setup.py
diff -u pkgsrc/lang/python310/patches/patch-setup.py:1.1 pkgsrc/lang/python310/patches/patch-setup.py:1.2
--- pkgsrc/lang/python310/patches/patch-setup.py:1.1    Tue Oct  5 19:07:13 2021
+++ pkgsrc/lang/python310/patches/patch-setup.py        Tue Dec  7 09:31:09 2021
@@ -1,12 +1,11 @@
-$NetBSD: patch-setup.py,v 1.1 2021/10/05 19:07:13 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2021/12/07 09:31:09 adam Exp $
 
 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
 Assume panel_library is correct; this is a fix for ncurses' gnupanel
 which will get transformed to panel in buildlink.
-Also look for uuid/uuid.h.
 
---- setup.py.orig      2021-07-10 00:51:07.000000000 +0000
+--- setup.py.orig      2021-12-06 18:23:39.000000000 +0000
 +++ setup.py
 @@ -45,6 +45,7 @@ with warnings.catch_warnings():
          DeprecationWarning
@@ -25,7 +24,7 @@ Also look for uuid/uuid.h.
  
  # --list-module-names option used by Tools/scripts/generate_module_names.py
  LIST_MODULE_NAMES = False
-@@ -246,6 +247,16 @@ def grep_headers_for(function, headers):
+@@ -249,6 +250,16 @@ def grep_headers_for(function, headers):
      return False
  
  
@@ -42,7 +41,7 @@ Also look for uuid/uuid.h.
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
      and returns a possibly-empty list of additional directories, or None
-@@ -804,15 +815,15 @@ class PyBuildExt(build_ext):
+@@ -821,15 +832,15 @@ class PyBuildExt(build_ext):
                          add_dir_to_list(dir_list, directory)
  
      def configure_compiler(self):
@@ -67,7 +66,7 @@ Also look for uuid/uuid.h.
          self.add_multiarch_paths()
          self.add_ldflags_cppflags()
  
-@@ -860,6 +871,9 @@ class PyBuildExt(build_ext):
+@@ -877,6 +888,9 @@ class PyBuildExt(build_ext):
              self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
  
          if MACOS:
@@ -77,7 +76,7 @@ Also look for uuid/uuid.h.
              # This should work on any unixy platform ;-)
              # If the user has bothered specifying additional -I and -L flags
              # in OPT and LDFLAGS we might as well use them here.
-@@ -1087,8 +1101,6 @@ class PyBuildExt(build_ext):
+@@ -1104,8 +1118,6 @@ class PyBuildExt(build_ext):
          # use the same library for the readline and curses modules.
          if 'curses' in readline_termcap_library:
              curses_library = readline_termcap_library
@@ -86,7 +85,7 @@ Also look for uuid/uuid.h.
          # Issue 36210: OSS provided ncurses does not link on AIX
          # Use IBM supplied 'curses' for successful build of _curses
          elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
-@@ -1192,8 +1204,7 @@ class PyBuildExt(build_ext):
+@@ -1209,8 +1221,7 @@ class PyBuildExt(build_ext):
          # If the curses module is enabled, check for the panel module
          # _curses_panel needs some form of ncurses
          skip_curses_panel = True if AIX else False
@@ -96,7 +95,7 @@ Also look for uuid/uuid.h.
              self.add(Extension('_curses_panel', ['_curses_panel.c'],
                             include_dirs=curses_includes,
                             define_macros=curses_defines,
-@@ -1438,6 +1449,31 @@ class PyBuildExt(build_ext):
+@@ -1455,6 +1466,31 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if not CYGWIN:
@@ -128,7 +127,7 @@ Also look for uuid/uuid.h.
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1449,7 +1485,7 @@ class PyBuildExt(build_ext):
+@@ -1466,7 +1502,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -137,16 +136,7 @@ Also look for uuid/uuid.h.
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(self.lib_dirs,
-@@ -1845,6 +1881,8 @@ class PyBuildExt(build_ext):
-     def detect_uuid(self):
-         # Build the _uuid module if possible
-         uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
-+        if uuid_incs is None:
-+            uuid_incs = find_file("uuid/uuid.h", self.inc_dirs, [])
-         if uuid_incs is not None:
-             if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
-                 uuid_libs = ['uuid']
-@@ -2308,10 +2346,7 @@ class PyBuildExt(build_ext):
+@@ -2326,10 +2362,7 @@ class PyBuildExt(build_ext):
              sources = ['_decimal/_decimal.c']
              depends = ['_decimal/docstrings.h']
          else:
@@ -158,7 +148,7 @@ Also look for uuid/uuid.h.
              libraries = ['m']
              sources = [
                '_decimal/_decimal.c',
-@@ -2727,7 +2762,7 @@ def main():
+@@ -2745,7 +2778,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in