On Fri, 11 Jun 2021 22:12:54 -0600 (MDT) Kurt Mosiejczuk <[email protected]>:
> CVSROOT: /cvs > Module name: ports > Changes by: [email protected] 2021/06/11 22:12:54 > > Modified files: > lang/python/3.8: Tag: OPENBSD_6_9 Makefile distinfo > lang/python/3.8/files: Tag: OPENBSD_6_9 CHANGES.OpenBSD > lang/python/3.8/patches: Tag: OPENBSD_6_9 patch-Makefile_pre_in > patch-Modules__hashopenssl_c > patch-Modules__ssl_c patch-configure_ac > patch-setup_py > lang/python/3.8/pkg: Tag: OPENBSD_6_9 PLIST-main PLIST-tests > > Log message: > MFC Python 3.8.10 > > Includes multiple security fixes. > it doesn't build either, it seems the same kind of issue that 3.9 has +++ Fri Jun 11 22:39:46 MDT 2021 ===> Patching for Python-3.8.10 ===> Applying OpenBSD patch patch-Lib_test_test_locale_py Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-Lib_test_test_locale_py,v 1.1 2019/11/07 16:14:09 kmos Exp $ | |http://bugs.python.org/issue25191 | |Index: Lib/test/test_locale.py |--- Lib/test/test_locale.py.orig |+++ Lib/test/test_locale.py -------------------------- Patching file Lib/test/test_locale.py using Plan A... Hunk #1 failed at 564. 1 out of 1 hunks failed--saving rejects to Lib/test/test_locale.py.rej done ***> patch-Lib_test_test_locale_py did not apply cleanly ===> Applying OpenBSD patch patch-Makefile_pre_in Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-Makefile_pre_in,v 1.1.6.1 2021/06/12 04:12:54 kmos Exp $ | |Index: Makefile.pre.in |--- Makefile.pre.in.orig |+++ Makefile.pre.in -------------------------- Patching file Makefile.pre.in using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 646. done ===> Applying OpenBSD patch patch-Modules__hashopenssl_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-Modules__hashopenssl_c,v 1.2.2.1 2021/06/12 04:12:54 kmos Exp $ | |Index: Modules/_hashopenssl.c |--- Modules/_hashopenssl.c.orig |+++ Modules/_hashopenssl.c -------------------------- Patching file Modules/_hashopenssl.c using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 37. done ===> Applying OpenBSD patch patch-Modules__ssl_c Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-Modules__ssl_c,v 1.2.2.1 2021/06/12 04:12:54 kmos Exp $ | |XXX maybe the second hunk can go away now we have auto-init, I'm not sure |exactly what python's lock protects | |Index: Modules/_ssl.c |--- Modules/_ssl.c.orig |+++ Modules/_ssl.c -------------------------- Patching file Modules/_ssl.c using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 144. Hunk #2 succeeded at 214. done ===> Applying OpenBSD patch patch-configure_ac Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-configure_ac,v 1.2.2.1 2021/06/12 04:12:54 kmos Exp $ | |#1: Set ports library version |#2: Don't pick up an installed linux/e2fsprogs libuuid.so | |Index: configure.ac |--- configure.ac.orig |+++ configure.ac -------------------------- Patching file configure.ac using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 126. Hunk #2 succeeded at 2811. done ===> Applying OpenBSD patch patch-setup_py Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$OpenBSD: patch-setup_py,v 1.1.6.1 2021/06/12 04:12:54 kmos Exp $ | |Index: setup.py |--- setup.py.orig |+++ setup.py -------------------------- Patching file setup.py using Plan A... Reversed (or previously applied) patch detected! Assume -R? [y] Hunk #1 succeeded at 942. Hunk #2 succeeded at 1660. Hunk #3 succeeded at 1843. done ===> Failed patches: patch-Lib_test_test_locale_py *** Error 1 in lang/python/3.8 (/home/ports//infrastructure/mk/bsd.port.mk:2822 '/build/tmp/pobj//Python-3.8.10/.patch_done': @if cd /home/p...) *** Error 2 in lang/python/3.8 (/home/ports//infrastructure/mk/bsd.port.mk:2134 '/home/packages/amd64/all/python-3.8.10.tgz': @cd /home/port...) *** Error 2 in lang/python/3.8 (/home/ports//infrastructure/mk/bsd.port.mk:2623 '_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPEND...) *** Error 2 in lang/python/3.8 (/home/ports//infrastructure/mk/bsd.port.mk:2602 'package': @lock=Python-3.8.10; export _LOCKS_HELD=" Python...) --- Fri Jun 11 22:39:46 MDT 2021
