A handful of security fixes and various other fixes.
https://docs.python.org/release/3.9.7/whatsnew/changelog.html#changelog
Tests pass as before
Patches regenerated
ok?
(cc maintainer)
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 18 Aug 2021 19:08:05 -0000 1.8
+++ Makefile 31 Aug 2021 04:14:20 -0000
@@ -6,12 +6,11 @@
# Python itself.
VERSION = 3.9
-PATCHLEVEL = .6
+PATCHLEVEL = .7
SHARED_LIBS = python3.9 0.0
VERSION_SPEC = >=3.9,<3.10
#PSUBDIR = python/3.9.0
-REVISION-main = 0
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 15 Jul 2021 13:45:06 -0000 1.5
+++ distinfo 31 Aug 2021 04:14:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.6.tgz) = 0KNRguGeQW/I6uJaPc1NAtSZczPkrR8u7mAQqtw/6GY=
-SIZE (Python-3.9.6.tgz) = 25640094
+SHA256 (Python-3.9.7.tgz) = qDjT+TYNFXBAFCtxXbNPAhjlNTM2lqVWncb4VGBOudE=
+SIZE (Python-3.9.7.tgz) = 25755357
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 12 Jun 2021 04:00:22 -0000 1.3
+++ patches/patch-configure_ac 31 Aug 2021 04:14:20 -0000
@@ -15,7 +15,7 @@ Index: configure.ac
# The later defininition of _XOPEN_SOURCE disables certain features
# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -2855,18 +2855,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for
SunOS/S
+@@ -2858,18 +2858,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for
SunOS/S
AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
# checks for uuid.h location
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 28 Dec 2020 22:28:14 -0000 1.2
+++ patches/patch-setup_py 31 Aug 2021 04:14:20 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.2 2020/12/2
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -1043,6 +1043,8 @@ class PyBuildExt(build_ext):
+@@ -1046,6 +1046,8 @@ class PyBuildExt(build_ext):
'termcap'):
readline_libs.append('termcap')
self.add(Extension('readline', ['readline.c'],
@@ -12,7 +12,7 @@ Index: setup.py
library_dirs=['/usr/lib/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs))
-@@ -1765,7 +1767,7 @@ class PyBuildExt(build_ext):
+@@ -1770,7 +1772,7 @@ class PyBuildExt(build_ext):
# Build the _uuid module if possible
uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
if uuid_incs is not None:
@@ -21,7 +21,7 @@ Index: setup.py
uuid_libs = ['uuid']
else:
uuid_libs = []
-@@ -1988,8 +1990,7 @@ class PyBuildExt(build_ext):
+@@ -1993,8 +1995,7 @@ class PyBuildExt(build_ext):
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main 30 Jul 2021 20:04:55 -0000 1.8
+++ pkg/PLIST-main 31 Aug 2021 04:14:20 -0000
@@ -1853,8 +1853,8 @@ lib/python3.9/ensurepip/_bundled/__pycac
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-1.pyc
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-2.pyc
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.pyc
-lib/python3.9/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
-lib/python3.9/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
lib/python3.9/ensurepip/_uninstall.py
lib/python3.9/enum.py
lib/python3.9/filecmp.py
@@ -2053,9 +2053,9 @@ lib/python3.9/lib-dynload/
@so lib/python3.9/lib-dynload/zlib.cpython-39.so
lib/python3.9/lib2to3/
lib/python3.9/lib2to3/Grammar.txt
-lib/python3.9/lib2to3/Grammar3.9.6.final.0.pickle
+lib/python3.9/lib2to3/Grammar3.9.7.final.0.pickle
lib/python3.9/lib2to3/PatternGrammar.txt
-lib/python3.9/lib2to3/PatternGrammar3.9.6.final.0.pickle
+lib/python3.9/lib2to3/PatternGrammar3.9.7.final.0.pickle
lib/python3.9/lib2to3/__init__.py
lib/python3.9/lib2to3/__main__.py
lib/python3.9/lib2to3/__pycache__/
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-tests,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-tests
--- pkg/PLIST-tests 12 Jun 2021 04:00:22 -0000 1.4
+++ pkg/PLIST-tests 31 Aug 2021 04:14:21 -0000
@@ -519,6 +519,9 @@ lib/python3.9/test/__pycache__/__main__.
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.opt-1.pyc
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.opt-1.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.opt-2.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.opt-1.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.pyc
@@ -1963,6 +1966,7 @@ lib/python3.9/test/__pycache__/xmltests.
lib/python3.9/test/__pycache__/xmltests.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/xmltests.cpython-39.pyc
lib/python3.9/test/_test_multiprocessing.py
+lib/python3.9/test/_typed_dict_helper.py
lib/python3.9/test/allsans.pem
lib/python3.9/test/ann_module.py
lib/python3.9/test/ann_module2.py
@@ -2444,12 +2448,16 @@ lib/python3.9/test/support/__pycache__/s
lib/python3.9/test/support/__pycache__/testresult.cpython-39.opt-1.pyc
lib/python3.9/test/support/__pycache__/testresult.cpython-39.opt-2.pyc
lib/python3.9/test/support/__pycache__/testresult.cpython-39.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.opt-1.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.opt-2.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.pyc
lib/python3.9/test/support/bytecode_helper.py
lib/python3.9/test/support/hashlib_helper.py
lib/python3.9/test/support/logging_helper.py
lib/python3.9/test/support/script_helper.py
lib/python3.9/test/support/socket_helper.py
lib/python3.9/test/support/testresult.py
+lib/python3.9/test/support/warnings_helper.py
lib/python3.9/test/talos-2019-0758.pem
lib/python3.9/test/test___all__.py
lib/python3.9/test/test___future__.py
