diff --git a/lang/python311/Makefile b/lang/python311/Makefile index 6c6449781c10..900776860f1f 100644 --- a/lang/python311/Makefile +++ b/lang/python311/Makefile @@ -1,5 +1,6 @@ PORTNAME= python DISTVERSION= ${PYTHON_DISTVERSION} +PORTREVISION= 1 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -7,7 +8,7 @@ DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org -COMMENT= Interpreted object-oriented programming language (RC version) +COMMENT= Interpreted object-oriented programming language WWW= https://www.python.org/ LICENSE= PSFL diff --git a/lang/python311/Makefile.version b/lang/python311/Makefile.version index d1fc7460cfb1..5794993c58d1 100644 --- a/lang/python311/Makefile.version +++ b/lang/python311/Makefile.version @@ -4,4 +4,4 @@ # 1. Update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" # 2. Remove PORTREVISION in Makefile -PYTHON_DISTVERSION= 3.11.0rc2 +PYTHON_DISTVERSION= 3.11.1 diff --git a/lang/python311/distinfo b/lang/python311/distinfo index aa64c7175f30..be573a8d5acb 100644 --- a/lang/python311/distinfo +++ b/lang/python311/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663080691 -SHA256 (python/Python-3.11.0rc2.tar.xz) = 25b35cc7d82c5ad34d867b179a1c1695d129be5ed14a21e46b6b7f2350a8b490 -SIZE (python/Python-3.11.0rc2.tar.xz) = 19828340 +TIMESTAMP = 1670414884 +SHA256 (python/Python-3.11.1.tar.xz) = 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f +SIZE (python/Python-3.11.1.tar.xz) = 19856648 diff --git a/lang/python311/files/patch-GH-100133 b/lang/python311/files/patch-GH-100133 new file mode 100644 index 000000000000..6db2c1b3eec1 --- /dev/null +++ b/lang/python311/files/patch-GH-100133 @@ -0,0 +1,24 @@ +commit ae8520c70992710903819f24dbce4e7dd05d7ea8 +Author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> +Date: Wed Dec 21 02:24:19 2022 -0800 + + GH-100133: fix `asyncio` subprocess losing `stderr` and `stdout` output (GH-100154) + + (cherry picked from commit a7715ccfba5b86ab09f86ec56ac3755c93b46b48) + + Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> + +diff --git Lib/asyncio/base_subprocess.py Lib/asyncio/base_subprocess.py +index e15bb4141f..4c9b0dd565 100644 +--- Lib/asyncio/base_subprocess.py ++++ Lib/asyncio/base_subprocess.py +@@ -215,9 +215,6 @@ def _process_exited(self, returncode): + # object. On Python 3.6, it is required to avoid a ResourceWarning. + self._proc.returncode = returncode + self._call(self._protocol.process_exited) +- for p in self._pipes.values(): +- if p is not None: +- p.pipe.close() + + self._try_finish() + diff --git a/lang/python311/files/patch-Modules__socketmodule.c b/lang/python311/files/patch-Modules__socketmodule.c new file mode 100644 index 000000000000..93ef3b785ab9 --- /dev/null +++ b/lang/python311/files/patch-Modules__socketmodule.c @@ -0,0 +1,29 @@ +--- Modules/socketmodule.c ++++ Modules/socketmodule.c +@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, + /* RDS sockets use sockaddr_in: fall-through */ + #endif /* AF_RDS */ + ++#ifdef AF_DIVERT ++ case AF_DIVERT: ++ /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */ ++#endif /* AF_DIVERT */ ++ + case AF_INET: + { + struct maybe_idna host = {NULL, NULL}; +@@ -7628,6 +7633,14 @@ PyInit__socket(void) + PyModule_AddIntMacro(m, AF_SYSTEM); + #endif + ++/* FreeBSD divert(4) */ ++#ifdef PF_DIVERT ++ PyModule_AddIntMacro(m, PF_DIVERT); ++#endif ++#ifdef AF_DIVERT ++ PyModule_AddIntMacro(m, AF_DIVERT); ++#endif ++ + #ifdef AF_PACKET + PyModule_AddIntMacro(m, AF_PACKET); + #endif diff --git a/lang/python311/files/patch-configure b/lang/python311/files/patch-configure index aa89baed8cc0..4aa2a57ef300 100644 --- a/lang/python311/files/patch-configure +++ b/lang/python311/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig 2022-02-23 19:32:58 UTC +--- configure.orig 2022-12-07 13:31:07 UTC +++ configure -@@ -7244,7 +7244,7 @@ fi +@@ -7630,7 +7630,7 @@ if test "$Py_LTO" = 'true' ; then if test "$Py_LTO" = 'true' ; then case $CC in - *clang*) + *clang*|cc) - LDFLAGS_NOLTO="-fno-lto" - - if test -n "$ac_tool_prefix"; then + LDFLAGS_NOLTO="-fno-lto" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -flto=thin" >&5 + $as_echo_n "checking whether C compiler accepts -flto=thin... " >&6; } diff --git a/lang/python311/pkg-plist b/lang/python311/pkg-plist index 44eeb46ae716..1512108f8996 100644 --- a/lang/python311/pkg-plist +++ b/lang/python311/pkg-plist @@ -2205,8 +2205,8 @@ lib/python%%XYDOT%%/ensurepip/__pycache__/__main__.cpython-%%XY%%.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/ensurepip/_bundled/pip-22.2.2-py3-none-any.whl -lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl +lib/python%%XYDOT%%/ensurepip/_bundled/pip-22.3.1-py3-none-any.whl +lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl lib/python%%XYDOT%%/ensurepip/_uninstall.py lib/python%%XYDOT%%/enum.py lib/python%%XYDOT%%/filecmp.py @@ -2974,7 +2974,7 @@ lib/python%%XYDOT%%/lib-dynload/fcntl.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib-dynload/grp.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib-dynload/math.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib-dynload/mmap.cpython-%%XY%%%%ABI%%.so -lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%.so +%%NO_NIS%%lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib-dynload/ossaudiodev.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib-dynload/pyexpat.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%%%ABI%%.so @@ -2987,9 +2987,9 @@ lib/python%%XYDOT%%/lib-dynload/xxlimited.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib-dynload/xxlimited_35.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib-dynload/zlib.cpython-%%XY%%%%ABI%%.so lib/python%%XYDOT%%/lib2to3/Grammar.txt -lib/python%%XYDOT%%/lib2to3/Grammar%%XYZDOT%%.candidate.2.pickle +lib/python%%XYDOT%%/lib2to3/Grammar%%XYZDOT%%.final.0.pickle lib/python%%XYDOT%%/lib2to3/PatternGrammar.txt -lib/python%%XYDOT%%/lib2to3/PatternGrammar%%XYZDOT%%.candidate.2.pickle +lib/python%%XYDOT%%/lib2to3/PatternGrammar%%XYZDOT%%.final.0.pickle lib/python%%XYDOT%%/lib2to3/__init__.py lib/python%%XYDOT%%/lib2to3/__main__.py lib/python%%XYDOT%%/lib2to3/__pycache__/__init__.cpython-%%XY%%.opt-1.pyc @@ -3582,6 +3582,9 @@ lib/python%%XYDOT%%/test/__pycache__/_test_embed_structseq.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/_test_multiprocessing.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/_test_multiprocessing.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/_test_multiprocessing.cpython-%%XY%%.pyc +lib/python%%XYDOT%%/test/__pycache__/_test_venv_multiprocessing.cpython-%%XY%%.opt-1.pyc +lib/python%%XYDOT%%/test/__pycache__/_test_venv_multiprocessing.cpython-%%XY%%.opt-2.pyc +lib/python%%XYDOT%%/test/__pycache__/_test_venv_multiprocessing.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/_typed_dict_helper.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/_typed_dict_helper.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/_typed_dict_helper.cpython-%%XY%%.pyc @@ -3906,9 +3909,6 @@ lib/python%%XYDOT%%/test/__pycache__/test_calendar.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/test_call.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/test_call.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/test_call.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/test/__pycache__/test_capi.cpython-%%XY%%.opt-1.pyc -lib/python%%XYDOT%%/test/__pycache__/test_capi.cpython-%%XY%%.opt-2.pyc -lib/python%%XYDOT%%/test/__pycache__/test_capi.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/test_cgi.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/test_cgi.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/test_cgi.cpython-%%XY%%.pyc @@ -4272,9 +4272,6 @@ lib/python%%XYDOT%%/test/__pycache__/test_genericpath.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/test_genexps.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/test_genexps.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/test_genexps.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/test/__pycache__/test_getargs2.cpython-%%XY%%.opt-1.pyc -lib/python%%XYDOT%%/test/__pycache__/test_getargs2.cpython-%%XY%%.opt-2.pyc -lib/python%%XYDOT%%/test/__pycache__/test_getargs2.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/test_getopt.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/test_getopt.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/test_getopt.cpython-%%XY%%.pyc @@ -4776,9 +4773,6 @@ lib/python%%XYDOT%%/test/__pycache__/test_strtod.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/test_struct.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/test_struct.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/test_struct.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/test/__pycache__/test_structmembers.cpython-%%XY%%.opt-1.pyc -lib/python%%XYDOT%%/test/__pycache__/test_structmembers.cpython-%%XY%%.opt-2.pyc -lib/python%%XYDOT%%/test/__pycache__/test_structmembers.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/__pycache__/test_structseq.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/test/__pycache__/test_structseq.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/__pycache__/test_structseq.cpython-%%XY%%.pyc @@ -5090,6 +5084,7 @@ lib/python%%XYDOT%%/test/_test_eintr.py lib/python%%XYDOT%%/test/_test_embed_set_config.py lib/python%%XYDOT%%/test/_test_embed_structseq.py lib/python%%XYDOT%%/test/_test_multiprocessing.py +lib/python%%XYDOT%%/test/_test_venv_multiprocessing.py lib/python%%XYDOT%%/test/_testcppext.cpp lib/python%%XYDOT%%/test/_typed_dict_helper.py lib/python%%XYDOT%%/test/allsans.pem @@ -5769,7 +5764,6 @@ lib/python%%XYDOT%%/test/test_bz2.py lib/python%%XYDOT%%/test/test_c_locale_coercion.py lib/python%%XYDOT%%/test/test_calendar.py lib/python%%XYDOT%%/test/test_call.py -lib/python%%XYDOT%%/test/test_capi.py lib/python%%XYDOT%%/test/test_cgi.py lib/python%%XYDOT%%/test/test_cgitb.py lib/python%%XYDOT%%/test/test_charmapcodec.py @@ -6028,7 +6022,6 @@ lib/python%%XYDOT%%/test/test_genericalias.py lib/python%%XYDOT%%/test/test_genericclass.py lib/python%%XYDOT%%/test/test_genericpath.py lib/python%%XYDOT%%/test/test_genexps.py -lib/python%%XYDOT%%/test/test_getargs2.py lib/python%%XYDOT%%/test/test_getopt.py lib/python%%XYDOT%%/test/test_getpass.py lib/python%%XYDOT%%/test/test_getpath.py @@ -6763,7 +6756,6 @@ lib/python%%XYDOT%%/test/test_stringprep.py lib/python%%XYDOT%%/test/test_strptime.py lib/python%%XYDOT%%/test/test_strtod.py lib/python%%XYDOT%%/test/test_struct.py -lib/python%%XYDOT%%/test/test_structmembers.py lib/python%%XYDOT%%/test/test_structseq.py lib/python%%XYDOT%%/test/test_subclassinit.py lib/python%%XYDOT%%/test/test_subprocess.py @@ -6968,6 +6960,14 @@ lib/python%%XYDOT%%/test/tracedmodules/__pycache__/testmod.cpython-%%XY%%.opt-1. lib/python%%XYDOT%%/test/tracedmodules/__pycache__/testmod.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/test/tracedmodules/__pycache__/testmod.cpython-%%XY%%.pyc lib/python%%XYDOT%%/test/tracedmodules/testmod.py +lib/python%%XYDOT%%/test/typinganndata/__init__.py +lib/python%%XYDOT%%/test/typinganndata/__pycache__/__init__.cpython-%%XY%%.opt-1.pyc +lib/python%%XYDOT%%/test/typinganndata/__pycache__/__init__.cpython-%%XY%%.opt-2.pyc +lib/python%%XYDOT%%/test/typinganndata/__pycache__/__init__.cpython-%%XY%%.pyc +lib/python%%XYDOT%%/test/typinganndata/__pycache__/ann_module9.cpython-%%XY%%.opt-1.pyc +lib/python%%XYDOT%%/test/typinganndata/__pycache__/ann_module9.cpython-%%XY%%.opt-2.pyc +lib/python%%XYDOT%%/test/typinganndata/__pycache__/ann_module9.cpython-%%XY%%.pyc +lib/python%%XYDOT%%/test/typinganndata/ann_module9.py lib/python%%XYDOT%%/test/win_console_handler.py lib/python%%XYDOT%%/test/xmltestdata/c14n-20/README lib/python%%XYDOT%%/test/xmltestdata/c14n-20/c14nComment.xml