pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang



Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug 25 08:28:22 UTC 2023

Modified Files:
        pkgsrc/lang/py311-html-docs: Makefile distinfo
        pkgsrc/lang/python311: Makefile PLIST dist.mk distinfo
        pkgsrc/lang/python311/patches: patch-Makefile.pre.in patch-configure

Log Message:
python311 py311-html-docs: updated to 3.11.5

Python 3.11.5

Security

gh-108310: Fixed an issue where instances of ssl.SSLSocket were vulnerable to a bypass of the TLS handshake and included protections (like certificate verification) and treating sent unencrypted data 
as if it were post-handshake TLS encrypted data. Security issue reported as CVE-2023-40217 by Aapo Oksman. Patch by Gregory P. Smith.

Core and Builtins

gh-104432: Fix potential unaligned memory access on C APIs involving returned sequences of char * pointers within the grp and socket modules. These were revealed using a -fsaniziter=alignment build 
on ARM macOS. Patch by Christopher Chavez.
gh-77377: Ensure that multiprocessing synchronization objects created in a fork context are not sent to a different process created in a spawn context. This changes a segfault into an actionable 
RuntimeError in the parent process.
gh-106092: Fix a segmentation fault caused by a use-after-free bug in frame_dealloc when the trashcan delays the deallocation of a PyFrameObject.
gh-106719: No longer suppress arbitrary errors in the __annotations__ getter and setter in the type and module types.
gh-106723: Propagate frozen_modules to multiprocessing spawned process interpreters.
gh-105979: Fix crash in _imp.get_frozen_object() due to improper exception handling.
gh-105840: Fix possible crashes when specializing function calls with too many __defaults__.
gh-105588: Fix an issue that could result in crashes when compiling malformed ast nodes.
gh-105375: Fix bugs in the builtins module where exceptions could end up being overwritten.
gh-105375: Fix bug in the compiler where an exception could end up being overwritten.
gh-105375: Improve error handling in PyUnicode_BuildEncodingMap() where an exception could end up being overwritten.
gh-105235: Prevent out-of-bounds memory access during mmap.find() calls.
gh-101006: Improve error handling when read marshal data.

Library

gh-105736: Harmonized the pure Python version of OrderedDict with the C version. Now, both versions set up their internal state in __new__. Formerly, the pure Python version did the set up in 
__init__.
gh-107963: Fix multiprocessing.set_forkserver_preload() to check the given list of modules names. Patch by Dong-hee Na.
gh-106242: Fixes os.path.normpath() to handle embedded null characters without truncating the path.
gh-107845: tarfile.data_filter() now takes the location of symlinks into account when determining their target, so it will no longer reject some valid tarballs with LinkOutsideDestinationError.
gh-107715: Fix doctest.DocTestFinder.find() in presence of class names with special characters. Patch by Gertjan van Zwieten.
gh-100814: Passing a callable object as an option value to a Tkinter image now raises the expected TclError instead of an AttributeError.
gh-106684: Close asyncio.StreamWriter when it is not closed by application leading to memory leaks. Patch by Kumar Aditya.
gh-107077: Seems that in some conditions, OpenSSL will return SSL_ERROR_SYSCALL instead of SSL_ERROR_SSL when a certification verification has failed, but the error parameters will still contain 
ERR_LIB_SSL and SSL_R_CERTIFICATE_VERIFY_FAILED. We are now detecting this situation and raising the appropiate ssl.SSLCertVerificationError. Patch by Pablo Galindo
gh-107396: tarfiles; Fixed use before assignment of self.exception for gzip decompression
gh-62519: Make gettext.pgettext() search plural definitions when translation is not found.
gh-83006: Document behavior of shutil.disk_usage() for non-mounted filesystems on Unix.
gh-106186: Do not report MultipartInvariantViolationDefect defect when the email.parser.Parser class is used to parse emails with headersonly=True.
gh-106831: Fix potential missing NULL check of d2i_SSL_SESSION result in _ssl.c.
gh-106774: Update the bundled copy of pip to version 23.2.1.
gh-106752: Fixed several bug in zipfile.Path in name/suffix/suffixes/stem operations when no filename is present and the Path is not at the root of the zipfile.
gh-106602: Add __copy__ and __deepcopy__ in enum
gh-106530: Revert a change to colorsys.rgb_to_hls() that caused division by zero for certain almost-white inputs. Patch by Terry Jan Reedy.
gh-106052: re module: fix the matching of possessive quantifiers in the case of a subpattern containing backtracking.
gh-106510: Improve debug output for atomic groups in regular expressions.
gh-105497: Fix flag mask inversion when unnamed flags exist.
gh-90876: Prevent multiprocessing.spawn from failing to import in environments where sys.executable is None. This regressed in 3.11 with the addition of support for path-like objects in 
multiprocessing.
gh-106350: Detect possible memory allocation failure in the libtommath function mp_init() used by the _tkinter module.
gh-102541: Make pydoc.doc catch bad module ImportError when output stream is not None.
gh-106263: Fix crash when calling repr with a manually constructed SignalDict object. Patch by Charlie Zhao.
gh-105375: Fix a bug in _Unpickler_SetInputStream() where an exception could end up being overwritten in case of failure.
gh-105375: Fix bugs in sys where exceptions could end up being overwritten because of deferred error handling.
gh-105605: Harden pyexpat error handling during module initialisation to prevent exceptions from possibly being overwritten, and objects from being dereferenced twice.
gh-105375: Fix bug in decimal where an exception could end up being overwritten.
gh-105375: Fix bugs in _datetime where exceptions could be overwritten in case of module initialisation failure.
gh-105375: Fix bugs in _ssl initialisation which could lead to leaked references and overwritten exceptions.
gh-105375: Fix a bug in array.array where an exception could end up being overwritten.
gh-105375: Fix bugs in _ctypes where exceptions could end up being overwritten.
gh-105375: Fix a bug in the posix module where an exception could be overwritten.
gh-105375: Fix bugs in _elementtree where exceptions could be overwritten.
gh-105375: Fix bugs in zoneinfo where exceptions could be overwritten.
gh-105375: Fix bugs in pickle where exceptions could be overwritten.
gh-105497: Fix flag inversion when alias/mask members exist.
gh-105375: Fix bugs in pickle where exceptions could be overwritten.
gh-103171: Revert undocumented behaviour change with runtime-checkable protocols decorated with typing.final() in Python 3.11. The behaviour change had meant that objects would not be considered 
instances of these protocols at runtime unless they had a __final__ attribute. Patch by Alex Waygood.
gh-105375: Fix a bug in sqlite3 where an exception could be overwritten in the collation callback.
gh-105332: Revert pickling method from by-name back to by-value.
gh-104554: Add RTSPS scheme support in urllib.parse
gh-100061: Fix a bug that causes wrong matches for regular expressions with possessive qualifier.
gh-102541: Hide traceback in help() prompt, when import failed.
gh-99203: Restore following CPython <= 3.10.5 behavior of shutil.make_archive(): do not create an empty archive if root_dir is not a directory, and, in that case, raise FileNotFoundError or 
NotADirectoryError regardless of format choice. Beyond the brought-back behavior, the function may now also raise these exceptions in dry_run mode.
gh-94777: Fix hanging multiprocessing ProcessPoolExecutor when a child process crashes while data is being written in the call queue.
bpo-18319: Ensure gettext(msg) retrieve translations even if a plural form exists. In other words: gettext(msg) == ngettext(msg, '', 1).

Documentation

gh-107008: Document the curses module variables LINES and COLS.
gh-106948: Add a number of standard external names to nitpick_ignore.
gh-54738: Add documentation on how to localize the argparse module.

Tests

gh-105776: Fix test_cppext when the C compiler command -std=c11 option: remove -std= options from the compiler command. Patch by Victor Stinner.
gh-107237: test_logging: Fix test_udp_reconnection() by increasing the timeout from 100 ms to 5 minutes (LONG_TIMEOUT). Patch by Victor Stinner.
gh-101634: When running the Python test suite with -jN option, if a worker stdout cannot be decoded from the locale encoding report a failed testn so the exitcode is non-zero. Patch by Victor Stinner.

Build

gh-107814: When calling find_python.bat with -q it did not properly silence the output of nuget. That is now fixed.

gh-106881: Check for linux/limits.h before including it in Modules/posixmodule.c.

gh-104692: Include commoninstall as a prerequisite for bininstall

This ensures that commoninstall is completed before bininstall is started when parallel builds are used (make -j install), and so the python3 symlink is only installed after all standard library 
modules are installed.

gh-100340: Allows -Wno-int-conversion for wasm-sdk 17 and onwards, thus enables building WASI builds once against the latest sdk.

Windows

gh-106242: Fixes realpath() to behave consistently when passed a path containing an embedded null character on Windows. In strict mode, it now raises OSError instead of the unexpected ValueError, and 
in non-strict mode will make the path absolute.
gh-106844: Fix integer overflow in _winapi.LCMapStringEx() which affects ntpath.normcase().
gh-99079: Update Windows build to use OpenSSL 3.0.9
gh-105436: Ensure that an empty environment block is terminated by two null characters, as is required by Windows.

macOS

gh-107565: Update macOS installer to use OpenSSL 3.0.10.
gh-99079: Update macOS installer to use OpenSSL 3.0.9.

Tools/Demos

gh-107565: Update multissltests and GitHub CI workflows to use OpenSSL 1.1.1v, 3.0.10, and 3.1.2.
gh-95065: Argument Clinic now supports overriding automatically generated signature by using directive @text_signature. See How to override the generated signature.
gh-106970: Fix bugs in the Argument Clinic destination <name> clear command; the destination buffers would never be cleared, and the destination directive parser would simply continue to the fault 
handler after processing the command. Patch by Erlend E. Aasland.

C API

gh-107916: C API functions PyErr_SetFromErrnoWithFilename(), PyErr_SetExcFromWindowsErrWithFilename() and PyErr_SetFromWindowsErrWithFilename() save now the error code before calling 
PyUnicode_DecodeFSDefault().
gh-107915: Such C API functions as PyErr_SetString(), PyErr_Format(), PyErr_SetFromErrnoWithFilename() and many others no longer crash or ignore errors if it failed to format the error message or 
decode the filename. Instead, they keep a corresponding error.
gh-107226: PyModule_AddObjectRef() is now only available in the limited API version 3.10 or later.
gh-105375: Fix a bug in PyErr_WarnExplicit() where an exception could end up being overwritten if the API failed internally.
gh-99612: Fix PyUnicode_DecodeUTF8Stateful() for ASCII-only data: *consumed was not set.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/py311-html-docs/Makefile \
    pkgsrc/lang/py311-html-docs/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/python311/PLIST \
    pkgsrc/lang/python311/dist.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/python311/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/python311/patches/patch-Makefile.pre.in
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/python311/patches/patch-configure

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

Modified files:

Index: pkgsrc/lang/py311-html-docs/Makefile
diff -u pkgsrc/lang/py311-html-docs/Makefile:1.5 pkgsrc/lang/py311-html-docs/Makefile:1.6
--- pkgsrc/lang/py311-html-docs/Makefile:1.5    Thu Jun  8 10:04:26 2023
+++ pkgsrc/lang/py311-html-docs/Makefile        Fri Aug 25 08:28:22 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2023/06/08 10:04:26 adam Exp $
+# $NetBSD: Makefile,v 1.6 2023/08/25 08:28:22 adam Exp $
 
-VERS=          3.11.4
+VERS=          3.11.5
 DISTNAME=      python-${VERS}-docs-html
 PKGNAME=       py311-html-docs-${VERS}
 CATEGORIES=    lang python
Index: pkgsrc/lang/py311-html-docs/distinfo
diff -u pkgsrc/lang/py311-html-docs/distinfo:1.5 pkgsrc/lang/py311-html-docs/distinfo:1.6
--- pkgsrc/lang/py311-html-docs/distinfo:1.5    Thu Jun  8 10:04:26 2023
+++ pkgsrc/lang/py311-html-docs/distinfo        Fri Aug 25 08:28:22 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2023/06/08 10:04:26 adam Exp $
+$NetBSD: distinfo,v 1.6 2023/08/25 08:28:22 adam Exp $
 
-BLAKE2s (python-3.11.4-docs-html.tar.bz2) = 3c0022f20b39ce5faeeb3ba99fa1750c6e8789828e520b0e3794488dbc4fa214
-SHA512 (python-3.11.4-docs-html.tar.bz2) = b00fa45da239d804e12dcfd5f248b0feb060c2c6e7003913ba6b29a5d198e439dd59ac779c0e4417ccfa90f3654dd3233804974f47efda4fb5891fbe1c6a9f6f
-Size (python-3.11.4-docs-html.tar.bz2) = 7831799 bytes
+BLAKE2s (python-3.11.5-docs-html.tar.bz2) = 009cac528f1fb43e56514f22fd3df0e65594036f891d4c580740fce96dd9bebf
+SHA512 (python-3.11.5-docs-html.tar.bz2) = 911a70145aa919687982b9fb34fc0cedafcf654cf3f1e6908a6077d27718aedabc923ea49648d453584f7a7171138e19c1a99f32cb8d41731e5d9c50dc30df2d
+Size (python-3.11.5-docs-html.tar.bz2) = 7861520 bytes

Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.10 pkgsrc/lang/python311/Makefile:1.11
--- pkgsrc/lang/python311/Makefile:1.10 Tue Aug 15 14:39:08 2023
+++ pkgsrc/lang/python311/Makefile      Fri Aug 25 08:28:22 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2023/08/15 14:39:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2023/08/25 08:28:22 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python311-${PY_DISTVERSION}
-PKGREVISION=   2
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/lang/python311/PLIST
diff -u pkgsrc/lang/python311/PLIST:1.5 pkgsrc/lang/python311/PLIST:1.6
--- pkgsrc/lang/python311/PLIST:1.5     Sat Jul 22 18:27:45 2023
+++ pkgsrc/lang/python311/PLIST Fri Aug 25 08:28:22 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/07/22 18:27:45 js Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/08/25 08:28:22 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1448,7 +1448,7 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__i
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.py
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-23.1.2-py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-23.2.1-py3-none-any.whl
 lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
@@ -2729,7 +2729,6 @@ lib/python${PY_VER_SUFFIX}/test/_test_mu
 lib/python${PY_VER_SUFFIX}/test/_test_venv_multiprocessing.py
 lib/python${PY_VER_SUFFIX}/test/_test_venv_multiprocessing.pyc
 lib/python${PY_VER_SUFFIX}/test/_test_venv_multiprocessing.pyo
-lib/python${PY_VER_SUFFIX}/test/_testcppext.cpp
 lib/python${PY_VER_SUFFIX}/test/_typed_dict_helper.py
 lib/python${PY_VER_SUFFIX}/test/_typed_dict_helper.pyc
 lib/python${PY_VER_SUFFIX}/test/_typed_dict_helper.pyo
@@ -2785,15 +2784,6 @@ lib/python${PY_VER_SUFFIX}/test/autotest
 lib/python${PY_VER_SUFFIX}/test/autotest.pyo
 lib/python${PY_VER_SUFFIX}/test/bad_coding.py
 lib/python${PY_VER_SUFFIX}/test/bad_coding2.py
-lib/python${PY_VER_SUFFIX}/test/bad_getattr.py
-lib/python${PY_VER_SUFFIX}/test/bad_getattr.pyc
-lib/python${PY_VER_SUFFIX}/test/bad_getattr.pyo
-lib/python${PY_VER_SUFFIX}/test/bad_getattr2.py
-lib/python${PY_VER_SUFFIX}/test/bad_getattr2.pyc
-lib/python${PY_VER_SUFFIX}/test/bad_getattr2.pyo
-lib/python${PY_VER_SUFFIX}/test/bad_getattr3.py
-lib/python${PY_VER_SUFFIX}/test/bad_getattr3.pyc
-lib/python${PY_VER_SUFFIX}/test/bad_getattr3.pyo
 lib/python${PY_VER_SUFFIX}/test/badcert.pem
 lib/python${PY_VER_SUFFIX}/test/badkey.pem
 lib/python${PY_VER_SUFFIX}/test/badsyntax_3131.py
@@ -2848,7 +2838,7 @@ lib/python${PY_VER_SUFFIX}/test/cjkencod
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jis.txt
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jisx0213-utf8.txt
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jisx0213.txt
-lib/python${PY_VER_SUFFIX}/test/clinic.test
+lib/python${PY_VER_SUFFIX}/test/clinic.test.c
 lib/python${PY_VER_SUFFIX}/test/cmath_testcases.txt
 lib/python${PY_VER_SUFFIX}/test/coding20731.py
 lib/python${PY_VER_SUFFIX}/test/coding20731.pyc
@@ -3108,9 +3098,6 @@ lib/python${PY_VER_SUFFIX}/test/future_t
 lib/python${PY_VER_SUFFIX}/test/gdb_sample.py
 lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyc
 lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyo
-lib/python${PY_VER_SUFFIX}/test/good_getattr.py
-lib/python${PY_VER_SUFFIX}/test/good_getattr.pyc
-lib/python${PY_VER_SUFFIX}/test/good_getattr.pyo
 lib/python${PY_VER_SUFFIX}/test/idnsans.pem
 lib/python${PY_VER_SUFFIX}/test/ieee754.txt
 lib/python${PY_VER_SUFFIX}/test/imghdrdata/python-raw.jpg
@@ -3283,9 +3270,6 @@ lib/python${PY_VER_SUFFIX}/test/selfsign
 lib/python${PY_VER_SUFFIX}/test/seq_tests.py
 lib/python${PY_VER_SUFFIX}/test/seq_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/seq_tests.pyo
-lib/python${PY_VER_SUFFIX}/test/setup_testcppext.py
-lib/python${PY_VER_SUFFIX}/test/setup_testcppext.pyc
-lib/python${PY_VER_SUFFIX}/test/setup_testcppext.pyo
 lib/python${PY_VER_SUFFIX}/test/sgml_input.html
 lib/python${PY_VER_SUFFIX}/test/signalinterproctester.py
 lib/python${PY_VER_SUFFIX}/test/signalinterproctester.pyc
@@ -3591,6 +3575,9 @@ lib/python${PY_VER_SUFFIX}/test/test_cap
 lib/python${PY_VER_SUFFIX}/test/test_capi/__main__.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/__main__.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/__main__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_codecs.py
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_codecs.pyc
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_codecs.pyo
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_eval_code_ex.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_eval_code_ex.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_eval_code_ex.pyo
@@ -3729,9 +3716,13 @@ lib/python${PY_VER_SUFFIX}/test/test_cop
 lib/python${PY_VER_SUFFIX}/test/test_coroutines.py
 lib/python${PY_VER_SUFFIX}/test/test_coroutines.pyc
 lib/python${PY_VER_SUFFIX}/test/test_coroutines.pyo
-lib/python${PY_VER_SUFFIX}/test/test_cppext.py
-lib/python${PY_VER_SUFFIX}/test/test_cppext.pyc
-lib/python${PY_VER_SUFFIX}/test/test_cppext.pyo
+lib/python${PY_VER_SUFFIX}/test/test_cppext/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_cppext/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_cppext/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_cppext/extension.cpp
+lib/python${PY_VER_SUFFIX}/test/test_cppext/setup.py
+lib/python${PY_VER_SUFFIX}/test/test_cppext/setup.pyc
+lib/python${PY_VER_SUFFIX}/test/test_cppext/setup.pyo
 lib/python${PY_VER_SUFFIX}/test/test_cprofile.py
 lib/python${PY_VER_SUFFIX}/test/test_cprofile.pyc
 lib/python${PY_VER_SUFFIX}/test/test_cprofile.pyo
@@ -3889,6 +3880,7 @@ lib/python${PY_VER_SUFFIX}/test/test_ema
 lib/python${PY_VER_SUFFIX}/test/test_email/data/msg_44.txt
 lib/python${PY_VER_SUFFIX}/test/test_email/data/msg_45.txt
 lib/python${PY_VER_SUFFIX}/test/test_email/data/msg_46.txt
+lib/python${PY_VER_SUFFIX}/test/test_email/data/msg_47.txt
 lib/python${PY_VER_SUFFIX}/test/test_email/data/python.bmp
 lib/python${PY_VER_SUFFIX}/test/test_email/data/python.exr
 lib/python${PY_VER_SUFFIX}/test/test_email/data/python.gif
@@ -4684,9 +4676,21 @@ lib/python${PY_VER_SUFFIX}/test/test_min
 lib/python${PY_VER_SUFFIX}/test/test_mmap.py
 lib/python${PY_VER_SUFFIX}/test/test_mmap.pyc
 lib/python${PY_VER_SUFFIX}/test/test_mmap.pyo
-lib/python${PY_VER_SUFFIX}/test/test_module.py
-lib/python${PY_VER_SUFFIX}/test/test_module.pyc
-lib/python${PY_VER_SUFFIX}/test/test_module.pyo
+lib/python${PY_VER_SUFFIX}/test/test_module/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_module/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_module/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr.py
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr.pyc
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr.pyo
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr2.py
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr2.pyc
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr2.pyo
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr3.py
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr3.pyc
+lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr3.pyo
+lib/python${PY_VER_SUFFIX}/test/test_module/good_getattr.py
+lib/python${PY_VER_SUFFIX}/test/test_module/good_getattr.pyc
+lib/python${PY_VER_SUFFIX}/test/test_module/good_getattr.pyo
 lib/python${PY_VER_SUFFIX}/test/test_modulefinder.py
 lib/python${PY_VER_SUFFIX}/test/test_modulefinder.pyc
 lib/python${PY_VER_SUFFIX}/test/test_modulefinder.pyo
Index: pkgsrc/lang/python311/dist.mk
diff -u pkgsrc/lang/python311/dist.mk:1.5 pkgsrc/lang/python311/dist.mk:1.6
--- pkgsrc/lang/python311/dist.mk:1.5   Wed Jun  7 13:28:49 2023
+++ pkgsrc/lang/python311/dist.mk       Fri Aug 25 08:28:22 2023
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.5 2023/06/07 13:28:49 adam Exp $
+# $NetBSD: dist.mk,v 1.6 2023/08/25 08:28:22 adam Exp $
 
-PY_DISTVERSION=        3.11.4
+PY_DISTVERSION=        3.11.5
 DISTNAME=      Python-${PY_DISTVERSION}
 EXTRACT_SUFX=  .tar.xz
 DISTINFO_FILE= ${.CURDIR}/../../lang/python311/distinfo

Index: pkgsrc/lang/python311/distinfo
diff -u pkgsrc/lang/python311/distinfo:1.8 pkgsrc/lang/python311/distinfo:1.9
--- pkgsrc/lang/python311/distinfo:1.8  Thu Jun 29 01:32:28 2023
+++ pkgsrc/lang/python311/distinfo      Fri Aug 25 08:28:22 2023
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.8 2023/06/29 01:32:28 riastradh Exp $
+$NetBSD: distinfo,v 1.9 2023/08/25 08:28:22 adam Exp $
 
-BLAKE2s (Python-3.11.4.tar.xz) = c18c396b72d794ede405921276aa43b1923a4bda964d7dcf797bded7e8e30b1b
-SHA512 (Python-3.11.4.tar.xz) = 7eb14fecbf60824d10c22a9057584c3a142c2866f4af6caa2525c10c8bcb24e6e7afb32a44a0e118df0a2b2543d578c3b422ffd4a5fa317dfe6ea371cc7ee1ee
-Size (Python-3.11.4.tar.xz) = 19954828 bytes
+BLAKE2s (Python-3.11.5.tar.xz) = ebe7f1da97cae21f3d891bc8144c79940cd4233c92f3d8f974ded4e62bd460e6
+SHA512 (Python-3.11.5.tar.xz) = 93fa640bedcea449060caac8aa691aa315a19f172fd9f0422183d17749c3512d4ecac60e7599f9ef14e3cdb3c8b4b060e484c9061b1e7ee8d958200d6041e408
+Size (Python-3.11.5.tar.xz) = 20053580 bytes
 SHA1 (patch-Include_pymacro.h) = 271a891892dca1a3aaa3bedcae626a68a36cae0b
 SHA1 (patch-Lib_ctypes_util.py) = 3dec1b6b7a36e46cbfa0dfcd71c5e7fac9f60764
 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) = 352633b0c261fb3feaec2e11ee3fdbabfe4bc0f4
+SHA1 (patch-Makefile.pre.in) = fdb5794d112f422a1f28aa9f8b179dc05520f9e1
 SHA1 (patch-Modules_socketmodule.c) = dcf93806374bb8d983b7c8cefd7a3360a90064d7
-SHA1 (patch-configure) = 684a8e2405cd690958798a64cdbb8985ce03b023
+SHA1 (patch-configure) = a6d9a00ff160581245bc30d1b0d2ec0e9da8fb0b
 SHA1 (patch-setup.py) = e9d63094f547bd0a9e00d4ded88ebcdfeb3a7ea2

Index: pkgsrc/lang/python311/patches/patch-Makefile.pre.in
diff -u pkgsrc/lang/python311/patches/patch-Makefile.pre.in:1.2 pkgsrc/lang/python311/patches/patch-Makefile.pre.in:1.3
--- pkgsrc/lang/python311/patches/patch-Makefile.pre.in:1.2     Sat Jan 14 17:23:10 2023
+++ pkgsrc/lang/python311/patches/patch-Makefile.pre.in Fri Aug 25 08:28:22 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.pre.in,v 1.2 2023/01/14 17:23:10 wiz Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.3 2023/08/25 08:28:22 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       2022-10-24 17:35:39.000000000 +0000
+--- Makefile.pre.in.orig       2023-08-24 12:09:18.000000000 +0000
 +++ Makefile.pre.in
 @@ -260,7 +260,7 @@ DIST=              $(DISTFILES) $(DISTDIRS)
  LIBRARY=      @LIBRARY@
@@ -16,7 +16,7 @@ Swap targets libinstall and libainstall,
  DLLLIBRARY=   @DLLLIBRARY@
  LDLIBRARYDIR=   @LDLIBRARYDIR@
  INSTSONAME=   @INSTSONAME@
-@@ -1447,7 +1445,7 @@ Python/frozen.o: $(FROZEN_FILES_OUT)
+@@ -1448,7 +1448,7 @@ Python/frozen.o: $(FROZEN_FILES_OUT)
  # 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
@@ -25,7 +25,7 @@ Swap targets libinstall and libainstall,
        : sed in-place edit with POSIX-only tools
        sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
        mv $@.tmp $@
-@@ -1457,7 +1455,7 @@ Python/import.o: $(srcdir)/Include/pydtr
+@@ -1458,7 +1458,7 @@ Python/import.o: $(srcdir)/Include/pydtr
  Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h
  
  Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
@@ -34,16 +34,16 @@ Swap targets libinstall and libainstall,
  
  Objects/typeobject.o: Objects/typeslots.inc
  
-@@ -1758,7 +1756,7 @@ altinstall: commoninstall
+@@ -1763,7 +1763,7 @@ altinstall: commoninstall
        fi
  
  commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
 -              altbininstall libinstall inclinstall libainstall \
 +              altbininstall libainstall inclinstall libinstall \
-               sharedinstall oldsharedinstall altmaninstall \
-               @FRAMEWORKALTINSTALLLAST@
+               sharedinstall oldsharedinstall altmaninstall @FRAMEWORKALTINSTALLLAST@
  
-@@ -1818,7 +1816,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+ # Install shared libraries enabled by Setup
+@@ -1822,7 +1822,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
                        if test -n "$(PY3LIBRARY)"; then \
                                $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
                        fi; \
@@ -53,7 +53,7 @@ Swap targets libinstall and libainstall,
                fi; \
        fi
        if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -2071,7 +2070,7 @@ libinstall:      all $(srcdir)/Modules/xxmodu
+@@ -2116,7 +2117,7 @@ libinstall:      all $(srcdir)/Modules/xxmodu
                        esac; \
                done; \
        done
@@ -62,7 +62,7 @@ Swap targets libinstall and libainstall,
                $(DESTDIR)$(LIBDEST); \
        $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
        if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
-@@ -2089,11 +2088,6 @@ libinstall:     all $(srcdir)/Modules/xxmodu
+@@ -2134,11 +2135,6 @@ libinstall:     all $(srcdir)/Modules/xxmodu
                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
                $(DESTDIR)$(LIBDEST)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -74,7 +74,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
-@@ -2102,10 +2096,6 @@ libinstall:     all $(srcdir)/Modules/xxmodu
+@@ -2147,10 +2143,6 @@ libinstall:     all $(srcdir)/Modules/xxmodu
                -j0 -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -85,7 +85,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
-@@ -2231,7 +2221,7 @@ sharedinstall: all
+@@ -2276,7 +2268,7 @@ sharedinstall: all
                --install-scripts=$(BINDIR) \
                --install-platlib=$(DESTSHARED) \
                --root=$(DESTDIR)/

Index: pkgsrc/lang/python311/patches/patch-configure
diff -u pkgsrc/lang/python311/patches/patch-configure:1.4 pkgsrc/lang/python311/patches/patch-configure:1.5
--- pkgsrc/lang/python311/patches/patch-configure:1.4   Thu Jun 29 01:32:28 2023
+++ pkgsrc/lang/python311/patches/patch-configure       Fri Aug 25 08:28:22 2023
@@ -1,23 +1,23 @@
-$NetBSD: patch-configure,v 1.4 2023/06/29 01:32:28 riastradh Exp $
+$NetBSD: patch-configure,v 1.5 2023/08/25 08:28:22 adam Exp $
 
 Fix linking on Darwin; don't use -stack_size.
 Changes for consistency across pkgsrc platforms.
 Simplify _sysconfigdata to include only platform name.
 Disable barrier to cross-compilation.
 
---- configure.orig     2023-06-06 22:00:27.000000000 +0000
+--- configure.orig     2023-08-24 12:09:18.000000000 +0000
 +++ configure
-@@ -3630,7 +3630,7 @@ fi
+@@ -3262,7 +3262,7 @@ fi
      fi
          ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
      PYTHON_FOR_FREEZE="$with_build_python"
 -    PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat 
pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
 +    PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat 
pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(MACHDEP) '$with_build_python
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5
- printf "%s\n" "$with_build_python" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5
+ $as_echo "$with_build_python" >&6; }
  
-@@ -4253,7 +4253,7 @@ fi
- printf "%s\n" "\"$MACHDEP\"" >&6; }
+@@ -3865,7 +3865,7 @@ fi
+ $as_echo "\"$MACHDEP\"" >&6; }
  
  
 -if test "$cross_compiling" = yes; then
@@ -25,7 +25,7 @@ Disable barrier to cross-compilation.
        case "$host" in
        *-*-linux*)
                case "$host_cpu" in
-@@ -8995,7 +8995,7 @@ UNIVERSAL_ARCH_FLAGS=
+@@ -8259,7 +8259,7 @@ UNIVERSAL_ARCH_FLAGS=
  # tweak BASECFLAGS based on compiler and platform
  case $GCC in
  yes)
@@ -34,8 +34,8 @@ Disable barrier to cross-compilation.
  
  
  
-@@ -22503,10 +22503,10 @@ if ac_fn_c_try_compile "$LINENO"
- then :
+@@ -19916,10 +19916,10 @@ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
  
  
 -if grep noonsees conftest.$ac_objext >/dev/null ; then
@@ -47,16 +47,16 @@ Disable barrier to cross-compilation.
    if test "$ax_cv_c_float_words_bigendian" = unknown; then
      ax_cv_c_float_words_bigendian=no
    else
-@@ -23367,7 +23367,7 @@ printf "%s\n" "#define ALT_SOABI \"${ALT
+@@ -20767,7 +20767,7 @@ _ACEOF
  fi
  
  
 -EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX}
 +EXT_SUFFIX=${SHLIB_SUFFIX}
  
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5
- printf %s "checking LDVERSION... " >&6; }
-@@ -23421,11 +23421,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5
+ $as_echo_n "checking LDVERSION... " >&6; }
+@@ -20820,11 +20820,7 @@ fi
  
  
  



Home | Main Index | Thread Index | Old Index