Index: head/lang/python36/Makefile
===================================================================
--- head/lang/python36/Makefile	(revision 552350)
+++ head/lang/python36/Makefile	(revision 552351)
@@ -1,152 +1,152 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
 # Resolve sinpi name clash with libm (IEEE-754 violation)
 PATCH_SITES=	https://github.com/python/cpython/commit/
 PATCHFILES=	f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch:-p1 \
 		f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch:-p1
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
 USES=		cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
 PATHFIX_MAKEFILEIN=	Makefile.pre.in
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
 SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
 
 # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
 PYTHON_VER=		${PYTHON_PORTVERSION:R}
 PYTHON_VERSION=		python${PYTHON_VER}
 PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
 
 DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
 CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
 CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 
 TEST_TARGET=		buildbottest
 TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
 
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 
 SUB_FILES=		pkg-message
 SUB_LIST=		PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			XY=${PYTHON_SUFFIX} \
 			XYDOT=${PYTHON_VER} \
 			XYZDOT=${PORTVERSION} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS
 OPTIONS_DEFAULT=	LIBFFI PYMALLOC THREADS
 OPTIONS_RADIO=		HASH
 OPTIONS_RADIO_HASH=	FNV SIPHASH
 OPTIONS_SUB=		yes
 
 LIBFFI_DESC=		Use libffi from ports instead of bundled version
 NLS_DESC=		Enable gettext support for the locale module
 PYMALLOC_DESC=		Enable specialized mallocs
 
 HASH_DESC=		Hash Algorithm (PEP-456)
 FNV_DESC=		Modified Fowler-Noll-Vo Algorithm
 SIPHASH_DESC=		SipHash24 Algorithm
 
 FNV_CONFIGURE_ON=	--with-hash-algorithm=fnv
 SIPHASH_CONFIGURE_ON=	--with-hash-algorithm=siphash24
 
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
 LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
 # Upstream Issue: https://bugs.python.org/issue6299
 NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LIBS=		-L${LOCALBASE}/lib -lintl
 NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
 THREADS_CONFIGURE_WITH=	threads
 THREADS_LDFLAGS=	-lpthread
 
 .include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYMALLOC}
 ABIFLAGS:=	m${ABIFLAGS}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 ABIFLAGS:=	d${ABIFLAGS}
 .endif
 
 .if !empty(ABIFLAGS)
 PLIST_FILES+=	bin/python${PYTHON_VER}${ABIFLAGS} \
 		bin/python${PYTHON_VER}${ABIFLAGS}-config \
 		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc
 .endif
 
 # https://bugs.python.org/issue22521
 # https://bugs.python.org/issue23042
 .if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI}
 BROKEN=		You must use libffi from ports on i386. Enable the LIBFFI option
 .endif
 
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 # See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
 DISABLED_EXTENSIONS+=	nis
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
 post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
 # edit this so that the run time configuration for python matches what the
 # FreeBSD base system provides.  sbruno 02Aug2017
 .if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_m_freebsd${OSREL:R}_.py
 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		./python -E -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_m_freebsd${OSREL:R}_.py
 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_m_freebsd${OSREL:R}_.py
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}m/Makefile
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py
 
 .include <bsd.port.mk>
Index: head/lang/python36/files/patch-Modules___posixsubprocess.c
===================================================================
--- head/lang/python36/files/patch-Modules___posixsubprocess.c	(revision 552350)
+++ head/lang/python36/files/patch-Modules___posixsubprocess.c	(nonexistent)
@@ -1,25 +0,0 @@
-# Add closefrom(2) support
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
-# https://bugs.python.org/issue38061
-# TODO: Upstream
-
---- Modules/_posixsubprocess.c.orig	2019-07-02 20:25:39 UTC
-+++ Modules/_posixsubprocess.c
-@@ -236,8 +236,15 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_
-         start_fd = keep_fd + 1;
-     }
-     if (start_fd <= end_fd) {
--        for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
--            close(fd_num);
-+#ifdef __FreeBSD__
-+        if (end_fd >= sysconf(_SC_OPEN_MAX)) {
-+            closefrom(start_fd);
-+        } else
-+#endif
-+        {
-+            for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
-+                close(fd_num);
-+            }
-         }
-     }
- }

Property changes on: head/lang/python36/files/patch-Modules___posixsubprocess.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/python36/files/patch-Modules_posixmodule.c
===================================================================
--- head/lang/python36/files/patch-Modules_posixmodule.c	(revision 552350)
+++ head/lang/python36/files/patch-Modules_posixmodule.c	(nonexistent)
@@ -1,26 +0,0 @@
-# Add closefrom(2) support
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
-# https://bugs.python.org/issue38061
-# TODO: Upstream
-
---- Modules/posixmodule.c.orig	2019-07-02 20:25:39 UTC
-+++ Modules/posixmodule.c
-@@ -7685,8 +7685,16 @@ os_closerange_impl(PyObject *module, int fd_low, int f
-     int i;
-     Py_BEGIN_ALLOW_THREADS
-     _Py_BEGIN_SUPPRESS_IPH
--    for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
--        close(i);
-+    fd_low = Py_MAX(fd_low, 0);
-+#ifdef __FreeBSD__
-+    if (fd_high >= sysconf(_SC_OPEN_MAX)) {
-+        closefrom(fd_low);
-+    } else
-+#endif
-+    {
-+        for (i = fd_low; i < fd_high; i++)
-+            close(i);
-+    }
-     _Py_END_SUPPRESS_IPH
-     Py_END_ALLOW_THREADS
-     Py_RETURN_NONE;

Property changes on: head/lang/python36/files/patch-Modules_posixmodule.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/python36/files/patch-issue40422_issue40423
===================================================================
--- head/lang/python36/files/patch-issue40422_issue40423	(nonexistent)
+++ head/lang/python36/files/patch-issue40422_issue40423	(revision 552351)
@@ -0,0 +1,207 @@
+diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
+index 07dd54dba9..ef1b7a8ad5 100644
+--- Modules/_posixsubprocess.c
++++ Modules/_posixsubprocess.c
+@@ -21,6 +21,8 @@
+ #include <dirent.h>
+ #endif
+ 
++#include "posixmodule.h"
++
+ #ifdef _Py_MEMORY_SANITIZER
+ # include <sanitizer/msan_interface.h>
+ #endif
+@@ -222,7 +222,6 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
+     long end_fd = safe_get_max_fd();
+     Py_ssize_t num_fds_to_keep = PyTuple_GET_SIZE(py_fds_to_keep);
+     Py_ssize_t keep_seq_idx;
+-    int fd_num;
+     /* As py_fds_to_keep is sorted we can loop through the list closing
+      * fds inbetween any in the keep list falling within our range. */
+     for (keep_seq_idx = 0; keep_seq_idx < num_fds_to_keep; ++keep_seq_idx) {
+@@ -230,15 +229,11 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
+         int keep_fd = PyLong_AsLong(py_keep_fd);
+         if (keep_fd < start_fd)
+             continue;
+-        for (fd_num = start_fd; fd_num < keep_fd; ++fd_num) {
+-            close(fd_num);
+-        }
++        _Py_closerange(start_fd, keep_fd - 1);
+         start_fd = keep_fd + 1;
+     }
+     if (start_fd <= end_fd) {
+-        for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
+-            close(fd_num);
+-        }
++        _Py_closerange(start_fd, end_fd);
+     }
+ }
+ 
+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
+index 776a3d249a..f46df9ddf7 100644
+--- Modules/posixmodule.c
++++ Modules/posixmodule.c
+@@ -7667,6 +7667,78 @@ os_close_impl(PyObject *module, int fd)
+     Py_RETURN_NONE;
+ }
+ 
++/* Our selection logic for which function to use is as follows:
++ * 1. If close_range(2) is available, always prefer that; it's better for
++ *    contiguous ranges like this than fdwalk(3) which entails iterating over
++ *    the entire fd space and simply doing nothing for those outside the range.
++ * 2. If closefrom(2) is available, we'll attempt to use that next if we're
++ *    closing up to sysconf(_SC_OPEN_MAX).
++ * 2a. Fallback to fdwalk(3) if we're not closing up to sysconf(_SC_OPEN_MAX),
++ *    as that will be more performant if the range happens to have any chunk of
++ *    non-opened fd in the middle.
++ * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop.
++ */
++#ifdef __FreeBSD__
++#define USE_CLOSEFROM
++#endif /* __FreeBSD__ */
++
++#ifdef HAVE_FDWALK
++#define USE_FDWALK
++#endif /* HAVE_FDWALK */
++
++#ifdef USE_FDWALK
++static int
++_fdwalk_close_func(void *lohi, int fd)
++{
++    int lo = ((int *)lohi)[0];
++    int hi = ((int *)lohi)[1];
++
++    if (fd >= hi)
++        return 1;
++    else if (fd >= lo)
++        close(fd);
++    return 0;
++}
++#endif /* USE_FDWALK */
++
++/* Closes all file descriptors in [first, last], ignoring errors. */
++void
++_Py_closerange(int first, int last)
++{
++    first = Py_MAX(first, 0);
++    _Py_BEGIN_SUPPRESS_IPH
++#ifdef HAVE_CLOSE_RANGE
++    if (close_range(first, last, 0) == 0 || errno != ENOSYS) {
++        /* Any errors encountered while closing file descriptors are ignored;
++         * ENOSYS means no kernel support, though,
++         * so we'll fallback to the other methods. */
++    }
++    else
++#endif /* HAVE_CLOSE_RANGE */
++#ifdef USE_CLOSEFROM
++    if (last >= sysconf(_SC_OPEN_MAX)) {
++        /* Any errors encountered while closing file descriptors are ignored */
++        closefrom(first);
++    }
++    else
++#endif /* USE_CLOSEFROM */
++#ifdef USE_FDWALK
++    {
++        int lohi[2];
++        lohi[0] = first;
++        lohi[1] = last + 1;
++        fdwalk(_fdwalk_close_func, lohi);
++    }
++#else
++    {
++        for (int i = first; i <= last; i++) {
++            /* Ignore errors */
++            (void)close(i);
++        }
++    }
++#endif /* USE_FDWALK */
++    _Py_END_SUPPRESS_IPH
++}
+ 
+ /*[clinic input]
+ os.closerange
+@@ -7682,12 +7754,8 @@ static PyObject *
+ os_closerange_impl(PyObject *module, int fd_low, int fd_high)
+ /*[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]*/
+ {
+-    int i;
+     Py_BEGIN_ALLOW_THREADS
+-    _Py_BEGIN_SUPPRESS_IPH
+-    for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
+-        close(i);
+-    _Py_END_SUPPRESS_IPH
++    _Py_closerange(fd_low, fd_high - 1);
+     Py_END_ALLOW_THREADS
+     Py_RETURN_NONE;
+ }
+diff --git a/Modules/posixmodule.h b/Modules/posixmodule.h
+index 1ec1833825..be2308ea86 100644
+--- Modules/posixmodule.h
++++ Modules/posixmodule.h
+@@ -19,6 +19,8 @@ PyAPI_FUNC(int) _Py_Gid_Converter(PyObject *, void *);
+ #endif /* MS_WINDOWS */
+ #endif
+ 
++PyAPI_FUNC(void) _Py_closerange(int first, int last);
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff --git a/configure b/configure
+index e39c16eee2..1f34b4de74 100755
+--- configure
++++ configure
+@@ -11420,9 +11420,9 @@ fi
+ 
+ # checks for library functions
+ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
+- clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \
+- fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
+- futimens futimes gai_strerror getentropy \
++ clock close_range confstr ctermid dup3 execv faccessat fchmod fchmodat fchown \
++ fchownat fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate \
++ futimesat futimens futimes gai_strerror getentropy \
+  getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
+  getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
+  initgroups kill killpg lchown linkat lstat lutimes mmap \
+diff --git a/configure.ac b/configure.ac
+index cf280506bd..09886eaeef 100644
+--- configure.ac
++++ configure.ac
+@@ -3531,9 +3531,9 @@ fi
+ 
+ # checks for library functions
+ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
+- clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \
+- fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
+- futimens futimes gai_strerror getentropy \
++ clock close_range confstr ctermid dup3 execv faccessat fchmod fchmodat fchown \
++ fchownat fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate \
++ futimesat futimens futimes gai_strerror getentropy \
+  getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
+  getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
+  initgroups kill killpg lchown linkat lstat lutimes mmap \
+diff --git a/pyconfig.h.in b/pyconfig.h.in
+index 2fbbb6d20d..a4488cbe32 100644
+--- pyconfig.h.in
++++ pyconfig.h.in
+@@ -128,6 +128,9 @@
+ /* Define to 1 if you have the `clock_settime' function. */
+ #undef HAVE_CLOCK_SETTIME
+ 
++/* Define to 1 if you have the `close_range' function. */
++#undef HAVE_CLOSE_RANGE
++
+ /* Define if the C compiler supports computed gotos. */
+ #undef HAVE_COMPUTED_GOTOS
+ 
+@@ -317,6 +320,9 @@
+ /* Define to 1 if you have the `fdopendir' function. */
+ #undef HAVE_FDOPENDIR
+ 
++/* Define to 1 if you have the `fdwalk' function. */
++#undef HAVE_FDWALK
++
+ /* Define to 1 if you have the `fexecve' function. */
+ #undef HAVE_FEXECVE
+ 

Property changes on: head/lang/python36/files/patch-issue40422_issue40423
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/lang/python37/Makefile
===================================================================
--- head/lang/python37/Makefile	(revision 552350)
+++ head/lang/python37/Makefile	(revision 552351)
@@ -1,142 +1,143 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
 LIB_DEPENDS=	libffi.so:devel/libffi
 
 USES=		cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
 PATHFIX_MAKEFILEIN=	Makefile.pre.in
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
 SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
 
 # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
 PYTHON_VER=		${PYTHON_PORTVERSION:R}
 PYTHON_VERSION=		python${PYTHON_VER}
 PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
 
 DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
 CONFIGURE_ARGS+=	--enable-shared --without-ensurepip \
 			--with-system-ffi
 CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 
 TEST_TARGET=		buildbottest
 TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
 
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 
 SUB_FILES=		pkg-message
 SUB_LIST=		PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			XY=${PYTHON_SUFFIX} \
 			XYDOT=${PYTHON_VER} \
 			XYZDOT=${PORTVERSION} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 NLS PYMALLOC
 OPTIONS_DEFAULT=	PYMALLOC
 OPTIONS_RADIO=		HASH
 OPTIONS_RADIO_HASH=	FNV SIPHASH
 OPTIONS_SUB=		yes
 
 NLS_DESC=		Enable gettext support for the locale module
 PYMALLOC_DESC=		Enable specialized mallocs
 
 HASH_DESC=		Hash Algorithm (PEP-456)
 FNV_DESC=		Modified Fowler-Noll-Vo Algorithm
 SIPHASH_DESC=		SipHash24 Algorithm
 
 FNV_CONFIGURE_ON=	--with-hash-algorithm=fnv
 SIPHASH_CONFIGURE_ON=	--with-hash-algorithm=siphash24
 
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
 # Upstream Issue: https://bugs.python.org/issue6299
 NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LIBS=		-L${LOCALBASE}/lib -lintl
 NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
 .include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYMALLOC}
 ABIFLAGS:=	m${ABIFLAGS}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 ABIFLAGS:=	d${ABIFLAGS}
 .endif
 
 .if !empty(ABIFLAGS)
 PLIST_FILES+=	bin/python${PYTHON_VER}${ABIFLAGS} \
 		bin/python${PYTHON_VER}${ABIFLAGS}-config \
 		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc
 .endif
 
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 # See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
 DISABLED_EXTENSIONS+=	nis
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
 post-patch:
 # disable the detection of includes and library from e2fsprogs-libuuid,
 # which introduces hidden dependency and breaks build
 	@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py
 
 post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
 # edit this so that the run time configuration for python matches what the
 # FreeBSD base system provides.  sbruno 02Aug2017
 .if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		./python -E -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py
 
 .include <bsd.port.mk>
Index: head/lang/python37/files/patch-Modules___posixsubprocess.c
===================================================================
--- head/lang/python37/files/patch-Modules___posixsubprocess.c	(revision 552350)
+++ head/lang/python37/files/patch-Modules___posixsubprocess.c	(nonexistent)
@@ -1,25 +0,0 @@
-# Add closefrom(2) support
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
-# https://bugs.python.org/issue38061
-# TODO: Upstream
-
---- Modules/_posixsubprocess.c.orig	2019-10-14 22:32:36 UTC
-+++ Modules/_posixsubprocess.c
-@@ -236,8 +236,15 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_
-         start_fd = keep_fd + 1;
-     }
-     if (start_fd <= end_fd) {
--        for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
--            close(fd_num);
-+#ifdef __FreeBSD__
-+        if (end_fd >= sysconf(_SC_OPEN_MAX)) {
-+            closefrom(start_fd);
-+        } else
-+#endif
-+        {
-+            for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
-+                close(fd_num);
-+            }
-         }
-     }
- }

Property changes on: head/lang/python37/files/patch-Modules___posixsubprocess.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/python37/files/patch-Modules_posixmodule.c
===================================================================
--- head/lang/python37/files/patch-Modules_posixmodule.c	(revision 552350)
+++ head/lang/python37/files/patch-Modules_posixmodule.c	(nonexistent)
@@ -1,26 +0,0 @@
-# Add closefrom(2) support
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
-# https://bugs.python.org/issue38061
-# TODO: Upstream
-
---- Modules/posixmodule.c.orig	2019-10-14 22:32:36 UTC
-+++ Modules/posixmodule.c
-@@ -7810,8 +7810,16 @@ os_closerange_impl(PyObject *module, int fd_low, int f
-     int i;
-     Py_BEGIN_ALLOW_THREADS
-     _Py_BEGIN_SUPPRESS_IPH
--    for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
--        close(i);
-+    fd_low = Py_MAX(fd_low, 0);
-+#ifdef __FreeBSD__
-+    if (fd_high >= sysconf(_SC_OPEN_MAX)) {
-+        closefrom(fd_low);
-+    } else
-+#endif
-+    {
-+        for (i = fd_low; i < fd_high; i++)
-+            close(i);
-+    }
-     _Py_END_SUPPRESS_IPH
-     Py_END_ALLOW_THREADS
-     Py_RETURN_NONE;

Property changes on: head/lang/python37/files/patch-Modules_posixmodule.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/python37/files/patch-issue40422_issue40423
===================================================================
--- head/lang/python37/files/patch-issue40422_issue40423	(nonexistent)
+++ head/lang/python37/files/patch-issue40422_issue40423	(revision 552351)
@@ -0,0 +1,207 @@
+diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
+index 3cf0683ad9..fb070e4cc4 100644
+--- Modules/_posixsubprocess.c
++++ Modules/_posixsubprocess.c
+@@ -21,6 +21,8 @@
+ #include <dirent.h>
+ #endif
+ 
++#include "posixmodule.h"
++
+ #ifdef _Py_MEMORY_SANITIZER
+ # include <sanitizer/msan_interface.h>
+ #endif
+@@ -222,7 +222,6 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
+     long end_fd = safe_get_max_fd();
+     Py_ssize_t num_fds_to_keep = PyTuple_GET_SIZE(py_fds_to_keep);
+     Py_ssize_t keep_seq_idx;
+-    int fd_num;
+     /* As py_fds_to_keep is sorted we can loop through the list closing
+      * fds in between any in the keep list falling within our range. */
+     for (keep_seq_idx = 0; keep_seq_idx < num_fds_to_keep; ++keep_seq_idx) {
+@@ -230,15 +229,11 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
+         int keep_fd = PyLong_AsLong(py_keep_fd);
+         if (keep_fd < start_fd)
+             continue;
+-        for (fd_num = start_fd; fd_num < keep_fd; ++fd_num) {
+-            close(fd_num);
+-        }
++        _Py_closerange(start_fd, keep_fd - 1);
+         start_fd = keep_fd + 1;
+     }
+     if (start_fd <= end_fd) {
+-        for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
+-            close(fd_num);
+-        }
++        _Py_closerange(start_fd, end_fd);
+     }
+ }
+ 
+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
+index 43d4302b92..7878517353 100644
+--- Modules/posixmodule.c
++++ Modules/posixmodule.c
+@@ -7820,6 +7820,78 @@ os_close_impl(PyObject *module, int fd)
+     Py_RETURN_NONE;
+ }
+ 
++/* Our selection logic for which function to use is as follows:
++ * 1. If close_range(2) is available, always prefer that; it's better for
++ *    contiguous ranges like this than fdwalk(3) which entails iterating over
++ *    the entire fd space and simply doing nothing for those outside the range.
++ * 2. If closefrom(2) is available, we'll attempt to use that next if we're
++ *    closing up to sysconf(_SC_OPEN_MAX).
++ * 2a. Fallback to fdwalk(3) if we're not closing up to sysconf(_SC_OPEN_MAX),
++ *    as that will be more performant if the range happens to have any chunk of
++ *    non-opened fd in the middle.
++ * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop.
++ */
++#ifdef __FreeBSD__
++#define USE_CLOSEFROM
++#endif /* __FreeBSD__ */
++
++#ifdef HAVE_FDWALK
++#define USE_FDWALK
++#endif /* HAVE_FDWALK */
++
++#ifdef USE_FDWALK
++static int
++_fdwalk_close_func(void *lohi, int fd)
++{
++    int lo = ((int *)lohi)[0];
++    int hi = ((int *)lohi)[1];
++
++    if (fd >= hi)
++        return 1;
++    else if (fd >= lo)
++        close(fd);
++    return 0;
++}
++#endif /* USE_FDWALK */
++
++/* Closes all file descriptors in [first, last], ignoring errors. */
++void
++_Py_closerange(int first, int last)
++{
++    first = Py_MAX(first, 0);
++    _Py_BEGIN_SUPPRESS_IPH
++#ifdef HAVE_CLOSE_RANGE
++    if (close_range(first, last, 0) == 0 || errno != ENOSYS) {
++        /* Any errors encountered while closing file descriptors are ignored;
++         * ENOSYS means no kernel support, though,
++         * so we'll fallback to the other methods. */
++    }
++    else
++#endif /* HAVE_CLOSE_RANGE */
++#ifdef USE_CLOSEFROM
++    if (last >= sysconf(_SC_OPEN_MAX)) {
++        /* Any errors encountered while closing file descriptors are ignored */
++        closefrom(first);
++    }
++    else
++#endif /* USE_CLOSEFROM */
++#ifdef USE_FDWALK
++    {
++        int lohi[2];
++        lohi[0] = first;
++        lohi[1] = last + 1;
++        fdwalk(_fdwalk_close_func, lohi);
++    }
++#else
++    {
++        for (int i = first; i <= last; i++) {
++            /* Ignore errors */
++            (void)close(i);
++        }
++    }
++#endif /* USE_FDWALK */
++    _Py_END_SUPPRESS_IPH
++}
+ 
+ /*[clinic input]
+ os.closerange
+@@ -7835,12 +7907,8 @@ static PyObject *
+ os_closerange_impl(PyObject *module, int fd_low, int fd_high)
+ /*[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]*/
+ {
+-    int i;
+     Py_BEGIN_ALLOW_THREADS
+-    _Py_BEGIN_SUPPRESS_IPH
+-    for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
+-        close(i);
+-    _Py_END_SUPPRESS_IPH
++    _Py_closerange(fd_low, fd_high - 1);
+     Py_END_ALLOW_THREADS
+     Py_RETURN_NONE;
+ }
+diff --git a/Modules/posixmodule.h b/Modules/posixmodule.h
+index 1ec1833825..be2308ea86 100644
+--- Modules/posixmodule.h
++++ Modules/posixmodule.h
+@@ -19,6 +19,8 @@ PyAPI_FUNC(int) _Py_Gid_Converter(PyObject *, void *);
+ #endif /* MS_WINDOWS */
+ #endif
+ 
++PyAPI_FUNC(void) _Py_closerange(int first, int last);
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff --git a/configure b/configure
+index 829dd69bb8..2eeadec5f0 100755
+--- configure
++++ configure
+@@ -11490,9 +11490,9 @@ fi
+ 
+ # checks for library functions
+ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
+- clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \
+- fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
+- futimens futimes gai_strerror getentropy \
++ clock close_range confstr ctermid dup3 execv faccessat fchmod fchmodat fchown \
++ fchownat fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate \
++ futimesat futimens futimes gai_strerror getentropy \
+  getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
+  getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
+  if_nameindex \
+diff --git a/configure.ac b/configure.ac
+index f1cc8e9bcb..80952290b7 100644
+--- configure.ac
++++ configure.ac
+@@ -3574,9 +3574,9 @@ fi
+ 
+ # checks for library functions
+ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
+- clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \
+- fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
+- futimens futimes gai_strerror getentropy \
++ clock close_range confstr ctermid dup3 execv faccessat fchmod fchmodat fchown \
++ fchownat fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate \
++ futimesat futimens futimes gai_strerror getentropy \
+  getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
+  getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
+  if_nameindex \
+diff --git a/pyconfig.h.in b/pyconfig.h.in
+index ebab5ff518..e1d659059c 100644
+--- pyconfig.h.in
++++ pyconfig.h.in
+@@ -128,6 +128,9 @@
+ /* Define to 1 if you have the `clock_settime' function. */
+ #undef HAVE_CLOCK_SETTIME
+ 
++/* Define to 1 if you have the `close_range' function. */
++#undef HAVE_CLOSE_RANGE
++
+ /* Define if the C compiler supports computed gotos. */
+ #undef HAVE_COMPUTED_GOTOS
+ 
+@@ -324,6 +327,9 @@
+ /* Define to 1 if you have the `fdopendir' function. */
+ #undef HAVE_FDOPENDIR
+ 
++/* Define to 1 if you have the `fdwalk' function. */
++#undef HAVE_FDWALK
++
+ /* Define to 1 if you have the `fexecve' function. */
+ #undef HAVE_FEXECVE
+ 

Property changes on: head/lang/python37/files/patch-issue40422_issue40423
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/lang/python38/Makefile
===================================================================
--- head/lang/python38/Makefile	(revision 552350)
+++ head/lang/python38/Makefile	(revision 552351)
@@ -1,149 +1,150 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
 USES=		cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
 PATHFIX_MAKEFILEIN=	Makefile.pre.in
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
 SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
 SHEBANG_FILES+=	Lib/test/ziptestdata/exe_with_z64 \
 		Lib/test/ziptestdata/exe_with_zip \
 		Lib/test/ziptestdata/header.sh
 
 # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
 PYTHON_VER=		${PYTHON_PORTVERSION:R}
 PYTHON_VERSION=		python${PYTHON_VER}
 PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
 
 DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
 CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
 CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 
 TEST_TARGET=		buildbottest
 TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
 
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 
 SUB_FILES=		pkg-message
 SUB_LIST=		PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			XY=${PYTHON_SUFFIX} \
 			XYDOT=${PYTHON_VER} \
 			XYZDOT=${PORTVERSION} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
 OPTIONS_DEFAULT=	LIBFFI PYMALLOC
 OPTIONS_RADIO=		HASH
 OPTIONS_RADIO_HASH=	FNV SIPHASH
 OPTIONS_SUB=		yes
 
 LIBFFI_DESC=		Use libffi from ports instead of bundled version
 NLS_DESC=		Enable gettext support for the locale module
 PYMALLOC_DESC=		Enable specialized mallocs
 
 HASH_DESC=		Hash Algorithm (PEP-456)
 FNV_DESC=		Modified Fowler-Noll-Vo Algorithm
 SIPHASH_DESC=		SipHash24 Algorithm
 
 FNV_CONFIGURE_ON=	--with-hash-algorithm=fnv
 SIPHASH_CONFIGURE_ON=	--with-hash-algorithm=siphash24
 
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
 LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
 # Upstream Issue: https://bugs.python.org/issue6299
 NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LIBS=		-L${LOCALBASE}/lib -lintl
 NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
 .include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 ABIFLAGS:=	d${ABIFLAGS}
 .endif
 
 .if !empty(ABIFLAGS)
 PLIST_FILES+=	bin/python${PYTHON_VER}${ABIFLAGS} \
 		bin/python${PYTHON_VER}${ABIFLAGS}-config \
 		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc \
 		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc
 .endif
 
 # https://bugs.python.org/issue22521
 # https://bugs.python.org/issue23042
 .if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI}
 BROKEN=		You must use libffi from ports on i386. Enable the LIBFFI option
 .endif
 
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 # See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
 DISABLED_EXTENSIONS+=	nis
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
 post-patch:
 # disable the detection of includes and library from e2fsprogs-libuuid,
 # which introduces hidden dependency and breaks build
 	@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py
 
 post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
 # edit this so that the run time configuration for python matches what the
 # FreeBSD base system provides.  sbruno 02Aug2017
 .if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		./python -E -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py
 
 .include <bsd.port.mk>
Index: head/lang/python38/files/patch-Modules___posixsubprocess.c
===================================================================
--- head/lang/python38/files/patch-Modules___posixsubprocess.c	(revision 552350)
+++ head/lang/python38/files/patch-Modules___posixsubprocess.c	(nonexistent)
@@ -1,25 +0,0 @@
-# Add closefrom(2) support
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
-# https://bugs.python.org/issue38061
-# TODO: Upstream
-
---- Modules/_posixsubprocess.c.orig	2019-10-14 13:34:47 UTC
-+++ Modules/_posixsubprocess.c
-@@ -236,8 +236,15 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_
-         start_fd = keep_fd + 1;
-     }
-     if (start_fd <= end_fd) {
--        for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
--            close(fd_num);
-+#if defined(__FreeBSD__)
-+        if (end_fd >= sysconf(_SC_OPEN_MAX)) {
-+            closefrom(start_fd);
-+        } else
-+#endif
-+        {
-+            for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
-+                close(fd_num);
-+            }
-         }
-     }
- }

Property changes on: head/lang/python38/files/patch-Modules___posixsubprocess.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/python38/files/patch-Modules_posixmodule.c
===================================================================
--- head/lang/python38/files/patch-Modules_posixmodule.c	(revision 552350)
+++ head/lang/python38/files/patch-Modules_posixmodule.c	(nonexistent)
@@ -1,26 +0,0 @@
-# Add closefrom(2) support
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
-# https://bugs.python.org/issue38061
-# TODO: Upstream
-
---- Modules/posixmodule.c.orig	2019-10-14 13:34:47 UTC
-+++ Modules/posixmodule.c
-@@ -8460,8 +8460,16 @@ os_closerange_impl(PyObject *module, int fd_low, int f
-     lohi[1] = fd_high;
-     fdwalk(_fdwalk_close_func, lohi);
- #else
--    for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
--        close(i);
-+    fd_low = Py_MAX(fd_low, 0);
-+#ifdef __FreeBSD__
-+    if (fd_high >= sysconf(_SC_OPEN_MAX)) {
-+        closefrom(fd_low);
-+    } else
-+#endif
-+    {
-+        for (i = fd_low; i < fd_high; i++)
-+            close(i);
-+    }
- #endif
-     _Py_END_SUPPRESS_IPH
-     Py_END_ALLOW_THREADS

Property changes on: head/lang/python38/files/patch-Modules_posixmodule.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/python38/files/patch-issue40422_issue40423
===================================================================
--- head/lang/python38/files/patch-issue40422_issue40423	(nonexistent)
+++ head/lang/python38/files/patch-issue40422_issue40423	(revision 552351)
@@ -0,0 +1,199 @@
+diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
+index e693e53206..a26ef96e91 100644
+--- Modules/_posixsubprocess.c
++++ Modules/_posixsubprocess.c
+@@ -21,6 +21,8 @@
+ #include <dirent.h>
+ #endif
+ 
++#include "posixmodule.h"
++
+ #ifdef _Py_MEMORY_SANITIZER
+ # include <sanitizer/msan_interface.h>
+ #endif
+@@ -222,7 +222,6 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
+     long end_fd = safe_get_max_fd();
+     Py_ssize_t num_fds_to_keep = PyTuple_GET_SIZE(py_fds_to_keep);
+     Py_ssize_t keep_seq_idx;
+-    int fd_num;
+     /* As py_fds_to_keep is sorted we can loop through the list closing
+      * fds in between any in the keep list falling within our range. */
+     for (keep_seq_idx = 0; keep_seq_idx < num_fds_to_keep; ++keep_seq_idx) {
+@@ -230,15 +229,11 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
+         int keep_fd = PyLong_AsLong(py_keep_fd);
+         if (keep_fd < start_fd)
+             continue;
+-        for (fd_num = start_fd; fd_num < keep_fd; ++fd_num) {
+-            close(fd_num);
+-        }
++        _Py_closerange(start_fd, keep_fd - 1);
+         start_fd = keep_fd + 1;
+     }
+     if (start_fd <= end_fd) {
+-        for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
+-            close(fd_num);
+-        }
++        _Py_closerange(start_fd, end_fd);
+     }
+ }
+ 
+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
+index 726e3723f9..7ef2dbc854 100644
+--- Modules/posixmodule.c
++++ Modules/posixmodule.c
+@@ -8555,8 +8555,26 @@ os_close_impl(PyObject *module, int fd)
+     Py_RETURN_NONE;
+ }
+ 
++/* Our selection logic for which function to use is as follows:
++ * 1. If close_range(2) is available, always prefer that; it's better for
++ *    contiguous ranges like this than fdwalk(3) which entails iterating over
++ *    the entire fd space and simply doing nothing for those outside the range.
++ * 2. If closefrom(2) is available, we'll attempt to use that next if we're
++ *    closing up to sysconf(_SC_OPEN_MAX).
++ * 2a. Fallback to fdwalk(3) if we're not closing up to sysconf(_SC_OPEN_MAX),
++ *    as that will be more performant if the range happens to have any chunk of
++ *    non-opened fd in the middle.
++ * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop.
++ */
++#ifdef __FreeBSD__
++#define USE_CLOSEFROM
++#endif /* __FreeBSD__ */
+ 
+ #ifdef HAVE_FDWALK
++#define USE_FDWALK
++#endif /* HAVE_FDWALK */
++
++#ifdef USE_FDWALK
+ static int
+ _fdwalk_close_func(void *lohi, int fd)
+ {
+@@ -8569,7 +8587,46 @@ _fdwalk_close_func(void *lohi, int fd)
+         close(fd);
+     return 0;
+ }
+-#endif /* HAVE_FDWALK */
++#endif /* USE_FDWALK */
++
++/* Closes all file descriptors in [first, last], ignoring errors. */
++void
++_Py_closerange(int first, int last)
++{
++    first = Py_MAX(first, 0);
++    _Py_BEGIN_SUPPRESS_IPH
++#ifdef HAVE_CLOSE_RANGE
++    if (close_range(first, last, 0) == 0 || errno != ENOSYS) {
++        /* Any errors encountered while closing file descriptors are ignored;
++         * ENOSYS means no kernel support, though,
++         * so we'll fallback to the other methods. */
++    }
++    else
++#endif /* HAVE_CLOSE_RANGE */
++#ifdef USE_CLOSEFROM
++    if (last >= sysconf(_SC_OPEN_MAX)) {
++        /* Any errors encountered while closing file descriptors are ignored */
++        closefrom(first);
++    }
++    else
++#endif /* USE_CLOSEFROM */
++#ifdef USE_FDWALK
++    {
++        int lohi[2];
++        lohi[0] = first;
++        lohi[1] = last + 1;
++        fdwalk(_fdwalk_close_func, lohi);
++    }
++#else
++    {
++        for (int i = first; i <= last; i++) {
++            /* Ignore errors */
++            (void)close(i);
++        }
++    }
++#endif /* USE_FDWALK */
++    _Py_END_SUPPRESS_IPH
++}
+ 
+ /*[clinic input]
+ os.closerange
+@@ -8585,22 +8642,8 @@ static PyObject *
+ os_closerange_impl(PyObject *module, int fd_low, int fd_high)
+ /*[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]*/
+ {
+-#ifdef HAVE_FDWALK
+-    int lohi[2];
+-#else
+-    int i;
+-#endif
+     Py_BEGIN_ALLOW_THREADS
+-    _Py_BEGIN_SUPPRESS_IPH
+-#ifdef HAVE_FDWALK
+-    lohi[0] = Py_MAX(fd_low, 0);
+-    lohi[1] = fd_high;
+-    fdwalk(_fdwalk_close_func, lohi);
+-#else
+-    for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
+-        close(i);
+-#endif
+-    _Py_END_SUPPRESS_IPH
++    _Py_closerange(fd_low, fd_high - 1);
+     Py_END_ALLOW_THREADS
+     Py_RETURN_NONE;
+ }
+diff --git a/Modules/posixmodule.h b/Modules/posixmodule.h
+index 1e00562abc..749833f71c 100644
+--- Modules/posixmodule.h
++++ Modules/posixmodule.h
+@@ -28,6 +28,8 @@ PyAPI_FUNC(int) _Py_Sigset_Converter(PyObject *, void *);
+ #endif /* HAVE_SIGSET_T */
+ #endif /* Py_LIMITED_API */
+ 
++PyAPI_FUNC(void) _Py_closerange(int first, int last);
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff --git a/configure b/configure
+index 96dcd0dcd5..90b61f9f8f 100755
+--- configure
++++ configure
+@@ -11503,8 +11503,8 @@ fi
+ 
+ # checks for library functions
+ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
+- clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
+- faccessat fchmod fchmodat fchown fchownat \
++ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \
++ explicit_memset faccessat fchmod fchmodat fchown fchownat \
+  fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
+  futimens futimes gai_strerror getentropy \
+  getgrgid_r getgrnam_r \
+diff --git a/configure.ac b/configure.ac
+index 18a044629a..fbb051d49c 100644
+--- configure.ac
++++ configure.ac
+@@ -3560,8 +3560,8 @@ fi
+ 
+ # checks for library functions
+ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
+- clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
+- faccessat fchmod fchmodat fchown fchownat \
++ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \
++ explicit_memset faccessat fchmod fchmodat fchown fchownat \
+  fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
+  futimens futimes gai_strerror getentropy \
+  getgrgid_r getgrnam_r \
+diff --git a/pyconfig.h.in b/pyconfig.h.in
+index 4263a712c3..166d278f7c 100644
+--- pyconfig.h.in
++++ pyconfig.h.in
+@@ -136,6 +136,9 @@
+ /* Define to 1 if you have the `clock_settime' function. */
+ #undef HAVE_CLOCK_SETTIME
+ 
++/* Define to 1 if you have the `close_range' function. */
++#undef HAVE_CLOSE_RANGE
++
+ /* Define if the C compiler supports computed gotos. */
+ #undef HAVE_COMPUTED_GOTOS
+ 

Property changes on: head/lang/python38/files/patch-issue40422_issue40423
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/lang/python39/Makefile
===================================================================
--- head/lang/python39/Makefile	(revision 552350)
+++ head/lang/python39/Makefile	(revision 552351)
@@ -1,150 +1,151 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
 USES=		compiler:c11 cpe ncurses pathfix pkgconfig readline:port \
 		shebangfix ssl tar:xz
 PATHFIX_MAKEFILEIN=	Makefile.pre.in
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 python_CMD=	${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
 SHEBANG_FILES=	Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
 SHEBANG_FILES+=	Lib/test/ziptestdata/exe_with_z64 \
 		Lib/test/ziptestdata/exe_with_zip \
 		Lib/test/ziptestdata/header.sh
 
 # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
 PYTHON_VER=		${PYTHON_PORTVERSION:R}
 PYTHON_VERSION=		python${PYTHON_VER}
 PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
 
 DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
 CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
 CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 
 TEST_TARGET=		buildbottest
 TEST_ARGS=		TESTOPTS=-j${MAKE_JOBS_NUMBER}
 
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 
 SUB_FILES=		pkg-message
 SUB_LIST=		PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			XY=${PYTHON_SUFFIX} \
 			XYDOT=${PYTHON_VER} \
 			XYZDOT=${PORTVERSION} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
 OPTIONS_DEFAULT=	LIBFFI PYMALLOC
 OPTIONS_RADIO=		HASH
 OPTIONS_RADIO_HASH=	FNV SIPHASH
 OPTIONS_SUB=		yes
 
 LIBFFI_DESC=		Use libffi from ports instead of bundled version
 NLS_DESC=		Enable gettext support for the locale module
 PYMALLOC_DESC=		Enable specialized mallocs
 
 HASH_DESC=		Hash Algorithm (PEP-456)
 FNV_DESC=		Modified Fowler-Noll-Vo Algorithm
 SIPHASH_DESC=		SipHash24 Algorithm
 
 FNV_CONFIGURE_ON=	--with-hash-algorithm=fnv
 SIPHASH_CONFIGURE_ON=	--with-hash-algorithm=siphash24
 
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
 LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
 # Upstream Issue: https://bugs.python.org/issue6299
 NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LIBS=		-L${LOCALBASE}/lib -lintl
 NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
 .include "${.CURDIR}/Makefile.version"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 ABIFLAGS:=	d${ABIFLAGS}
 .endif
 
 .if !empty(ABIFLAGS)
 PLIST_FILES+=	bin/python${PYTHON_VER}${ABIFLAGS} \
 		bin/python${PYTHON_VER}${ABIFLAGS}-config \
 		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc \
 		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc
 .endif
 
 # https://bugs.python.org/issue22521
 # https://bugs.python.org/issue23042
 .if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI}
 BROKEN=		You must use libffi from ports on i386. Enable the LIBFFI option
 .endif
 
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 # See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
 DISABLED_EXTENSIONS+=	nis
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
 post-patch:
 # disable the detection of includes and library from e2fsprogs-libuuid,
 # which introduces hidden dependency and breaks build
 	@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py
 
 post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: https://bugs.python.org/issue17975
 .endif
 # This code block exists for the qemu-user enabled cross build environment.
 # When using this environment in poudriere, CC is not set to the default
 # of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
 # edit this so that the run time configuration for python matches what the
 # FreeBSD base system provides.  sbruno 02Aug2017
 .if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		./python -E -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py
 
 .include <bsd.port.mk>
Index: head/lang/python39/files/patch-issue40422_issue40423
===================================================================
--- head/lang/python39/files/patch-issue40422_issue40423	(nonexistent)
+++ head/lang/python39/files/patch-issue40422_issue40423	(revision 552351)
@@ -0,0 +1,206 @@
+diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
+index 5d1691ace4..ed046fc5c1 100644
+--- Modules/_posixsubprocess.c
++++ Modules/_posixsubprocess.c
+@@ -250,7 +250,6 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
+     long end_fd = safe_get_max_fd();
+     Py_ssize_t num_fds_to_keep = PyTuple_GET_SIZE(py_fds_to_keep);
+     Py_ssize_t keep_seq_idx;
+-    int fd_num;
+     /* As py_fds_to_keep is sorted we can loop through the list closing
+      * fds in between any in the keep list falling within our range. */
+     for (keep_seq_idx = 0; keep_seq_idx < num_fds_to_keep; ++keep_seq_idx) {
+@@ -258,21 +257,11 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep)
+         int keep_fd = PyLong_AsLong(py_keep_fd);
+         if (keep_fd < start_fd)
+             continue;
+-        for (fd_num = start_fd; fd_num < keep_fd; ++fd_num) {
+-            close(fd_num);
+-        }
++        _Py_closerange(start_fd, keep_fd - 1);
+         start_fd = keep_fd + 1;
+     }
+     if (start_fd <= end_fd) {
+-#if defined(__FreeBSD__)
+-        /* Any errors encountered while closing file descriptors are ignored */
+-        closefrom(start_fd);
+-#else
+-        for (fd_num = start_fd; fd_num < end_fd; ++fd_num) {
+-            /* Ignore errors */
+-            (void)close(fd_num);
+-        }
+-#endif
++        _Py_closerange(start_fd, end_fd);
+     }
+ }
+ 
+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
+index 01e8bcbd29..f6aad2e02e 100644
+--- Modules/posixmodule.c
++++ Modules/posixmodule.c
+@@ -8691,8 +8691,26 @@ os_close_impl(PyObject *module, int fd)
+     Py_RETURN_NONE;
+ }
+ 
++/* Our selection logic for which function to use is as follows:
++ * 1. If close_range(2) is available, always prefer that; it's better for
++ *    contiguous ranges like this than fdwalk(3) which entails iterating over
++ *    the entire fd space and simply doing nothing for those outside the range.
++ * 2. If closefrom(2) is available, we'll attempt to use that next if we're
++ *    closing up to sysconf(_SC_OPEN_MAX).
++ * 2a. Fallback to fdwalk(3) if we're not closing up to sysconf(_SC_OPEN_MAX),
++ *    as that will be more performant if the range happens to have any chunk of
++ *    non-opened fd in the middle.
++ * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop.
++ */
++#ifdef __FreeBSD__
++#define USE_CLOSEFROM
++#endif /* __FreeBSD__ */
+ 
+ #ifdef HAVE_FDWALK
++#define USE_FDWALK
++#endif /* HAVE_FDWALK */
++
++#ifdef USE_FDWALK
+ static int
+ _fdwalk_close_func(void *lohi, int fd)
+ {
+@@ -8708,7 +8726,46 @@ _fdwalk_close_func(void *lohi, int fd)
+     }
+     return 0;
+ }
+-#endif /* HAVE_FDWALK */
++#endif /* USE_FDWALK */
++
++/* Closes all file descriptors in [first, last], ignoring errors. */
++void
++_Py_closerange(int first, int last)
++{
++    first = Py_MAX(first, 0);
++    _Py_BEGIN_SUPPRESS_IPH
++#ifdef HAVE_CLOSE_RANGE
++    if (close_range(first, last, 0) == 0 || errno != ENOSYS) {
++        /* Any errors encountered while closing file descriptors are ignored;
++         * ENOSYS means no kernel support, though,
++         * so we'll fallback to the other methods. */
++    }
++    else
++#endif /* HAVE_CLOSE_RANGE */
++#ifdef USE_CLOSEFROM
++    if (last >= sysconf(_SC_OPEN_MAX)) {
++        /* Any errors encountered while closing file descriptors are ignored */
++        closefrom(first);
++    }
++    else
++#endif /* USE_CLOSEFROM */
++#ifdef USE_FDWALK
++    {
++        int lohi[2];
++        lohi[0] = first;
++        lohi[1] = last + 1;
++        fdwalk(_fdwalk_close_func, lohi);
++    }
++#else
++    {
++        for (int i = first; i <= last; i++) {
++            /* Ignore errors */
++            (void)close(i);
++        }
++    }
++#endif /* USE_FDWALK */
++    _Py_END_SUPPRESS_IPH
++}
+ 
+ /*[clinic input]
+ os.closerange
+@@ -8724,32 +8781,8 @@ static PyObject *
+ os_closerange_impl(PyObject *module, int fd_low, int fd_high)
+ /*[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]*/
+ {
+-#ifdef HAVE_FDWALK
+-    int lohi[2];
+-#endif
+     Py_BEGIN_ALLOW_THREADS
+-    _Py_BEGIN_SUPPRESS_IPH
+-#ifdef HAVE_FDWALK
+-    lohi[0] = Py_MAX(fd_low, 0);
+-    lohi[1] = fd_high;
+-    fdwalk(_fdwalk_close_func, lohi);
+-#else
+-    fd_low = Py_MAX(fd_low, 0);
+-#ifdef __FreeBSD__
+-    if (fd_high >= sysconf(_SC_OPEN_MAX)) {
+-        /* Any errors encountered while closing file descriptors are ignored */
+-        closefrom(fd_low);
+-    }
+-    else
+-#endif
+-    {
+-        for (int i = fd_low; i < fd_high; i++) {
+-            /* Ignore errors */
+-            (void)close(i);
+-        }
+-    }
+-#endif
+-    _Py_END_SUPPRESS_IPH
++    _Py_closerange(fd_low, fd_high - 1);
+     Py_END_ALLOW_THREADS
+     Py_RETURN_NONE;
+ }
+diff --git a/Modules/posixmodule.h b/Modules/posixmodule.h
+index 1e00562abc..749833f71c 100644
+--- Modules/posixmodule.h
++++ Modules/posixmodule.h
+@@ -28,6 +28,8 @@ PyAPI_FUNC(int) _Py_Sigset_Converter(PyObject *, void *);
+ #endif /* HAVE_SIGSET_T */
+ #endif /* Py_LIMITED_API */
+ 
++PyAPI_FUNC(void) _Py_closerange(int first, int last);
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff --git a/configure b/configure
+index 9e6fd46583..de517223f6 100755
+--- configure
++++ configure
+@@ -11668,8 +11668,8 @@ fi
+ 
+ # checks for library functions
+ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
+- clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
+- faccessat fchmod fchmodat fchown fchownat \
++ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \
++ explicit_memset faccessat fchmod fchmodat fchown fchownat \
+  fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
+  futimens futimes gai_strerror getentropy \
+  getgrgid_r getgrnam_r \
+diff --git a/configure.ac b/configure.ac
+index d60f05251a..faa187af69 100644
+--- configure.ac
++++ configure.ac
+@@ -3664,8 +3664,8 @@ fi
+ 
+ # checks for library functions
+ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
+- clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
+- faccessat fchmod fchmodat fchown fchownat \
++ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \
++ explicit_memset faccessat fchmod fchmodat fchown fchownat \
+  fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
+  futimens futimes gai_strerror getentropy \
+  getgrgid_r getgrnam_r \
+diff --git a/pyconfig.h.in b/pyconfig.h.in
+index c9589cd102..449b25f551 100644
+--- pyconfig.h.in
++++ pyconfig.h.in
+@@ -136,6 +136,9 @@
+ /* Define to 1 if you have the `clock_settime' function. */
+ #undef HAVE_CLOCK_SETTIME
+ 
++/* Define to 1 if you have the `close_range' function. */
++#undef HAVE_CLOSE_RANGE
++
+ /* Define if the C compiler supports computed gotos. */
+ #undef HAVE_COMPUTED_GOTOS
+ 

Property changes on: head/lang/python39/files/patch-issue40422_issue40423
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property