Sorry. I'll fix it when I get home. That patch needed removing. (or you can fix it if you want).
On Jun 12, 2021, 5:05 PM, at 5:05 PM, Solene Rapenne <[email protected]> wrote: >On Fri, 11 Jun 2021 22:12:05 -0600 (MDT) >Kurt Mosiejczuk <[email protected]>: > >> CVSROOT: /cvs >> Module name: ports >> Changes by: [email protected] 2021/06/11 22:12:05 >> >> Modified files: >> lang/python/3.9: Tag: OPENBSD_6_9 Makefile distinfo >> lang/python/3.9/files: Tag: OPENBSD_6_9 CHANGES.OpenBSD >> lang/python/3.9/patches: Tag: OPENBSD_6_9 patch-Makefile_pre_in >> patch-Modules__hashopenssl_c >> patch-Modules__ssl_c patch-configure_ac >> lang/python/3.9/pkg: Tag: OPENBSD_6_9 PLIST-main PLIST-tests >> >> Log message: >> MFC Python 3.9.5 >> >> Includes multiple security fixes >> > >it doesn't build > >+++ Fri Jun 11 22:39:51 MDT 2021 >===> Patching for Python-3.9.5 >===> 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.1.1 2020/10/05 20:48:10 >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 563. >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.1.1.2.1 2021/06/12 04:12:05 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 674. >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.1.1.1.2.1 2021/06/12 >04:12:05 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 38. >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.1.1.1.2.1 2021/06/12 04:12:05 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 142. >Hunk #2 succeeded at 212. >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:05 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 2855. >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.2 2020/12/28 22:28:14 daniel 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 1043. >Hunk #2 succeeded at 1765. >Hunk #3 succeeded at 1988. >done >===> Failed patches: > patch-Lib_test_test_locale_py > >*** Error 1 in lang/python/3.9 >(/home/ports//infrastructure/mk/bsd.port.mk:2822 >'/build/tmp/pobj//Python-3.9.5/.patch_done': @if cd /home/po...) >*** Error 2 in lang/python/3.9 >(/home/ports//infrastructure/mk/bsd.port.mk:2134 >'/home/packages/amd64/all/python-3.9.5.tgz': @cd /home/ports...) >*** Error 2 in lang/python/3.9 >(/home/ports//infrastructure/mk/bsd.port.mk:2623 '_internal-package': >@case X${_DEPENDS_CACHE} in X) _DEPEND...) >*** Error 2 in lang/python/3.9 >(/home/ports//infrastructure/mk/bsd.port.mk:2602 'package': >@lock=Python-3.9.5; export _LOCKS_HELD=" Python-...) >--- Fri Jun 11 22:39:51 MDT 2021
