On 2023/08/30 09:53, Theo Buehler wrote: > Security release from a week back. While the world keeps on turning, > it is somewhat nasty and should therefore be backported to stable.
ok with me. > The other branches are also affected. No diff because I had some PLIST > issues. The non-default (3.9, 3.11) versions of python use "ensurepip" so that users of those versions still have a way to install modules from pypi. (Some alternatives are: - add infrastructure so devel/py-pip can build with those versions - remove "ensurepip" though this means those versions are not really much use any more - get rid of those versions completely - which certainly does have some appeal as we could move to lang/python/3 and avoid horrible mess for switching default from 3.x to 3.x+1 - though I realise that may be a pain for making sure libressl works with newer Python major releases... ...but I digress) Unfortunately, if you already have the relevant package installed (python-3.9.* for python/3.9), the "ensurepip" part of the build sees the existing files in /usr/local so doesn't install pip under PREFIX. To avoid this, deinstall the package before building. This shouldn't be too painful because nothing should depend on it. But, to cut a long story short, there's no PLIST change for 3.9.17->18. pkg/PLIST* diff for 3.11 below. Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-main,v retrieving revision 1.5 diff -u -p -r1.5 PLIST-main --- pkg/PLIST-main 19 Jun 2023 19:48:11 -0000 1.5 +++ pkg/PLIST-main 30 Aug 2023 10:36:28 -0000 @@ -1879,7 +1879,7 @@ lib/python3.11/ensurepip/__pycache__/_un lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.opt-2.pyc lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.pyc lib/python3.11/ensurepip/_bundled/ -lib/python3.11/ensurepip/_bundled/pip-23.1.2-py3-none-any.whl +lib/python3.11/ensurepip/_bundled/pip-23.2.1-py3-none-any.whl lib/python3.11/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl lib/python3.11/ensurepip/_uninstall.py lib/python3.11/enum.py @@ -2642,16 +2642,16 @@ lib/python3.11/site-packages/_distutils_ lib/python3.11/site-packages/_distutils_hack/override.py lib/python3.11/site-packages/distutils-precedence.pth lib/python3.11/site-packages/pip/ -lib/python3.11/site-packages/pip-23.1.2.dist-info/ -lib/python3.11/site-packages/pip-23.1.2.dist-info/AUTHORS.txt -lib/python3.11/site-packages/pip-23.1.2.dist-info/INSTALLER -lib/python3.11/site-packages/pip-23.1.2.dist-info/LICENSE.txt -lib/python3.11/site-packages/pip-23.1.2.dist-info/METADATA -lib/python3.11/site-packages/pip-23.1.2.dist-info/RECORD -lib/python3.11/site-packages/pip-23.1.2.dist-info/REQUESTED -lib/python3.11/site-packages/pip-23.1.2.dist-info/WHEEL -lib/python3.11/site-packages/pip-23.1.2.dist-info/entry_points.txt -lib/python3.11/site-packages/pip-23.1.2.dist-info/top_level.txt +lib/python3.11/site-packages/pip-23.2.1.dist-info/ +lib/python3.11/site-packages/pip-23.2.1.dist-info/AUTHORS.txt +lib/python3.11/site-packages/pip-23.2.1.dist-info/INSTALLER +lib/python3.11/site-packages/pip-23.2.1.dist-info/LICENSE.txt +lib/python3.11/site-packages/pip-23.2.1.dist-info/METADATA +lib/python3.11/site-packages/pip-23.2.1.dist-info/RECORD +lib/python3.11/site-packages/pip-23.2.1.dist-info/REQUESTED +lib/python3.11/site-packages/pip-23.2.1.dist-info/WHEEL +lib/python3.11/site-packages/pip-23.2.1.dist-info/entry_points.txt +lib/python3.11/site-packages/pip-23.2.1.dist-info/top_level.txt lib/python3.11/site-packages/pip/__init__.py lib/python3.11/site-packages/pip/__main__.py lib/python3.11/site-packages/pip/__pip-runner__.py @@ -3693,7 +3693,9 @@ lib/python3.11/site-packages/pip/_vendor lib/python3.11/site-packages/pip/_vendor/urllib3/packages/backports/__pycache__/ lib/python3.11/site-packages/pip/_vendor/urllib3/packages/backports/__pycache__/__init__.cpython-311.pyc lib/python3.11/site-packages/pip/_vendor/urllib3/packages/backports/__pycache__/makefile.cpython-311.pyc +lib/python3.11/site-packages/pip/_vendor/urllib3/packages/backports/__pycache__/weakref_finalize.cpython-311.pyc lib/python3.11/site-packages/pip/_vendor/urllib3/packages/backports/makefile.py +lib/python3.11/site-packages/pip/_vendor/urllib3/packages/backports/weakref_finalize.py lib/python3.11/site-packages/pip/_vendor/urllib3/packages/six.py lib/python3.11/site-packages/pip/_vendor/urllib3/poolmanager.py lib/python3.11/site-packages/pip/_vendor/urllib3/request.py Index: pkg/PLIST-tests =================================================================== RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-tests,v retrieving revision 1.4 diff -u -p -r1.4 PLIST-tests --- pkg/PLIST-tests 19 Jun 2023 19:48:11 -0000 1.4 +++ pkg/PLIST-tests 30 Aug 2023 10:36:28 -0000 @@ -535,15 +535,6 @@ lib/python3.11/test/__pycache__/audit-te lib/python3.11/test/__pycache__/autotest.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/autotest.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/autotest.cpython-311.pyc -lib/python3.11/test/__pycache__/bad_getattr.cpython-311.opt-1.pyc -lib/python3.11/test/__pycache__/bad_getattr.cpython-311.opt-2.pyc -lib/python3.11/test/__pycache__/bad_getattr.cpython-311.pyc -lib/python3.11/test/__pycache__/bad_getattr2.cpython-311.opt-1.pyc -lib/python3.11/test/__pycache__/bad_getattr2.cpython-311.opt-2.pyc -lib/python3.11/test/__pycache__/bad_getattr2.cpython-311.pyc -lib/python3.11/test/__pycache__/bad_getattr3.cpython-311.opt-1.pyc -lib/python3.11/test/__pycache__/bad_getattr3.cpython-311.opt-2.pyc -lib/python3.11/test/__pycache__/bad_getattr3.cpython-311.pyc lib/python3.11/test/__pycache__/bisect_cmd.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/bisect_cmd.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/bisect_cmd.cpython-311.pyc @@ -601,9 +592,6 @@ lib/python3.11/test/__pycache__/future_t lib/python3.11/test/__pycache__/gdb_sample.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/gdb_sample.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/gdb_sample.cpython-311.pyc -lib/python3.11/test/__pycache__/good_getattr.cpython-311.opt-1.pyc -lib/python3.11/test/__pycache__/good_getattr.cpython-311.opt-2.pyc -lib/python3.11/test/__pycache__/good_getattr.cpython-311.pyc lib/python3.11/test/__pycache__/imp_dummy.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/imp_dummy.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/imp_dummy.cpython-311.pyc @@ -694,9 +682,6 @@ lib/python3.11/test/__pycache__/sample_d lib/python3.11/test/__pycache__/seq_tests.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/seq_tests.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/seq_tests.cpython-311.pyc -lib/python3.11/test/__pycache__/setup_testcppext.cpython-311.opt-1.pyc -lib/python3.11/test/__pycache__/setup_testcppext.cpython-311.opt-2.pyc -lib/python3.11/test/__pycache__/setup_testcppext.cpython-311.pyc lib/python3.11/test/__pycache__/signalinterproctester.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/signalinterproctester.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/signalinterproctester.cpython-311.pyc @@ -946,9 +931,6 @@ lib/python3.11/test/__pycache__/test_cop lib/python3.11/test/__pycache__/test_coroutines.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/test_coroutines.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/test_coroutines.cpython-311.pyc -lib/python3.11/test/__pycache__/test_cppext.cpython-311.opt-1.pyc -lib/python3.11/test/__pycache__/test_cppext.cpython-311.opt-2.pyc -lib/python3.11/test/__pycache__/test_cppext.cpython-311.pyc lib/python3.11/test/__pycache__/test_cprofile.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/test_cprofile.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/test_cprofile.cpython-311.pyc @@ -1369,9 +1351,6 @@ lib/python3.11/test/__pycache__/test_min lib/python3.11/test/__pycache__/test_mmap.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/test_mmap.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/test_mmap.cpython-311.pyc -lib/python3.11/test/__pycache__/test_module.cpython-311.opt-1.pyc -lib/python3.11/test/__pycache__/test_module.cpython-311.opt-2.pyc -lib/python3.11/test/__pycache__/test_module.cpython-311.pyc lib/python3.11/test/__pycache__/test_modulefinder.cpython-311.opt-1.pyc lib/python3.11/test/__pycache__/test_modulefinder.cpython-311.opt-2.pyc lib/python3.11/test/__pycache__/test_modulefinder.cpython-311.pyc @@ -1999,7 +1978,6 @@ lib/python3.11/test/_test_embed_set_conf lib/python3.11/test/_test_embed_structseq.py lib/python3.11/test/_test_multiprocessing.py lib/python3.11/test/_test_venv_multiprocessing.py -lib/python3.11/test/_testcppext.cpp lib/python3.11/test/_typed_dict_helper.py lib/python3.11/test/allsans.pem lib/python3.11/test/ann_module.py @@ -2032,9 +2010,6 @@ lib/python3.11/test/audit-tests.py lib/python3.11/test/autotest.py lib/python3.11/test/bad_coding.py lib/python3.11/test/bad_coding2.py -lib/python3.11/test/bad_getattr.py -lib/python3.11/test/bad_getattr2.py -lib/python3.11/test/bad_getattr3.py lib/python3.11/test/badcert.pem lib/python3.11/test/badkey.pem lib/python3.11/test/badsyntax_3131.py @@ -2089,7 +2064,7 @@ lib/python3.11/test/cjkencodings/shift_j lib/python3.11/test/cjkencodings/shift_jis.txt lib/python3.11/test/cjkencodings/shift_jisx0213-utf8.txt lib/python3.11/test/cjkencodings/shift_jisx0213.txt -lib/python3.11/test/clinic.test +lib/python3.11/test/clinic.test.c lib/python3.11/test/cmath_testcases.txt lib/python3.11/test/coding20731.py lib/python3.11/test/crashers/ @@ -2335,7 +2310,6 @@ lib/python3.11/test/formatfloat_testcase lib/python3.11/test/future_test1.py lib/python3.11/test/future_test2.py lib/python3.11/test/gdb_sample.py -lib/python3.11/test/good_getattr.py lib/python3.11/test/idnsans.pem lib/python3.11/test/ieee754.txt lib/python3.11/test/imghdrdata/ @@ -2467,7 +2441,6 @@ lib/python3.11/test/sample_doctest_no_do lib/python3.11/test/secp384r1.pem lib/python3.11/test/selfsigned_pythontestdotnet.pem lib/python3.11/test/seq_tests.py -lib/python3.11/test/setup_testcppext.py lib/python3.11/test/sgml_input.html lib/python3.11/test/signalinterproctester.py lib/python3.11/test/sndhdrdata/ @@ -2753,6 +2726,9 @@ lib/python3.11/test/test_capi/__pycache_ lib/python3.11/test/test_capi/__pycache__/__main__.cpython-311.opt-1.pyc lib/python3.11/test/test_capi/__pycache__/__main__.cpython-311.opt-2.pyc lib/python3.11/test/test_capi/__pycache__/__main__.cpython-311.pyc +lib/python3.11/test/test_capi/__pycache__/test_codecs.cpython-311.opt-1.pyc +lib/python3.11/test/test_capi/__pycache__/test_codecs.cpython-311.opt-2.pyc +lib/python3.11/test/test_capi/__pycache__/test_codecs.cpython-311.pyc lib/python3.11/test/test_capi/__pycache__/test_eval_code_ex.cpython-311.opt-1.pyc lib/python3.11/test/test_capi/__pycache__/test_eval_code_ex.cpython-311.opt-2.pyc lib/python3.11/test/test_capi/__pycache__/test_eval_code_ex.cpython-311.pyc @@ -2768,6 +2744,7 @@ lib/python3.11/test/test_capi/__pycache_ lib/python3.11/test/test_capi/__pycache__/test_unicode.cpython-311.opt-1.pyc lib/python3.11/test/test_capi/__pycache__/test_unicode.cpython-311.opt-2.pyc lib/python3.11/test/test_capi/__pycache__/test_unicode.cpython-311.pyc +lib/python3.11/test/test_capi/test_codecs.py lib/python3.11/test/test_capi/test_eval_code_ex.py lib/python3.11/test/test_capi/test_getargs.py lib/python3.11/test/test_capi/test_misc.py @@ -2814,7 +2791,17 @@ lib/python3.11/test/test_contextlib_asyn lib/python3.11/test/test_copy.py lib/python3.11/test/test_copyreg.py lib/python3.11/test/test_coroutines.py -lib/python3.11/test/test_cppext.py +lib/python3.11/test/test_cppext/ +lib/python3.11/test/test_cppext/__init__.py +lib/python3.11/test/test_cppext/__pycache__/ +lib/python3.11/test/test_cppext/__pycache__/__init__.cpython-311.opt-1.pyc +lib/python3.11/test/test_cppext/__pycache__/__init__.cpython-311.opt-2.pyc +lib/python3.11/test/test_cppext/__pycache__/__init__.cpython-311.pyc +lib/python3.11/test/test_cppext/__pycache__/setup.cpython-311.opt-1.pyc +lib/python3.11/test/test_cppext/__pycache__/setup.cpython-311.opt-2.pyc +lib/python3.11/test/test_cppext/__pycache__/setup.cpython-311.pyc +lib/python3.11/test/test_cppext/extension.cpp +lib/python3.11/test/test_cppext/setup.py lib/python3.11/test/test_cprofile.py lib/python3.11/test/test_crashers.py lib/python3.11/test/test_crypt.py @@ -2956,6 +2943,7 @@ lib/python3.11/test/test_email/data/msg_ lib/python3.11/test/test_email/data/msg_44.txt lib/python3.11/test/test_email/data/msg_45.txt lib/python3.11/test/test_email/data/msg_46.txt +lib/python3.11/test/test_email/data/msg_47.txt lib/python3.11/test/test_email/data/python.bmp lib/python3.11/test/test_email/data/python.exr lib/python3.11/test/test_email/data/python.gif @@ -3725,7 +3713,28 @@ lib/python3.11/test/test_metaclass.py lib/python3.11/test/test_mimetypes.py lib/python3.11/test/test_minidom.py lib/python3.11/test/test_mmap.py -lib/python3.11/test/test_module.py +lib/python3.11/test/test_module/ +lib/python3.11/test/test_module/__init__.py +lib/python3.11/test/test_module/__pycache__/ +lib/python3.11/test/test_module/__pycache__/__init__.cpython-311.opt-1.pyc +lib/python3.11/test/test_module/__pycache__/__init__.cpython-311.opt-2.pyc +lib/python3.11/test/test_module/__pycache__/__init__.cpython-311.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr.cpython-311.opt-1.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr.cpython-311.opt-2.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr.cpython-311.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr2.cpython-311.opt-1.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr2.cpython-311.opt-2.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr2.cpython-311.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr3.cpython-311.opt-1.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr3.cpython-311.opt-2.pyc +lib/python3.11/test/test_module/__pycache__/bad_getattr3.cpython-311.pyc +lib/python3.11/test/test_module/__pycache__/good_getattr.cpython-311.opt-1.pyc +lib/python3.11/test/test_module/__pycache__/good_getattr.cpython-311.opt-2.pyc +lib/python3.11/test/test_module/__pycache__/good_getattr.cpython-311.pyc +lib/python3.11/test/test_module/bad_getattr.py +lib/python3.11/test/test_module/bad_getattr2.py +lib/python3.11/test/test_module/bad_getattr3.py +lib/python3.11/test/test_module/good_getattr.py lib/python3.11/test/test_modulefinder.py lib/python3.11/test/test_msilib.py lib/python3.11/test/test_multibytecodec.py
