python 3.8.8

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

python 3.8.8

Daniel Dickman
See below for the update to python 3.8.8. I've been running it locally
since RC1 yesterday without any issues, but if someone wants to put into a
bulk that might be useful to double check there isn't any serious fallout.

Tried running the tests on amd64 although there are quite a few failures
and then the test suite gets stuck on something to do with asyncio (none
of this is new behaviour).

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.8/Makefile,v
retrieving revision 1.12
diff -u -p -u -r1.12 Makefile
--- Makefile 16 Feb 2021 18:49:49 -0000 1.12
+++ Makefile 20 Feb 2021 00:41:26 -0000
@@ -6,10 +6,9 @@
 # Python itself.
 
 VERSION = 3.8
-PATCHLEVEL = .7
+PATCHLEVEL = .8
 SHARED_LIBS = python3.8 0.0
 VERSION_SPEC = >=3.8,<3.9
-REVISION = 0
 
 CONFIGURE_ARGS += --with-ensurepip=no
 CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.8/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 4 Jan 2021 14:04:42 -0000 1.7
+++ distinfo 20 Feb 2021 00:41:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.8.7.tgz) = IOWgQmLwry65wZJA1+w2jzhXiLui2N+6fnSyC6tNK6w=
-SIZE (Python-3.8.7.tgz) = 24468684
+SHA256 (Python-3.8.8.tgz) = dsB2PwSOT5uGHSTadrfdXHo7p+wIb0DK7e6jWSYydvc=
+SIZE (Python-3.8.8.tgz) = 24483485
Index: files/CHANGES.OpenBSD
===================================================================
RCS file: /cvs/ports/lang/python/3.8/files/CHANGES.OpenBSD,v
retrieving revision 1.2
diff -u -p -u -r1.2 CHANGES.OpenBSD
--- files/CHANGES.OpenBSD 16 Feb 2021 18:49:49 -0000 1.2
+++ files/CHANGES.OpenBSD 20 Feb 2021 00:41:26 -0000
@@ -14,7 +14,5 @@ http://bugs.python.org/issue25191
 4.  Disable libuuid, otherwise Python prefers it over the libc uuid
 functions.
 
-5.  Applied a patch for CVE-2021-3177
-
 These changes are available in the OpenBSD CVS repository
 <http://www.openbsd.org/anoncvs.html> in ports/lang/python/3.8.
Index: patches/patch-2021-01-18-09-27-31_bpo-42938_4Zn4Mp_rst
===================================================================
RCS file: patches/patch-2021-01-18-09-27-31_bpo-42938_4Zn4Mp_rst
diff -N patches/patch-2021-01-18-09-27-31_bpo-42938_4Zn4Mp_rst
--- patches/patch-2021-01-18-09-27-31_bpo-42938_4Zn4Mp_rst 16 Feb 2021 18:49:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-2021-01-18-09-27-31_bpo-42938_4Zn4Mp_rst,v 1.1 2021/02/16 18:49:49 tb Exp $
-
-CVE-2021-3177
-https://github.com/python/cpython/pull/24239
-
-Index: 2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
---- 2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst.orig
-+++ 2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
-@@ -0,0 +1,2 @@
-+Avoid static buffers when computing the repr of :class:`ctypes.c_double` and
-+:class:`ctypes.c_longdouble` values.
Index: patches/patch-Lib_ctypes_test_test_parameters_py
===================================================================
RCS file: patches/patch-Lib_ctypes_test_test_parameters_py
diff -N patches/patch-Lib_ctypes_test_test_parameters_py
--- patches/patch-Lib_ctypes_test_test_parameters_py 16 Feb 2021 18:49:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-Lib_ctypes_test_test_parameters_py,v 1.1 2021/02/16 18:49:49 tb Exp $
-
-CVE-2021-3177
-https://github.com/python/cpython/pull/24239
-
-Index: Lib/ctypes/test/test_parameters.py
---- Lib/ctypes/test/test_parameters.py.orig
-+++ Lib/ctypes/test/test_parameters.py
-@@ -201,6 +201,49 @@ class SimpleTypesTestCase(unittest.TestCase):
-         with self.assertRaises(ZeroDivisionError):
-             WorseStruct().__setstate__({}, b'foo')
-
-+    def test_parameter_repr(self):
-+        from ctypes import (
-+            c_bool,
-+            c_char,
-+            c_wchar,
-+            c_byte,
-+            c_ubyte,
-+            c_short,
-+            c_ushort,
-+            c_int,
-+            c_uint,
-+            c_long,
-+            c_ulong,
-+            c_longlong,
-+            c_ulonglong,
-+            c_float,
-+            c_double,
-+            c_longdouble,
-+            c_char_p,
-+            c_wchar_p,
-+            c_void_p,
-+        )
-+        self.assertRegex(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$")
-+        self.assertEqual(repr(c_char.from_param(97)), "<cparam 'c' ('a')>")
-+        self.assertRegex(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$")
-+        self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>")
-+        self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>")
-+        self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>")
-+        self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>")
-+        self.assertRegex(repr(c_int.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
-+        self.assertRegex(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
-+        self.assertRegex(repr(c_long.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
-+        self.assertRegex(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
-+        self.assertRegex(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' \(20000\)>$")
-+        self.assertRegex(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' \(20000\)>$")
-+        self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>")
-+        self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>")
-+        self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>")
-+        self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' \(1.5\)|'g' at 0x[A-Fa-f0-9]+)>$")
-+        self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' \(0x[A-Fa-f0-9]+\)>$")
-+        self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' \(0x[A-Fa-f0-9]+\)>$")
-+        self.assertRegex(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' \(0x0*12\)>$")
-+
- ################################################################
-
- if __name__ == '__main__':
Index: patches/patch-Modules__ctypes_callproc_c
===================================================================
RCS file: patches/patch-Modules__ctypes_callproc_c
diff -N patches/patch-Modules__ctypes_callproc_c
--- patches/patch-Modules__ctypes_callproc_c 16 Feb 2021 18:49:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,109 +0,0 @@
-$OpenBSD: patch-Modules__ctypes_callproc_c,v 1.1 2021/02/16 18:49:49 tb Exp $
-
-CVE-2021-3177
-https://github.com/python/cpython/pull/24239
-
-Index: Modules/_ctypes/callproc.c
---- Modules/_ctypes/callproc.c.orig
-+++ Modules/_ctypes/callproc.c
-@@ -484,58 +484,47 @@ is_literal_char(unsigned char c)
- static PyObject *
- PyCArg_repr(PyCArgObject *self)
- {
--    char buffer[256];
-     switch(self->tag) {
-     case 'b':
-     case 'B':
--        sprintf(buffer, "<cparam '%c' (%d)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
-             self->tag, self->value.b);
--        break;
-     case 'h':
-     case 'H':
--        sprintf(buffer, "<cparam '%c' (%d)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
-             self->tag, self->value.h);
--        break;
-     case 'i':
-     case 'I':
--        sprintf(buffer, "<cparam '%c' (%d)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
-             self->tag, self->value.i);
--        break;
-     case 'l':
-     case 'L':
--        sprintf(buffer, "<cparam '%c' (%ld)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%ld)>",
-             self->tag, self->value.l);
--        break;
-
-     case 'q':
-     case 'Q':
--        sprintf(buffer,
--#ifdef MS_WIN32
--            "<cparam '%c' (%I64d)>",
--#else
--            "<cparam '%c' (%lld)>",
--#endif
-+        return PyUnicode_FromFormat("<cparam '%c' (%lld)>",
-             self->tag, self->value.q);
--        break;
-     case 'd':
--        sprintf(buffer, "<cparam '%c' (%f)>",
--            self->tag, self->value.d);
--        break;
--    case 'f':
--        sprintf(buffer, "<cparam '%c' (%f)>",
--            self->tag, self->value.f);
--        break;
--
-+    case 'f': {
-+        PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d);
-+        if (f == NULL) {
-+            return NULL;
-+        }
-+        PyObject *result = PyUnicode_FromFormat("<cparam '%c' (%R)>", self->tag, f);
-+        Py_DECREF(f);
-+        return result;
-+    }
-     case 'c':
-         if (is_literal_char((unsigned char)self->value.c)) {
--            sprintf(buffer, "<cparam '%c' ('%c')>",
-+            return PyUnicode_FromFormat("<cparam '%c' ('%c')>",
-                 self->tag, self->value.c);
-         }
-         else {
--            sprintf(buffer, "<cparam '%c' ('\\x%02x')>",
-+            return PyUnicode_FromFormat("<cparam '%c' ('\\x%02x')>",
-                 self->tag, (unsigned char)self->value.c);
-         }
--        break;
-
- /* Hm, are these 'z' and 'Z' codes useful at all?
-    Shouldn't they be replaced by the functionality of c_string
-@@ -544,22 +533,20 @@ PyCArg_repr(PyCArgObject *self)
-     case 'z':
-     case 'Z':
-     case 'P':
--        sprintf(buffer, "<cparam '%c' (%p)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%p)>",
-             self->tag, self->value.p);
-         break;
-
-     default:
-         if (is_literal_char((unsigned char)self->tag)) {
--            sprintf(buffer, "<cparam '%c' at %p>",
-+            return PyUnicode_FromFormat("<cparam '%c' at %p>",
-                 (unsigned char)self->tag, (void *)self);
-         }
-         else {
--            sprintf(buffer, "<cparam 0x%02x at %p>",
-+            return PyUnicode_FromFormat("<cparam 0x%02x at %p>",
-                 (unsigned char)self->tag, (void *)self);
-         }
--        break;
-     }
--    return PyUnicode_FromString(buffer);
- }
-
- static PyMemberDef PyCArgType_members[] = {
Index: pkg/PLIST-idle
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-idle,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST-idle
--- pkg/PLIST-idle 29 Dec 2020 23:59:06 -0000 1.6
+++ pkg/PLIST-idle 20 Feb 2021 00:41:26 -0000
@@ -440,6 +440,9 @@ lib/python3.8/idlelib/idle_test/__pycach
 lib/python3.8/idlelib/idle_test/__pycache__/test_zoomheight.cpython-38.opt-1.pyc
 lib/python3.8/idlelib/idle_test/__pycache__/test_zoomheight.cpython-38.opt-2.pyc
 lib/python3.8/idlelib/idle_test/__pycache__/test_zoomheight.cpython-38.pyc
+lib/python3.8/idlelib/idle_test/__pycache__/test_zzdummy.cpython-38.opt-1.pyc
+lib/python3.8/idlelib/idle_test/__pycache__/test_zzdummy.cpython-38.opt-2.pyc
+lib/python3.8/idlelib/idle_test/__pycache__/test_zzdummy.cpython-38.pyc
 lib/python3.8/idlelib/idle_test/htest.py
 lib/python3.8/idlelib/idle_test/mock_idle.py
 lib/python3.8/idlelib/idle_test/mock_tk.py
@@ -501,6 +504,7 @@ lib/python3.8/idlelib/idle_test/test_und
 lib/python3.8/idlelib/idle_test/test_warning.py
 lib/python3.8/idlelib/idle_test/test_window.py
 lib/python3.8/idlelib/idle_test/test_zoomheight.py
+lib/python3.8/idlelib/idle_test/test_zzdummy.py
 lib/python3.8/idlelib/iomenu.py
 lib/python3.8/idlelib/macosx.py
 lib/python3.8/idlelib/mainmenu.py
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -u -r1.12 PLIST-main
--- pkg/PLIST-main 4 Jan 2021 14:04:42 -0000 1.12
+++ pkg/PLIST-main 20 Feb 2021 00:41:27 -0000
@@ -2023,9 +2023,9 @@ lib/python3.8/lib-dynload/
 @so lib/python3.8/lib-dynload/zlib.cpython-38.so
 lib/python3.8/lib2to3/
 lib/python3.8/lib2to3/Grammar.txt
-lib/python3.8/lib2to3/Grammar3.8.7.final.0.pickle
+lib/python3.8/lib2to3/Grammar3.8.8.final.0.pickle
 lib/python3.8/lib2to3/PatternGrammar.txt
-lib/python3.8/lib2to3/PatternGrammar3.8.7.final.0.pickle
+lib/python3.8/lib2to3/PatternGrammar3.8.8.final.0.pickle
 lib/python3.8/lib2to3/__init__.py
 lib/python3.8/lib2to3/__main__.py
 lib/python3.8/lib2to3/__pycache__/
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-tests,v
retrieving revision 1.7
diff -u -p -u -r1.7 PLIST-tests
--- pkg/PLIST-tests 4 Jan 2021 14:04:42 -0000 1.7
+++ pkg/PLIST-tests 20 Feb 2021 00:41:27 -0000
@@ -3866,6 +3866,9 @@ lib/python3.8/tkinter/test/test_tkinter/
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/__init__.cpython-38.opt-1.pyc
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/__init__.cpython-38.opt-2.pyc
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/__init__.cpython-38.pyc
+lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_colorchooser.cpython-38.opt-1.pyc
+lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_colorchooser.cpython-38.opt-2.pyc
+lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_colorchooser.cpython-38.pyc
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_font.cpython-38.opt-1.pyc
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_font.cpython-38.opt-2.pyc
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_font.cpython-38.pyc
@@ -3893,6 +3896,7 @@ lib/python3.8/tkinter/test/test_tkinter/
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_widgets.cpython-38.opt-1.pyc
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_widgets.cpython-38.opt-2.pyc
 lib/python3.8/tkinter/test/test_tkinter/__pycache__/test_widgets.cpython-38.pyc
+lib/python3.8/tkinter/test/test_tkinter/test_colorchooser.py
 lib/python3.8/tkinter/test/test_tkinter/test_font.py
 lib/python3.8/tkinter/test/test_tkinter/test_geometry_managers.py
 lib/python3.8/tkinter/test/test_tkinter/test_images.py