Mention pullup ticket #6839

Pullup ticket #6839 - requested by nia
editors/nano: build fix Revisions pulled up: - editors/nano/Makefile 1.107 - editors/nano/options.mk 1.7 --- Module Name: pkgsrc Committed By: nia Date: Sat Mar 2 10:33:07 UTC 2024 Modified Files: pkgsrc/editors/nano: Makefile options.mk Log Message: nano: force use of ncurses until PR pkg/57749 is resolved
2024-03-05 14:24:44 +00:00 · 2024-03-05 14:24:29 +00:00 · 2024-03-01 18:25:04 +00:00 · 2024-03-01 17:29:55 +00:00 · 2024-02-13 16:58:11 +00:00 · 2024-02-13 16:56:43 +00:00
41 changed files with 496 additions and 153 deletions
--- a/devel/py-pybind11/buildlink3.mk
+++ b/devel/py-pybind11/buildlink3.mk
@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2023/12/28 13:29:26 thor Exp $
+# $NetBSD: buildlink3.mk,v 1.4.2.1 2024/01/03 20:17:17 bsiegert Exp $

 BUILDLINK_TREE+=	py-pybind11

@ -10,7 +10,10 @@ PY_PYBIND11_BUILDLINK3_MK:=
 PYTHON_FOR_BUILD_ONLY?=		yes
 .include "../../lang/python/pyversion.mk"

-pre-configure:
+pre-configure: py-pybind11-preconfigure
+
+.PHONY: py-pybind11-preconfigure
+py-pybind11-preconfigure:
 	${LN} -sf ${PREFIX}/bin/pybind11-config-${PYVERSSUFFIX} ${BUILDLINK_DIR}/bin/pybind11-config

 BUILDLINK_API_DEPENDS.py-pybind11+=	${PYPKGPREFIX}-pybind11>=2.5.0
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.238 2023/11/27 09:58:35 adam Exp $
+# $NetBSD: Makefile,v 1.238.2.1 2024/01/08 21:29:54 bsiegert Exp $

 DISTNAME=	setuptools-69.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/setuptools/}

@ -10,43 +11,25 @@ HOMEPAGE=	https://github.com/pypa/setuptools
 COMMENT=	New Python packaging system
 LICENSE=	python-software-foundation OR zpl-2.0

-TEST_DEPENDS+=	${PYPKGPREFIX}-build-[0-9]*:../../devel/py-build
-TEST_DEPENDS+=	${PYPKGPREFIX}-filelock>=3.4.0:../../devel/py-filelock
-TEST_DEPENDS+=	${PYPKGPREFIX}-ini2toml>=0.9:../../textproc/py-ini2toml
-TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.develop>=7.21:../../devel/py-jaraco.develop
-TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.envs>=2.2:../../devel/py-jaraco.envs
-TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.path>=3.2.0:../../devel/py-jaraco.path
-TEST_DEPENDS+=	${PYPKGPREFIX}-pip>=19.1:../../devel/py-pip
-TEST_DEPENDS+=	${PYPKGPREFIX}-test>=6:../../devel/py-test
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-checkdocs>=2.4:../../devel/py-test-checkdocs
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-fixture-config-[0-9]*:../../devel/py-test-fixture-config
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-timeout-[0-9]*:../../devel/py-test-timeout
-TEST_DEPENDS+=	${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
-TEST_DEPENDS+=	${PYPKGPREFIX}-tomli_w>=1.0.0:../../textproc/py-tomli_w
-TEST_DEPENDS+=	${PYPKGPREFIX}-virtualenv>=13.0.0:../../devel/py-virtualenv
-TEST_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+# tests fail
+#TEST_DEPENDS+=	${PYPKGPREFIX}-build-[0-9]*:../../devel/py-build
+#TEST_DEPENDS+=	${PYPKGPREFIX}-filelock>=3.4.0:../../devel/py-filelock
+#TEST_DEPENDS+=	${PYPKGPREFIX}-ini2toml>=0.9:../../textproc/py-ini2toml
+#TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.develop>=7.21:../../devel/py-jaraco.develop
+#TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.envs>=2.2:../../devel/py-jaraco.envs
+#TEST_DEPENDS+=	${PYPKGPREFIX}-jaraco.path>=3.2.0:../../devel/py-jaraco.path
+#TEST_DEPENDS+=	${PYPKGPREFIX}-pip>=19.1:../../devel/py-pip
+#TEST_DEPENDS+=	${PYPKGPREFIX}-test>=6:../../devel/py-test
+#TEST_DEPENDS+=	${PYPKGPREFIX}-test-checkdocs>=2.4:../../devel/py-test-checkdocs
+#TEST_DEPENDS+=	${PYPKGPREFIX}-test-fixture-config-[0-9]*:../../devel/py-test-fixture-config
+#TEST_DEPENDS+=	${PYPKGPREFIX}-test-timeout-[0-9]*:../../devel/py-test-timeout
+#TEST_DEPENDS+=	${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
+#TEST_DEPENDS+=	${PYPKGPREFIX}-tomli_w>=1.0.0:../../textproc/py-tomli_w
+#TEST_DEPENDS+=	${PYPKGPREFIX}-virtualenv>=13.0.0:../../devel/py-virtualenv

 PYTHON_VERSIONS_INCOMPATIBLE=	27

-PYDISTUTILSPKG=		no
-PY_PATCHPLIST=		yes
-
-do-build: ensurepip
-.PHONY: ensurepip
-
-ensurepip:
-	${SETENV} ${MAKE_ENV} ${TOOL_PYTHONBIN} -m ensurepip --user
-
-do-install:
-	cd ${WRKSRC} && PYTHONPATH=${WRKDIR}/.home/.local/lib/python${PYVERSSUFFIX}/site-packages \
-        ${TOOL_PYTHONBIN} -m pip install --no-cache-dir --no-deps --disable-pip-version-check \
-                --root ${DESTDIR} --prefix ${PREFIX} --compile --force-reinstall -I .
-
-# Pick setuptools.tests which are not built nor installed.
-TEST_ENV+=	PYTHONPATH=${WRKSRC}
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
-
 .include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@ -1,479 +1,697 @@
-@comment $NetBSD: PLIST,v 1.83 2023/11/27 09:58:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.83.2.1 2024/01/08 21:29:54 bsiegert Exp $
 ${PYSITELIB}/_distutils_hack/__init__.py
 ${PYSITELIB}/_distutils_hack/__init__.pyc
+${PYSITELIB}/_distutils_hack/__init__.pyo
 ${PYSITELIB}/_distutils_hack/override.py
 ${PYSITELIB}/_distutils_hack/override.pyc
+${PYSITELIB}/_distutils_hack/override.pyo
 ${PYSITELIB}/distutils-precedence.pth
 ${PYSITELIB}/pkg_resources/__init__.py
 ${PYSITELIB}/pkg_resources/__init__.pyc
+${PYSITELIB}/pkg_resources/__init__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/__init__.py
 ${PYSITELIB}/pkg_resources/_vendor/__init__.pyc
+${PYSITELIB}/pkg_resources/_vendor/__init__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/__init__.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/__init__.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/__init__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_adapters.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_adapters.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_adapters.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_common.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_common.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_common.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_compat.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_compat.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_compat.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_itertools.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_itertools.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_itertools.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_legacy.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_legacy.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/_legacy.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/abc.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/abc.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/abc.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/py.typed
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/readers.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/readers.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/readers.pyo
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/simple.py
 ${PYSITELIB}/pkg_resources/_vendor/importlib_resources/simple.pyc
+${PYSITELIB}/pkg_resources/_vendor/importlib_resources/simple.pyo
 ${PYSITELIB}/pkg_resources/_vendor/jaraco/__init__.py
 ${PYSITELIB}/pkg_resources/_vendor/jaraco/__init__.pyc
+${PYSITELIB}/pkg_resources/_vendor/jaraco/__init__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/jaraco/context.py
 ${PYSITELIB}/pkg_resources/_vendor/jaraco/context.pyc
+${PYSITELIB}/pkg_resources/_vendor/jaraco/context.pyo
 ${PYSITELIB}/pkg_resources/_vendor/jaraco/functools.py
 ${PYSITELIB}/pkg_resources/_vendor/jaraco/functools.pyc
+${PYSITELIB}/pkg_resources/_vendor/jaraco/functools.pyo
 ${PYSITELIB}/pkg_resources/_vendor/jaraco/text/__init__.py
 ${PYSITELIB}/pkg_resources/_vendor/jaraco/text/__init__.pyc
+${PYSITELIB}/pkg_resources/_vendor/jaraco/text/__init__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/__init__.py
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/__init__.pyc
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/__init__.pyi
+${PYSITELIB}/pkg_resources/_vendor/more_itertools/__init__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/more.py
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/more.pyc
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/more.pyi
+${PYSITELIB}/pkg_resources/_vendor/more_itertools/more.pyo
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/py.typed
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/recipes.py
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/recipes.pyc
 ${PYSITELIB}/pkg_resources/_vendor/more_itertools/recipes.pyi
+${PYSITELIB}/pkg_resources/_vendor/more_itertools/recipes.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/__init__.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/__init__.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/__init__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_elffile.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_elffile.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/_elffile.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_manylinux.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_manylinux.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/_manylinux.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_musllinux.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_musllinux.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/_musllinux.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_parser.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_parser.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/_parser.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/_structures.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_tokenizer.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/_tokenizer.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/_tokenizer.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/markers.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/markers.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/markers.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/metadata.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/metadata.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/metadata.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/py.typed
 ${PYSITELIB}/pkg_resources/_vendor/packaging/requirements.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/requirements.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/requirements.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/specifiers.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/specifiers.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/specifiers.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/tags.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/tags.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/tags.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/utils.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/utils.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/utils.pyo
 ${PYSITELIB}/pkg_resources/_vendor/packaging/version.py
 ${PYSITELIB}/pkg_resources/_vendor/packaging/version.pyc
+${PYSITELIB}/pkg_resources/_vendor/packaging/version.pyo
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/__init__.py
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/__init__.pyc
+${PYSITELIB}/pkg_resources/_vendor/platformdirs/__init__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/__main__.py
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/__main__.pyc
+${PYSITELIB}/pkg_resources/_vendor/platformdirs/__main__.pyo
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/android.py
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/android.pyc
+${PYSITELIB}/pkg_resources/_vendor/platformdirs/android.pyo
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/api.py
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/api.pyc
+${PYSITELIB}/pkg_resources/_vendor/platformdirs/api.pyo
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/macos.py
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/macos.pyc
+${PYSITELIB}/pkg_resources/_vendor/platformdirs/macos.pyo
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/py.typed
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/unix.py
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/unix.pyc
+${PYSITELIB}/pkg_resources/_vendor/platformdirs/unix.pyo
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/version.py
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/version.pyc
+${PYSITELIB}/pkg_resources/_vendor/platformdirs/version.pyo
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/windows.py
 ${PYSITELIB}/pkg_resources/_vendor/platformdirs/windows.pyc
+${PYSITELIB}/pkg_resources/_vendor/platformdirs/windows.pyo
 ${PYSITELIB}/pkg_resources/_vendor/typing_extensions.py
 ${PYSITELIB}/pkg_resources/_vendor/typing_extensions.pyc
+${PYSITELIB}/pkg_resources/_vendor/typing_extensions.pyo
 ${PYSITELIB}/pkg_resources/_vendor/zipp.py
 ${PYSITELIB}/pkg_resources/_vendor/zipp.pyc
+${PYSITELIB}/pkg_resources/_vendor/zipp.pyo
 ${PYSITELIB}/pkg_resources/extern/__init__.py
 ${PYSITELIB}/pkg_resources/extern/__init__.pyc
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/INSTALLER
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/LICENSE
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/METADATA
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/RECORD
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/REQUESTED
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/WHEEL
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/direct_url.json
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/entry_points.txt
-${PYSITELIB}/setuptools-${PKGVERSION}.dist-info/top_level.txt
+${PYSITELIB}/pkg_resources/extern/__init__.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/setuptools/__init__.py
 ${PYSITELIB}/setuptools/__init__.pyc
+${PYSITELIB}/setuptools/__init__.pyo
 ${PYSITELIB}/setuptools/_core_metadata.py
 ${PYSITELIB}/setuptools/_core_metadata.pyc
+${PYSITELIB}/setuptools/_core_metadata.pyo
 ${PYSITELIB}/setuptools/_distutils/__init__.py
 ${PYSITELIB}/setuptools/_distutils/__init__.pyc
+${PYSITELIB}/setuptools/_distutils/__init__.pyo
 ${PYSITELIB}/setuptools/_distutils/_collections.py
 ${PYSITELIB}/setuptools/_distutils/_collections.pyc
+${PYSITELIB}/setuptools/_distutils/_collections.pyo
 ${PYSITELIB}/setuptools/_distutils/_functools.py
 ${PYSITELIB}/setuptools/_distutils/_functools.pyc
+${PYSITELIB}/setuptools/_distutils/_functools.pyo
 ${PYSITELIB}/setuptools/_distutils/_log.py
 ${PYSITELIB}/setuptools/_distutils/_log.pyc
+${PYSITELIB}/setuptools/_distutils/_log.pyo
 ${PYSITELIB}/setuptools/_distutils/_macos_compat.py
 ${PYSITELIB}/setuptools/_distutils/_macos_compat.pyc
+${PYSITELIB}/setuptools/_distutils/_macos_compat.pyo
 ${PYSITELIB}/setuptools/_distutils/_modified.py
 ${PYSITELIB}/setuptools/_distutils/_modified.pyc
+${PYSITELIB}/setuptools/_distutils/_modified.pyo
 ${PYSITELIB}/setuptools/_distutils/_msvccompiler.py
 ${PYSITELIB}/setuptools/_distutils/_msvccompiler.pyc
+${PYSITELIB}/setuptools/_distutils/_msvccompiler.pyo
 ${PYSITELIB}/setuptools/_distutils/archive_util.py
 ${PYSITELIB}/setuptools/_distutils/archive_util.pyc
+${PYSITELIB}/setuptools/_distutils/archive_util.pyo
 ${PYSITELIB}/setuptools/_distutils/bcppcompiler.py
 ${PYSITELIB}/setuptools/_distutils/bcppcompiler.pyc
+${PYSITELIB}/setuptools/_distutils/bcppcompiler.pyo
 ${PYSITELIB}/setuptools/_distutils/ccompiler.py
 ${PYSITELIB}/setuptools/_distutils/ccompiler.pyc
+${PYSITELIB}/setuptools/_distutils/ccompiler.pyo
 ${PYSITELIB}/setuptools/_distutils/cmd.py
 ${PYSITELIB}/setuptools/_distutils/cmd.pyc
+${PYSITELIB}/setuptools/_distutils/cmd.pyo
 ${PYSITELIB}/setuptools/_distutils/command/__init__.py
 ${PYSITELIB}/setuptools/_distutils/command/__init__.pyc
+${PYSITELIB}/setuptools/_distutils/command/__init__.pyo
 ${PYSITELIB}/setuptools/_distutils/command/_framework_compat.py
 ${PYSITELIB}/setuptools/_distutils/command/_framework_compat.pyc
+${PYSITELIB}/setuptools/_distutils/command/_framework_compat.pyo
 ${PYSITELIB}/setuptools/_distutils/command/bdist.py
 ${PYSITELIB}/setuptools/_distutils/command/bdist.pyc
+${PYSITELIB}/setuptools/_distutils/command/bdist.pyo
 ${PYSITELIB}/setuptools/_distutils/command/bdist_dumb.py
 ${PYSITELIB}/setuptools/_distutils/command/bdist_dumb.pyc
+${PYSITELIB}/setuptools/_distutils/command/bdist_dumb.pyo
 ${PYSITELIB}/setuptools/_distutils/command/bdist_rpm.py
 ${PYSITELIB}/setuptools/_distutils/command/bdist_rpm.pyc
+${PYSITELIB}/setuptools/_distutils/command/bdist_rpm.pyo
 ${PYSITELIB}/setuptools/_distutils/command/build.py
 ${PYSITELIB}/setuptools/_distutils/command/build.pyc
+${PYSITELIB}/setuptools/_distutils/command/build.pyo
 ${PYSITELIB}/setuptools/_distutils/command/build_clib.py
 ${PYSITELIB}/setuptools/_distutils/command/build_clib.pyc
+${PYSITELIB}/setuptools/_distutils/command/build_clib.pyo
 ${PYSITELIB}/setuptools/_distutils/command/build_ext.py
 ${PYSITELIB}/setuptools/_distutils/command/build_ext.pyc
+${PYSITELIB}/setuptools/_distutils/command/build_ext.pyo
 ${PYSITELIB}/setuptools/_distutils/command/build_py.py
 ${PYSITELIB}/setuptools/_distutils/command/build_py.pyc
+${PYSITELIB}/setuptools/_distutils/command/build_py.pyo
 ${PYSITELIB}/setuptools/_distutils/command/build_scripts.py
 ${PYSITELIB}/setuptools/_distutils/command/build_scripts.pyc
+${PYSITELIB}/setuptools/_distutils/command/build_scripts.pyo
 ${PYSITELIB}/setuptools/_distutils/command/check.py
 ${PYSITELIB}/setuptools/_distutils/command/check.pyc
+${PYSITELIB}/setuptools/_distutils/command/check.pyo
 ${PYSITELIB}/setuptools/_distutils/command/clean.py
 ${PYSITELIB}/setuptools/_distutils/command/clean.pyc
+${PYSITELIB}/setuptools/_distutils/command/clean.pyo
 ${PYSITELIB}/setuptools/_distutils/command/config.py
 ${PYSITELIB}/setuptools/_distutils/command/config.pyc
+${PYSITELIB}/setuptools/_distutils/command/config.pyo
 ${PYSITELIB}/setuptools/_distutils/command/install.py
 ${PYSITELIB}/setuptools/_distutils/command/install.pyc
+${PYSITELIB}/setuptools/_distutils/command/install.pyo
 ${PYSITELIB}/setuptools/_distutils/command/install_data.py
 ${PYSITELIB}/setuptools/_distutils/command/install_data.pyc
+${PYSITELIB}/setuptools/_distutils/command/install_data.pyo
 ${PYSITELIB}/setuptools/_distutils/command/install_egg_info.py
 ${PYSITELIB}/setuptools/_distutils/command/install_egg_info.pyc
+${PYSITELIB}/setuptools/_distutils/command/install_egg_info.pyo
 ${PYSITELIB}/setuptools/_distutils/command/install_headers.py
 ${PYSITELIB}/setuptools/_distutils/command/install_headers.pyc
+${PYSITELIB}/setuptools/_distutils/command/install_headers.pyo
 ${PYSITELIB}/setuptools/_distutils/command/install_lib.py
 ${PYSITELIB}/setuptools/_distutils/command/install_lib.pyc
+${PYSITELIB}/setuptools/_distutils/command/install_lib.pyo
 ${PYSITELIB}/setuptools/_distutils/command/install_scripts.py
 ${PYSITELIB}/setuptools/_distutils/command/install_scripts.pyc
+${PYSITELIB}/setuptools/_distutils/command/install_scripts.pyo
 ${PYSITELIB}/setuptools/_distutils/command/py37compat.py
 ${PYSITELIB}/setuptools/_distutils/command/py37compat.pyc
+${PYSITELIB}/setuptools/_distutils/command/py37compat.pyo
 ${PYSITELIB}/setuptools/_distutils/command/register.py
 ${PYSITELIB}/setuptools/_distutils/command/register.pyc
+${PYSITELIB}/setuptools/_distutils/command/register.pyo
 ${PYSITELIB}/setuptools/_distutils/command/sdist.py
 ${PYSITELIB}/setuptools/_distutils/command/sdist.pyc
+${PYSITELIB}/setuptools/_distutils/command/sdist.pyo
 ${PYSITELIB}/setuptools/_distutils/command/upload.py
 ${PYSITELIB}/setuptools/_distutils/command/upload.pyc
+${PYSITELIB}/setuptools/_distutils/command/upload.pyo
 ${PYSITELIB}/setuptools/_distutils/config.py
 ${PYSITELIB}/setuptools/_distutils/config.pyc
+${PYSITELIB}/setuptools/_distutils/config.pyo
 ${PYSITELIB}/setuptools/_distutils/core.py
 ${PYSITELIB}/setuptools/_distutils/core.pyc
+${PYSITELIB}/setuptools/_distutils/core.pyo
 ${PYSITELIB}/setuptools/_distutils/cygwinccompiler.py
 ${PYSITELIB}/setuptools/_distutils/cygwinccompiler.pyc
+${PYSITELIB}/setuptools/_distutils/cygwinccompiler.pyo
 ${PYSITELIB}/setuptools/_distutils/debug.py
 ${PYSITELIB}/setuptools/_distutils/debug.pyc
+${PYSITELIB}/setuptools/_distutils/debug.pyo
 ${PYSITELIB}/setuptools/_distutils/dep_util.py
 ${PYSITELIB}/setuptools/_distutils/dep_util.pyc
+${PYSITELIB}/setuptools/_distutils/dep_util.pyo
 ${PYSITELIB}/setuptools/_distutils/dir_util.py
 ${PYSITELIB}/setuptools/_distutils/dir_util.pyc
+${PYSITELIB}/setuptools/_distutils/dir_util.pyo
 ${PYSITELIB}/setuptools/_distutils/dist.py
 ${PYSITELIB}/setuptools/_distutils/dist.pyc
+${PYSITELIB}/setuptools/_distutils/dist.pyo
 ${PYSITELIB}/setuptools/_distutils/errors.py
 ${PYSITELIB}/setuptools/_distutils/errors.pyc
+${PYSITELIB}/setuptools/_distutils/errors.pyo
 ${PYSITELIB}/setuptools/_distutils/extension.py
 ${PYSITELIB}/setuptools/_distutils/extension.pyc
+${PYSITELIB}/setuptools/_distutils/extension.pyo
 ${PYSITELIB}/setuptools/_distutils/fancy_getopt.py
 ${PYSITELIB}/setuptools/_distutils/fancy_getopt.pyc
+${PYSITELIB}/setuptools/_distutils/fancy_getopt.pyo
 ${PYSITELIB}/setuptools/_distutils/file_util.py
 ${PYSITELIB}/setuptools/_distutils/file_util.pyc
+${PYSITELIB}/setuptools/_distutils/file_util.pyo
 ${PYSITELIB}/setuptools/_distutils/filelist.py
 ${PYSITELIB}/setuptools/_distutils/filelist.pyc
+${PYSITELIB}/setuptools/_distutils/filelist.pyo
 ${PYSITELIB}/setuptools/_distutils/log.py
 ${PYSITELIB}/setuptools/_distutils/log.pyc
+${PYSITELIB}/setuptools/_distutils/log.pyo
 ${PYSITELIB}/setuptools/_distutils/msvc9compiler.py
 ${PYSITELIB}/setuptools/_distutils/msvc9compiler.pyc
+${PYSITELIB}/setuptools/_distutils/msvc9compiler.pyo
 ${PYSITELIB}/setuptools/_distutils/msvccompiler.py
 ${PYSITELIB}/setuptools/_distutils/msvccompiler.pyc
+${PYSITELIB}/setuptools/_distutils/msvccompiler.pyo
 ${PYSITELIB}/setuptools/_distutils/py38compat.py
 ${PYSITELIB}/setuptools/_distutils/py38compat.pyc
+${PYSITELIB}/setuptools/_distutils/py38compat.pyo
 ${PYSITELIB}/setuptools/_distutils/py39compat.py
 ${PYSITELIB}/setuptools/_distutils/py39compat.pyc
+${PYSITELIB}/setuptools/_distutils/py39compat.pyo
 ${PYSITELIB}/setuptools/_distutils/spawn.py
 ${PYSITELIB}/setuptools/_distutils/spawn.pyc
+${PYSITELIB}/setuptools/_distutils/spawn.pyo
 ${PYSITELIB}/setuptools/_distutils/sysconfig.py
 ${PYSITELIB}/setuptools/_distutils/sysconfig.pyc
+${PYSITELIB}/setuptools/_distutils/sysconfig.pyo
 ${PYSITELIB}/setuptools/_distutils/text_file.py
 ${PYSITELIB}/setuptools/_distutils/text_file.pyc
+${PYSITELIB}/setuptools/_distutils/text_file.pyo
 ${PYSITELIB}/setuptools/_distutils/unixccompiler.py
 ${PYSITELIB}/setuptools/_distutils/unixccompiler.pyc
+${PYSITELIB}/setuptools/_distutils/unixccompiler.pyo
 ${PYSITELIB}/setuptools/_distutils/util.py
 ${PYSITELIB}/setuptools/_distutils/util.pyc
+${PYSITELIB}/setuptools/_distutils/util.pyo
 ${PYSITELIB}/setuptools/_distutils/version.py
 ${PYSITELIB}/setuptools/_distutils/version.pyc
+${PYSITELIB}/setuptools/_distutils/version.pyo
 ${PYSITELIB}/setuptools/_distutils/versionpredicate.py
 ${PYSITELIB}/setuptools/_distutils/versionpredicate.pyc
+${PYSITELIB}/setuptools/_distutils/versionpredicate.pyo
 ${PYSITELIB}/setuptools/_entry_points.py
 ${PYSITELIB}/setuptools/_entry_points.pyc
+${PYSITELIB}/setuptools/_entry_points.pyo
 ${PYSITELIB}/setuptools/_imp.py
 ${PYSITELIB}/setuptools/_imp.pyc
+${PYSITELIB}/setuptools/_imp.pyo
 ${PYSITELIB}/setuptools/_importlib.py
 ${PYSITELIB}/setuptools/_importlib.pyc
+${PYSITELIB}/setuptools/_importlib.pyo
 ${PYSITELIB}/setuptools/_itertools.py
 ${PYSITELIB}/setuptools/_itertools.pyc
+${PYSITELIB}/setuptools/_itertools.pyo
 ${PYSITELIB}/setuptools/_normalization.py
 ${PYSITELIB}/setuptools/_normalization.pyc
+${PYSITELIB}/setuptools/_normalization.pyo
 ${PYSITELIB}/setuptools/_path.py
 ${PYSITELIB}/setuptools/_path.pyc
+${PYSITELIB}/setuptools/_path.pyo
 ${PYSITELIB}/setuptools/_reqs.py
 ${PYSITELIB}/setuptools/_reqs.pyc
+${PYSITELIB}/setuptools/_reqs.pyo
 ${PYSITELIB}/setuptools/_vendor/__init__.py
 ${PYSITELIB}/setuptools/_vendor/__init__.pyc
+${PYSITELIB}/setuptools/_vendor/__init__.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/__init__.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/__init__.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/__init__.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_adapters.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_adapters.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/_adapters.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_collections.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_collections.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/_collections.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_compat.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_compat.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/_compat.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_functools.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_functools.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/_functools.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_itertools.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_itertools.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/_itertools.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_meta.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_meta.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/_meta.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_py39compat.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_py39compat.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/_py39compat.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_text.py
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/_text.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_metadata/_text.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_metadata/py.typed
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/__init__.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/__init__.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/__init__.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_adapters.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_adapters.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/_adapters.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_common.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_common.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/_common.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_compat.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_compat.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/_compat.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_itertools.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_itertools.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/_itertools.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_legacy.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/_legacy.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/_legacy.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/abc.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/abc.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/abc.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/py.typed
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/readers.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/readers.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/readers.pyo
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/simple.py
 ${PYSITELIB}/setuptools/_vendor/importlib_resources/simple.pyc
+${PYSITELIB}/setuptools/_vendor/importlib_resources/simple.pyo
 ${PYSITELIB}/setuptools/_vendor/jaraco/__init__.py
 ${PYSITELIB}/setuptools/_vendor/jaraco/__init__.pyc
+${PYSITELIB}/setuptools/_vendor/jaraco/__init__.pyo
 ${PYSITELIB}/setuptools/_vendor/jaraco/context.py
 ${PYSITELIB}/setuptools/_vendor/jaraco/context.pyc
+${PYSITELIB}/setuptools/_vendor/jaraco/context.pyo
 ${PYSITELIB}/setuptools/_vendor/jaraco/functools.py
 ${PYSITELIB}/setuptools/_vendor/jaraco/functools.pyc
+${PYSITELIB}/setuptools/_vendor/jaraco/functools.pyo
 ${PYSITELIB}/setuptools/_vendor/jaraco/text/__init__.py
 ${PYSITELIB}/setuptools/_vendor/jaraco/text/__init__.pyc
+${PYSITELIB}/setuptools/_vendor/jaraco/text/__init__.pyo
 ${PYSITELIB}/setuptools/_vendor/more_itertools/__init__.py
 ${PYSITELIB}/setuptools/_vendor/more_itertools/__init__.pyc
 ${PYSITELIB}/setuptools/_vendor/more_itertools/__init__.pyi
+${PYSITELIB}/setuptools/_vendor/more_itertools/__init__.pyo
 ${PYSITELIB}/setuptools/_vendor/more_itertools/more.py
 ${PYSITELIB}/setuptools/_vendor/more_itertools/more.pyc
 ${PYSITELIB}/setuptools/_vendor/more_itertools/more.pyi
+${PYSITELIB}/setuptools/_vendor/more_itertools/more.pyo
 ${PYSITELIB}/setuptools/_vendor/more_itertools/py.typed
 ${PYSITELIB}/setuptools/_vendor/more_itertools/recipes.py
 ${PYSITELIB}/setuptools/_vendor/more_itertools/recipes.pyc
 ${PYSITELIB}/setuptools/_vendor/more_itertools/recipes.pyi
+${PYSITELIB}/setuptools/_vendor/more_itertools/recipes.pyo
 ${PYSITELIB}/setuptools/_vendor/ordered_set.py
 ${PYSITELIB}/setuptools/_vendor/ordered_set.pyc
+${PYSITELIB}/setuptools/_vendor/ordered_set.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/__init__.py
 ${PYSITELIB}/setuptools/_vendor/packaging/__init__.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/__init__.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/_elffile.py
 ${PYSITELIB}/setuptools/_vendor/packaging/_elffile.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/_elffile.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/_manylinux.py
 ${PYSITELIB}/setuptools/_vendor/packaging/_manylinux.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/_manylinux.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/_musllinux.py
 ${PYSITELIB}/setuptools/_vendor/packaging/_musllinux.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/_musllinux.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/_parser.py
 ${PYSITELIB}/setuptools/_vendor/packaging/_parser.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/_parser.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/_structures.py
 ${PYSITELIB}/setuptools/_vendor/packaging/_structures.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/_structures.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/_tokenizer.py
 ${PYSITELIB}/setuptools/_vendor/packaging/_tokenizer.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/_tokenizer.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/markers.py
 ${PYSITELIB}/setuptools/_vendor/packaging/markers.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/markers.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/metadata.py
 ${PYSITELIB}/setuptools/_vendor/packaging/metadata.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/metadata.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/py.typed
 ${PYSITELIB}/setuptools/_vendor/packaging/requirements.py
 ${PYSITELIB}/setuptools/_vendor/packaging/requirements.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/requirements.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/specifiers.py
 ${PYSITELIB}/setuptools/_vendor/packaging/specifiers.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/specifiers.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/tags.py
 ${PYSITELIB}/setuptools/_vendor/packaging/tags.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/tags.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/utils.py
 ${PYSITELIB}/setuptools/_vendor/packaging/utils.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/utils.pyo
 ${PYSITELIB}/setuptools/_vendor/packaging/version.py
 ${PYSITELIB}/setuptools/_vendor/packaging/version.pyc
+${PYSITELIB}/setuptools/_vendor/packaging/version.pyo
 ${PYSITELIB}/setuptools/_vendor/tomli/__init__.py
 ${PYSITELIB}/setuptools/_vendor/tomli/__init__.pyc
+${PYSITELIB}/setuptools/_vendor/tomli/__init__.pyo
 ${PYSITELIB}/setuptools/_vendor/tomli/_parser.py
 ${PYSITELIB}/setuptools/_vendor/tomli/_parser.pyc
+${PYSITELIB}/setuptools/_vendor/tomli/_parser.pyo
 ${PYSITELIB}/setuptools/_vendor/tomli/_re.py
 ${PYSITELIB}/setuptools/_vendor/tomli/_re.pyc
+${PYSITELIB}/setuptools/_vendor/tomli/_re.pyo
 ${PYSITELIB}/setuptools/_vendor/tomli/_types.py
 ${PYSITELIB}/setuptools/_vendor/tomli/_types.pyc
+${PYSITELIB}/setuptools/_vendor/tomli/_types.pyo
 ${PYSITELIB}/setuptools/_vendor/tomli/py.typed
 ${PYSITELIB}/setuptools/_vendor/typing_extensions.py
 ${PYSITELIB}/setuptools/_vendor/typing_extensions.pyc
+${PYSITELIB}/setuptools/_vendor/typing_extensions.pyo
 ${PYSITELIB}/setuptools/_vendor/zipp.py
 ${PYSITELIB}/setuptools/_vendor/zipp.pyc
+${PYSITELIB}/setuptools/_vendor/zipp.pyo
 ${PYSITELIB}/setuptools/archive_util.py
 ${PYSITELIB}/setuptools/archive_util.pyc
+${PYSITELIB}/setuptools/archive_util.pyo
 ${PYSITELIB}/setuptools/build_meta.py
 ${PYSITELIB}/setuptools/build_meta.pyc
+${PYSITELIB}/setuptools/build_meta.pyo
 ${PYSITELIB}/setuptools/cli-32.exe
 ${PYSITELIB}/setuptools/cli-64.exe
 ${PYSITELIB}/setuptools/cli-arm64.exe
 ${PYSITELIB}/setuptools/cli.exe
 ${PYSITELIB}/setuptools/command/__init__.py
 ${PYSITELIB}/setuptools/command/__init__.pyc
+${PYSITELIB}/setuptools/command/__init__.pyo
 ${PYSITELIB}/setuptools/command/_requirestxt.py
 ${PYSITELIB}/setuptools/command/_requirestxt.pyc
+${PYSITELIB}/setuptools/command/_requirestxt.pyo
 ${PYSITELIB}/setuptools/command/alias.py
 ${PYSITELIB}/setuptools/command/alias.pyc
+${PYSITELIB}/setuptools/command/alias.pyo
 ${PYSITELIB}/setuptools/command/bdist_egg.py
 ${PYSITELIB}/setuptools/command/bdist_egg.pyc
+${PYSITELIB}/setuptools/command/bdist_egg.pyo
 ${PYSITELIB}/setuptools/command/bdist_rpm.py
 ${PYSITELIB}/setuptools/command/bdist_rpm.pyc
+${PYSITELIB}/setuptools/command/bdist_rpm.pyo
 ${PYSITELIB}/setuptools/command/build.py
 ${PYSITELIB}/setuptools/command/build.pyc
+${PYSITELIB}/setuptools/command/build.pyo
 ${PYSITELIB}/setuptools/command/build_clib.py
 ${PYSITELIB}/setuptools/command/build_clib.pyc
+${PYSITELIB}/setuptools/command/build_clib.pyo
 ${PYSITELIB}/setuptools/command/build_ext.py
 ${PYSITELIB}/setuptools/command/build_ext.pyc
+${PYSITELIB}/setuptools/command/build_ext.pyo
 ${PYSITELIB}/setuptools/command/build_py.py
 ${PYSITELIB}/setuptools/command/build_py.pyc
+${PYSITELIB}/setuptools/command/build_py.pyo
 ${PYSITELIB}/setuptools/command/develop.py
 ${PYSITELIB}/setuptools/command/develop.pyc
+${PYSITELIB}/setuptools/command/develop.pyo
 ${PYSITELIB}/setuptools/command/dist_info.py
 ${PYSITELIB}/setuptools/command/dist_info.pyc
+${PYSITELIB}/setuptools/command/dist_info.pyo
 ${PYSITELIB}/setuptools/command/easy_install.py
 ${PYSITELIB}/setuptools/command/easy_install.pyc
+${PYSITELIB}/setuptools/command/easy_install.pyo
 ${PYSITELIB}/setuptools/command/editable_wheel.py
 ${PYSITELIB}/setuptools/command/editable_wheel.pyc
+${PYSITELIB}/setuptools/command/editable_wheel.pyo
 ${PYSITELIB}/setuptools/command/egg_info.py
 ${PYSITELIB}/setuptools/command/egg_info.pyc
+${PYSITELIB}/setuptools/command/egg_info.pyo
 ${PYSITELIB}/setuptools/command/install.py
 ${PYSITELIB}/setuptools/command/install.pyc
+${PYSITELIB}/setuptools/command/install.pyo
 ${PYSITELIB}/setuptools/command/install_egg_info.py
 ${PYSITELIB}/setuptools/command/install_egg_info.pyc
+${PYSITELIB}/setuptools/command/install_egg_info.pyo
 ${PYSITELIB}/setuptools/command/install_lib.py
 ${PYSITELIB}/setuptools/command/install_lib.pyc
+${PYSITELIB}/setuptools/command/install_lib.pyo
 ${PYSITELIB}/setuptools/command/install_scripts.py
 ${PYSITELIB}/setuptools/command/install_scripts.pyc
+${PYSITELIB}/setuptools/command/install_scripts.pyo
 ${PYSITELIB}/setuptools/command/launcher manifest.xml
 ${PYSITELIB}/setuptools/command/register.py
 ${PYSITELIB}/setuptools/command/register.pyc
+${PYSITELIB}/setuptools/command/register.pyo
 ${PYSITELIB}/setuptools/command/rotate.py
 ${PYSITELIB}/setuptools/command/rotate.pyc
+${PYSITELIB}/setuptools/command/rotate.pyo
 ${PYSITELIB}/setuptools/command/saveopts.py
 ${PYSITELIB}/setuptools/command/saveopts.pyc
+${PYSITELIB}/setuptools/command/saveopts.pyo
 ${PYSITELIB}/setuptools/command/sdist.py
 ${PYSITELIB}/setuptools/command/sdist.pyc
+${PYSITELIB}/setuptools/command/sdist.pyo
 ${PYSITELIB}/setuptools/command/setopt.py
 ${PYSITELIB}/setuptools/command/setopt.pyc
+${PYSITELIB}/setuptools/command/setopt.pyo
 ${PYSITELIB}/setuptools/command/test.py
 ${PYSITELIB}/setuptools/command/test.pyc
+${PYSITELIB}/setuptools/command/test.pyo
 ${PYSITELIB}/setuptools/command/upload.py
 ${PYSITELIB}/setuptools/command/upload.pyc
+${PYSITELIB}/setuptools/command/upload.pyo
 ${PYSITELIB}/setuptools/command/upload_docs.py
 ${PYSITELIB}/setuptools/command/upload_docs.pyc
+${PYSITELIB}/setuptools/command/upload_docs.pyo
 ${PYSITELIB}/setuptools/config/__init__.py
 ${PYSITELIB}/setuptools/config/__init__.pyc
+${PYSITELIB}/setuptools/config/__init__.pyo
 ${PYSITELIB}/setuptools/config/_apply_pyprojecttoml.py
 ${PYSITELIB}/setuptools/config/_apply_pyprojecttoml.pyc
+${PYSITELIB}/setuptools/config/_apply_pyprojecttoml.pyo
 ${PYSITELIB}/setuptools/config/_validate_pyproject/__init__.py
 ${PYSITELIB}/setuptools/config/_validate_pyproject/__init__.pyc
+${PYSITELIB}/setuptools/config/_validate_pyproject/__init__.pyo
 ${PYSITELIB}/setuptools/config/_validate_pyproject/error_reporting.py
 ${PYSITELIB}/setuptools/config/_validate_pyproject/error_reporting.pyc
+${PYSITELIB}/setuptools/config/_validate_pyproject/error_reporting.pyo
 ${PYSITELIB}/setuptools/config/_validate_pyproject/extra_validations.py
 ${PYSITELIB}/setuptools/config/_validate_pyproject/extra_validations.pyc
+${PYSITELIB}/setuptools/config/_validate_pyproject/extra_validations.pyo
 ${PYSITELIB}/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py
 ${PYSITELIB}/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.pyc
+${PYSITELIB}/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.pyo
 ${PYSITELIB}/setuptools/config/_validate_pyproject/fastjsonschema_validations.py
 ${PYSITELIB}/setuptools/config/_validate_pyproject/fastjsonschema_validations.pyc
+${PYSITELIB}/setuptools/config/_validate_pyproject/fastjsonschema_validations.pyo
 ${PYSITELIB}/setuptools/config/_validate_pyproject/formats.py
 ${PYSITELIB}/setuptools/config/_validate_pyproject/formats.pyc
+${PYSITELIB}/setuptools/config/_validate_pyproject/formats.pyo
 ${PYSITELIB}/setuptools/config/expand.py
 ${PYSITELIB}/setuptools/config/expand.pyc
+${PYSITELIB}/setuptools/config/expand.pyo
 ${PYSITELIB}/setuptools/config/pyprojecttoml.py
 ${PYSITELIB}/setuptools/config/pyprojecttoml.pyc
+${PYSITELIB}/setuptools/config/pyprojecttoml.pyo
 ${PYSITELIB}/setuptools/config/setupcfg.py
 ${PYSITELIB}/setuptools/config/setupcfg.pyc
+${PYSITELIB}/setuptools/config/setupcfg.pyo
 ${PYSITELIB}/setuptools/dep_util.py
 ${PYSITELIB}/setuptools/dep_util.pyc
+${PYSITELIB}/setuptools/dep_util.pyo
 ${PYSITELIB}/setuptools/depends.py
 ${PYSITELIB}/setuptools/depends.pyc
+${PYSITELIB}/setuptools/depends.pyo
 ${PYSITELIB}/setuptools/discovery.py
 ${PYSITELIB}/setuptools/discovery.pyc
+${PYSITELIB}/setuptools/discovery.pyo
 ${PYSITELIB}/setuptools/dist.py
 ${PYSITELIB}/setuptools/dist.pyc
+${PYSITELIB}/setuptools/dist.pyo
 ${PYSITELIB}/setuptools/errors.py
 ${PYSITELIB}/setuptools/errors.pyc
+${PYSITELIB}/setuptools/errors.pyo
 ${PYSITELIB}/setuptools/extension.py
 ${PYSITELIB}/setuptools/extension.pyc
+${PYSITELIB}/setuptools/extension.pyo
 ${PYSITELIB}/setuptools/extern/__init__.py
 ${PYSITELIB}/setuptools/extern/__init__.pyc
+${PYSITELIB}/setuptools/extern/__init__.pyo
 ${PYSITELIB}/setuptools/glob.py
 ${PYSITELIB}/setuptools/glob.pyc
+${PYSITELIB}/setuptools/glob.pyo
 ${PYSITELIB}/setuptools/gui-32.exe
 ${PYSITELIB}/setuptools/gui-64.exe
 ${PYSITELIB}/setuptools/gui-arm64.exe
 ${PYSITELIB}/setuptools/gui.exe
 ${PYSITELIB}/setuptools/installer.py
 ${PYSITELIB}/setuptools/installer.pyc
+${PYSITELIB}/setuptools/installer.pyo
 ${PYSITELIB}/setuptools/launch.py
 ${PYSITELIB}/setuptools/launch.pyc
+${PYSITELIB}/setuptools/launch.pyo
 ${PYSITELIB}/setuptools/logging.py
 ${PYSITELIB}/setuptools/logging.pyc
+${PYSITELIB}/setuptools/logging.pyo
 ${PYSITELIB}/setuptools/modified.py
 ${PYSITELIB}/setuptools/modified.pyc
+${PYSITELIB}/setuptools/modified.pyo
 ${PYSITELIB}/setuptools/monkey.py
 ${PYSITELIB}/setuptools/monkey.pyc
+${PYSITELIB}/setuptools/monkey.pyo
 ${PYSITELIB}/setuptools/msvc.py
 ${PYSITELIB}/setuptools/msvc.pyc
+${PYSITELIB}/setuptools/msvc.pyo
 ${PYSITELIB}/setuptools/namespaces.py
 ${PYSITELIB}/setuptools/namespaces.pyc
+${PYSITELIB}/setuptools/namespaces.pyo
 ${PYSITELIB}/setuptools/package_index.py
 ${PYSITELIB}/setuptools/package_index.pyc
+${PYSITELIB}/setuptools/package_index.pyo
 ${PYSITELIB}/setuptools/py312compat.py
 ${PYSITELIB}/setuptools/py312compat.pyc
+${PYSITELIB}/setuptools/py312compat.pyo
 ${PYSITELIB}/setuptools/sandbox.py
 ${PYSITELIB}/setuptools/sandbox.pyc
+${PYSITELIB}/setuptools/sandbox.pyo
 ${PYSITELIB}/setuptools/script (dev).tmpl
 ${PYSITELIB}/setuptools/script.tmpl
 ${PYSITELIB}/setuptools/unicode_utils.py
 ${PYSITELIB}/setuptools/unicode_utils.pyc
+${PYSITELIB}/setuptools/unicode_utils.pyo
 ${PYSITELIB}/setuptools/version.py
 ${PYSITELIB}/setuptools/version.pyc
+${PYSITELIB}/setuptools/version.pyo
 ${PYSITELIB}/setuptools/warnings.py
 ${PYSITELIB}/setuptools/warnings.pyc
+${PYSITELIB}/setuptools/warnings.pyo
 ${PYSITELIB}/setuptools/wheel.py
 ${PYSITELIB}/setuptools/wheel.pyc
+${PYSITELIB}/setuptools/wheel.pyo
 ${PYSITELIB}/setuptools/windows_support.py
 ${PYSITELIB}/setuptools/windows_support.pyc
+${PYSITELIB}/setuptools/windows_support.pyo
--- a/doc/CHANGES-pkgsrc-2023Q4
+++ b/doc/CHANGES-pkgsrc-2023Q4
@ -0,0 +1,41 @@
+$NetBSD: CHANGES-pkgsrc-2023Q4,v 1.1.2.9 2024/03/05 14:24:44 bsiegert Exp $
+
+Changes to packages and infrastructure on the pkgsrc-2023Q4 branch:
+
+Pullup ticket #6827 - requested by gutteridge
+wm/awesome: build fix
+
+Pullup ticket #6828 - requested by schmonz
+graphics/ImageMagick: bugfix
+
+Pullup ticket #6829 - requested by wiz
+devel/py-pybind11: build fix
+
+Pullup ticket #6830 - requested by wiz
+devel/py-setuptools: build fix
+
+Pullup ticket #6831 - requested by ryoon
+inputmethod/mozc-server: build fix
+
+Pullup ticket #6832 - requested by riastradh
+net/libfetch: enable HTTPS cert validation on NetBSD 10
+pkgtools/pkg_install, pkgtools/pkgin: revbump
+
+Pullup ticket #6834 - requested by wiz
+math/py-numpy: Python 3.12 build fix
+
+Pullup ticket #6833 - requested by bsiegert
+sysutils/strace: build fix for NetBSD 10
+
+Pullup ticket #6835 - requested by taca
+net/bind918: security fix
+
+Pullup ticket #6836 - requested by taca
+net/bind916: security fix
+
+Pullup ticket #6838 - requested by riastradh
+security/libfido2: NetBSD build fix
+
+Pullup ticket #6839 - requested by nia
+editors/nano: build fix
+
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2023/02/02 16:54:20 schwarz Exp $
+# $NetBSD: Makefile,v 1.106.8.1 2024/03/05 14:24:29 bsiegert Exp $

 DISTNAME=	nano-7.2
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	https://www.nano-editor.org/dist/v${PKGVERSION_NOREV:C/\..*$//}/
 EXTRACT_SUFX=	.tar.xz
@ -44,5 +45,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.nanorc ${DESTDIR}${PREFIX}/share/examples/nano/nanorc

 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/editors/nano/options.mk
+++ b/editors/nano/options.mk
@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2020/11/24 18:21:38 nia Exp $
+# $NetBSD: options.mk,v 1.6.26.1 2024/03/05 14:24:29 bsiegert Exp $

 PKG_OPTIONS_VAR=		PKG_OPTIONS.nano
 PKG_SUPPORTED_OPTIONS=		wide-curses
@ -9,7 +9,10 @@ PKG_OPTIONS_LEGACY_OPTS+=	ncursesw:wide-curses

 ###
 ### Wide curses support; otherwise, default to using narrow curses.
+### XXX netbsd curses is unacceptable due to PR pkg/57749
 ###
 .if !empty(PKG_OPTIONS:Mwide-curses)
-# Handled by curses.mk.
+.  include "../../devel/ncursesw/buildlink3.mk"
+.else
+.  include "../../devel/ncurses/buildlink3.mk"
 .endif
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.333 2023/12/11 10:25:35 wiz Exp $
+# $NetBSD: Makefile,v 1.333.2.1 2024/01/01 10:29:55 bsiegert Exp $

+PKGREVISION=	1
 .include "Makefile.common"

 PKGNAME=	ImageMagick-${DISTVERSION}
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.295 2023/12/11 10:25:35 wiz Exp $
+$NetBSD: distinfo,v 1.295.2.1 2024/01/01 10:29:55 bsiegert Exp $

 BLAKE2s (ImageMagick-7.1.1-23.tar.xz) = 60cec98ddb54cd8b46e188c9ccb0041af3b4d99fda25ded7c9529ae17d477a1e
 SHA512 (ImageMagick-7.1.1-23.tar.xz) = a6d88de2bbecfa53af565de7df89271c85e79c77ad34be5c3bd79254286a9477a71bf847219168e4fc0b9f354378569c7788b52c75d4daab0e692825d33eac08
 Size (ImageMagick-7.1.1-23.tar.xz) = 10562660 bytes
+SHA1 (patch-MagickCore_blob.c) = 276c2ad4159fcd8a10d63b6e8b5287ff391fa503
 SHA1 (patch-ghostscript-private.h) = 98d88220cf8814f2e4841c382de5e2e9e0ae9287
--- a/graphics/ImageMagick/patches/patch-MagickCore_blob.c
+++ b/graphics/ImageMagick/patches/patch-MagickCore_blob.c
@ -0,0 +1,25 @@
+$NetBSD: patch-MagickCore_blob.c,v 1.2.2.2 2024/01/01 10:29:56 bsiegert Exp $
+
+Apply upstream commit 30274e5 to fix test failures on NetBSD.
+
+--- MagickCore/blob.c.orig	2023-12-10 20:15:36.000000000 +0000
+++ MagickCore/blob.c
+@@ -618,8 +618,7 @@ MagickExport MagickBooleanType CloseBlob
+   blob_info=image->blob;
+   if ((blob_info == (BlobInfo *) NULL) || (blob_info->type == UndefinedStream))
+     return(MagickTrue);
+-  if (SyncBlob(image) != 0)
+-    ThrowBlobException(blob_info);
+  (void) SyncBlob(image);
+   status=blob_info->status;
+   switch (blob_info->type)
+   {
+@@ -5518,6 +5517,8 @@ static int SyncBlob(const Image *image)
+   assert(image->blob != (BlobInfo *) NULL);
+   if (IsEventLogging() != MagickFalse)
+     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  if (EOFBlob(image) != 0)
+    return(0);
+   blob_info=image->blob;
+   status=0;
+   switch (blob_info->type)
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.200 2023/12/11 10:25:35 wiz Exp $
+# $NetBSD: Makefile,v 1.200.2.1 2024/01/01 10:29:56 bsiegert Exp $

+PKGREVISION=	1
 .include "../../graphics/ImageMagick/Makefile.common"

 PKGNAME=	p5-PerlMagick-${DISTVERSION}
--- a/inputmethod/ibus-mozc/Makefile
+++ b/inputmethod/ibus-mozc/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.90.2.1 2024/01/11 16:45:39 bsiegert Exp $

 PKGNAME=	ibus-${DISTNAME}
-PKGREVISION=	24
+PKGREVISION=	25

 INSTALLATION_DIRS+=	libexec share/ibus share/ibus/component \
 			share/ibus-mozc
--- a/inputmethod/mozc-elisp/Makefile
+++ b/inputmethod/mozc-elisp/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.80.2.1 2024/01/11 16:45:39 bsiegert Exp $

 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION=	25
+PKGREVISION=	26
 CATEGORIES=	inputmethod editors

 EMACS_MODULES=	base leim
--- a/inputmethod/mozc-renderer/Makefile
+++ b/inputmethod/mozc-renderer/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.71.2.1 2024/01/11 16:45:40 bsiegert Exp $

 PKGNAME=	${DISTNAME:S/mozc-/mozc-renderer-/}
-PKGREVISION=	24
+PKGREVISION=	25

 CONFLICTS+=	ibus-mozc<=1.13.1651.102

--- a/inputmethod/mozc-server/Makefile
+++ b/inputmethod/mozc-server/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.88.2.1 2024/01/11 16:45:40 bsiegert Exp $

 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION=	24
+PKGREVISION=	25

 INSTALLATION_DIRS+=	libexec

--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2023/07/18 18:22:11 nia Exp $
+# $NetBSD: Makefile.common,v 1.38.4.1 2024/01/11 16:45:40 bsiegert Exp $

 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
@ -78,13 +78,12 @@ BUILDLINK_TRANSFORM+=	rm:-Werror=char-subscripts

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		GYP_DEFINES="use_libprotobuf=1" \
 		${PYTHONBIN} build_mozc.py \
 		gyp \
 		--gypdir=${LOCALBASE}/bin

 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/protobuf/buildlink3.mk"
+#.include "../../devel/protobuf/buildlink3.mk"
 # gmock is not used yet...
 #.include "../../devel/gmock/buildlink3.mk"
 .include "../../inputmethod/zinnia/buildlink3.mk"
--- a/inputmethod/mozc-tool/Makefile
+++ b/inputmethod/mozc-tool/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.85.2.1 2024/01/11 16:45:40 bsiegert Exp $

 PKGNAME=	${DISTNAME:S/mozc-/mozc-tool-/}
-PKGREVISION=	24
+PKGREVISION=	25

 INSTALLATION_DIRS+=	libexec

--- a/inputmethod/uim-mozc/Makefile
+++ b/inputmethod/uim-mozc/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2023/11/15 18:14:43 wiz Exp $
+# $NetBSD: Makefile,v 1.71.2.1 2024/01/11 16:45:40 bsiegert Exp $

 PKGNAME=	uim-${DISTNAME}
-PKGREVISION=	23
+PKGREVISION=	24

 CONFLICTS+=	ibus-mozc<=1.13.1651.102

--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2023/12/07 20:45:56 thor Exp $
+# $NetBSD: Makefile,v 1.116.2.1 2024/01/19 20:15:33 bsiegert Exp $

-DISTNAME=	numpy-1.26.2
-PKGREVISION=	1
+DISTNAME=	numpy-1.26.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/numpy/}
@ -67,10 +66,12 @@ LDFLAGS+=		${_COMPILER_ABI_FLAG.${ABI}}
 # TODO: accelerate.framework has no pkg-config yet (see blas.buildlink3.mk).
 BLAS_ACCEPTED=		${_BLAS_TYPES}
 BLAS_C_INTERFACE=	yes
-# Yes, cblas and lapack API (not lapacke) is desired.
+# Cblas and lapack API (not lapacke) is desired.
 # Meson build uses pkg-config since 1.26.2 (or elaborate own logic not
-# suitable here).
-WHEEL_ARGS+=		-Csetup-args=-Dblas=${CBLAS_PC}
+# suitable here) and guesses for cblas if blas lib does not contain the
+# C interface. That covers netlib for us, and openblas builds serve
+# all APIs.
+WHEEL_ARGS+=		-Csetup-args=-Dblas=${BLAS_PC}
 WHEEL_ARGS+=		-Csetup-args=-Dlapack=${LAPACK_PC}

 # Remove invalid __STDC_VERSION__ setting
@ -79,7 +80,14 @@ BUILDLINK_TRANSFORM.SunOS+=	rm:-D__STDC_VERSION__=0
 pre-configure:
 	${LN} -sf ${PREFIX}/bin/cython-${PYVERSSUFFIX} ${BUILDLINK_DIR}/bin/cython

+# Files don't exist with Python 3.12, so add '-f' to ${RM}
+# (Please check if this is still necessary after updates.)
 post-install:
+	${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/command/config.py.orig
+	${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/__init__.py.orig
+	${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/g95.py.orig
+	${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/gnu.py.orig
+	${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/log.py.orig
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} f2py f2py-${PYVERSSUFFIX} || ${TRUE}

 # as of 1.26.1
--- a/math/py-numpy/PLIST
+++ b/math/py-numpy/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2023/11/21 21:58:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.45.2.1 2024/01/19 20:15:33 bsiegert Exp $
 bin/f2py-${PYVERSSUFFIX}
 ${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.txt
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
@ -666,7 +666,6 @@ ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/build_src.py
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/build_src.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/build_src.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/command/config_compiler.py
@ -709,7 +708,6 @@ ${PLIST.distutils}${PYSITELIB}/numpy/distutils/extension.py
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/extension.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/extension.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/__init__.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/__init__.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/__init__.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/__init__.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/absoft.py
@ -728,11 +726,9 @@ ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/fujitsu.py
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/fujitsu.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/fujitsu.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/g95.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/g95.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/g95.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/g95.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/gnu.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/gnu.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/gnu.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/gnu.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/fcompiler/hpux.py
@ -787,7 +783,6 @@ ${PLIST.distutils}${PYSITELIB}/numpy/distutils/line_endings.py
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/line_endings.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/line_endings.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/log.py
-${PLIST.distutils}${PYSITELIB}/numpy/distutils/log.py.orig
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/log.pyc
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/log.pyo
 ${PLIST.distutils}${PYSITELIB}/numpy/distutils/mingw/gfortran_vs2003_hack.c
@ -912,6 +907,9 @@ ${PYSITELIB}/numpy/f2py/_backends/meson.build.template
 ${PYSITELIB}/numpy/f2py/_isocbind.py
 ${PYSITELIB}/numpy/f2py/_isocbind.pyc
 ${PYSITELIB}/numpy/f2py/_isocbind.pyo
+${PYSITELIB}/numpy/f2py/_src_pyf.py
+${PYSITELIB}/numpy/f2py/_src_pyf.pyc
+${PYSITELIB}/numpy/f2py/_src_pyf.pyo
 ${PYSITELIB}/numpy/f2py/auxfuncs.py
 ${PYSITELIB}/numpy/f2py/auxfuncs.pyc
 ${PYSITELIB}/numpy/f2py/auxfuncs.pyo
@ -969,9 +967,13 @@ ${PYSITELIB}/numpy/f2py/tests/src/block_docstring/foo.f
 ${PYSITELIB}/numpy/f2py/tests/src/callback/foo.f
 ${PYSITELIB}/numpy/f2py/tests/src/callback/gh17797.f90
 ${PYSITELIB}/numpy/f2py/tests/src/callback/gh18335.f90
+${PYSITELIB}/numpy/f2py/tests/src/callback/gh25211.f
+${PYSITELIB}/numpy/f2py/tests/src/callback/gh25211.pyf
+${PYSITELIB}/numpy/f2py/tests/src/cli/gh_22819.pyf
 ${PYSITELIB}/numpy/f2py/tests/src/cli/hi77.f
 ${PYSITELIB}/numpy/f2py/tests/src/cli/hiworld.f90
 ${PYSITELIB}/numpy/f2py/tests/src/common/block.f
+${PYSITELIB}/numpy/f2py/tests/src/common/gh19161.f90
 ${PYSITELIB}/numpy/f2py/tests/src/crackfortran/accesstype.f90
 ${PYSITELIB}/numpy/f2py/tests/src/crackfortran/data_common.f
 ${PYSITELIB}/numpy/f2py/tests/src/crackfortran/data_multiplier.f
@ -1007,6 +1009,8 @@ ${PYSITELIB}/numpy/f2py/tests/src/parameter/constant_integer.f90
 ${PYSITELIB}/numpy/f2py/tests/src/parameter/constant_non_compound.f90
 ${PYSITELIB}/numpy/f2py/tests/src/parameter/constant_real.f90
 ${PYSITELIB}/numpy/f2py/tests/src/quoted_character/foo.f
+${PYSITELIB}/numpy/f2py/tests/src/regression/gh25337/data.f90
+${PYSITELIB}/numpy/f2py/tests/src/regression/gh25337/use_data.f90
 ${PYSITELIB}/numpy/f2py/tests/src/regression/inout.f90
 ${PYSITELIB}/numpy/f2py/tests/src/return_character/foo77.f
 ${PYSITELIB}/numpy/f2py/tests/src/return_character/foo90.f90
@ -1022,6 +1026,10 @@ ${PYSITELIB}/numpy/f2py/tests/src/size/foo.f90
 ${PYSITELIB}/numpy/f2py/tests/src/string/char.f90
 ${PYSITELIB}/numpy/f2py/tests/src/string/fixed_string.f90
 ${PYSITELIB}/numpy/f2py/tests/src/string/gh24008.f
+${PYSITELIB}/numpy/f2py/tests/src/string/gh24662.f90
+${PYSITELIB}/numpy/f2py/tests/src/string/gh25286.f90
+${PYSITELIB}/numpy/f2py/tests/src/string/gh25286.pyf
+${PYSITELIB}/numpy/f2py/tests/src/string/gh25286_bc.pyf
 ${PYSITELIB}/numpy/f2py/tests/src/string/scalar_string.f90
 ${PYSITELIB}/numpy/f2py/tests/src/string/string.f
 ${PYSITELIB}/numpy/f2py/tests/src/value_attrspec/gh21665.f90
@ -1079,6 +1087,9 @@ ${PYSITELIB}/numpy/f2py/tests/test_module_doc.pyo
 ${PYSITELIB}/numpy/f2py/tests/test_parameter.py
 ${PYSITELIB}/numpy/f2py/tests/test_parameter.pyc
 ${PYSITELIB}/numpy/f2py/tests/test_parameter.pyo
+${PYSITELIB}/numpy/f2py/tests/test_pyf_src.py
+${PYSITELIB}/numpy/f2py/tests/test_pyf_src.pyc
+${PYSITELIB}/numpy/f2py/tests/test_pyf_src.pyo
 ${PYSITELIB}/numpy/f2py/tests/test_quoted_character.py
 ${PYSITELIB}/numpy/f2py/tests/test_quoted_character.pyc
 ${PYSITELIB}/numpy/f2py/tests/test_quoted_character.pyo
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.86 2023/11/17 20:07:47 wiz Exp $
+$NetBSD: distinfo,v 1.86.2.1 2024/01/19 20:15:33 bsiegert Exp $

-BLAKE2s (numpy-1.26.2.tar.gz) = 413814f644d94aa71108fd724d148d0f9ae4f054f119889652c9e771340dfda2
-SHA512 (numpy-1.26.2.tar.gz) = 9986cd34dda921fbc152c3be0e39f003035787ea1e055452b9259d02c423d413080a0c7e4e19fd38d9e28f66d428719d6ebe784c24ae17249ff56494950daf4b
-Size (numpy-1.26.2.tar.gz) = 15664248 bytes
+BLAKE2s (numpy-1.26.3.tar.gz) = 9d0b23c2d8a1866ae82302a00fe0e88078dd221a78379326e49b0042fe745348
+SHA512 (numpy-1.26.3.tar.gz) = 25556b41e2db9cfc52c1dfa61b05e4fc1b7b6df3b169f365375575d1146857fdb5ff91ca1508b968c296b7a06e5c6d95e82c41cdc3561587a46d3aa178f6305d
+Size (numpy-1.26.3.tar.gz) = 15679696 bytes
+SHA1 (patch-numpy_core_code__generators_generate__numpy__api.py) = 6b2ec1ec67408b9d20ec4917356f0b725e9ea266
+SHA1 (patch-numpy_core_code__generators_generate__ufunc__api.py) = 974bb5b9507fe404a3aacda9cf4176993f74e048
 SHA1 (patch-numpy_core_include_numpy_npy__common.h) = 354e336b98f634b6298d0b1d0e85ef1a9d240bff
 SHA1 (patch-numpy_core_setup.py) = 01f90b7eb700cfa51edded31498c2de4c3850848
 SHA1 (patch-numpy_core_src_common_mem__overlap.c) = 10d65c7f8ba740ce2bae5ad47ef3162cd2c5a40b
--- a/math/py-numpy/patches/patch-numpy_core_code__generators_generatenumpyapi.py
+++ b/math/py-numpy/patches/patch-numpy_core_code__generators_generatenumpyapi.py
@ -0,0 +1,18 @@
+$NetBSD: patch-numpy_core_code__generators_generate__numpy__api.py,v 1.1.2.2 2024/01/19 20:15:33 bsiegert Exp $
+
+Do not call distutils code, for Python 3.12 compat.
+
+--- numpy/core/code_generators/generate_numpy_api.py.orig	2024-01-15 17:44:12.338306195 +0000
+++ numpy/core/code_generators/generate_numpy_api.py
+@@ -149,10 +149,7 @@ def generate_api(output_dir, force=False
+ 
+     sources = numpy_api.multiarray_api
+ 
+-    if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])):
+-        return targets
+-    else:
+-        do_generate_api(targets, sources)
+    do_generate_api(targets, sources)
+ 
+     return targets
+ 
--- a/math/py-numpy/patches/patch-numpy_core_code__generators_generateufuncapi.py
+++ b/math/py-numpy/patches/patch-numpy_core_code__generators_generateufuncapi.py
@ -0,0 +1,18 @@
+$NetBSD: patch-numpy_core_code__generators_generate__ufunc__api.py,v 1.1.2.2 2024/01/19 20:15:33 bsiegert Exp $
+
+Do not call distutils code, for Python 3.12 compat.
+
+--- numpy/core/code_generators/generate_ufunc_api.py.orig	2024-01-15 17:44:22.009704598 +0000
+++ numpy/core/code_generators/generate_ufunc_api.py
+@@ -126,10 +126,7 @@ def generate_api(output_dir, force=False
+ 
+     sources = ['ufunc_api_order.txt']
+ 
+-    if (not force and not genapi.should_rebuild(targets, sources + [__file__])):
+-        return targets
+-    else:
+-        do_generate_api(targets, sources)
+    do_generate_api(targets, sources)
+ 
+     return targets
+ 
--- a/net/bind916/Makefile
+++ b/net/bind916/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2023/11/18 04:05:50 taca Exp $
+# $NetBSD: Makefile,v 1.66.2.1 2024/02/13 16:56:43 bsiegert Exp $

 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
@ -15,7 +15,7 @@ CONFLICTS+=	host-[0-9]*

 MAKE_JOBS_SAFE=	no

-BIND_VERSION=	9.16.45
+BIND_VERSION=	9.16.48

 BUILD_DEFS+=	BIND_DIR VARBASE

--- a/net/bind916/distinfo
+++ b/net/bind916/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.52 2023/11/18 04:05:50 taca Exp $
+$NetBSD: distinfo,v 1.52.2.1 2024/02/13 16:56:43 bsiegert Exp $

-BLAKE2s (bind-9.16.45.tar.xz) = a0c434d7c31c3c975ed2892d0e94ba78b843d8d1dc5f2349f83df6ede24fd276
-SHA512 (bind-9.16.45.tar.xz) = b69d7077a9bd9b69164a034e5335a4fbd4ce5c283ae483470fa2703b2a3a73b962c6a376cfd5c367cad156bb439010edef39ab4a4b7cdc08af7dffd69e1174fe
-Size (bind-9.16.45.tar.xz) = 5127080 bytes
+BLAKE2s (bind-9.16.48.tar.xz) = e404e10f114fa98f6040137e645e22c49afd6ac259a4dd8e71aa9ae5f19d3105
+SHA512 (bind-9.16.48.tar.xz) = 83829a5045e2a29dd2b491d3ab72b545f5664023fcd4aa205a44dbb7bcc5c737b4466c0d73f124b8d88fd33c56776871a07dde1ba0530d43eec8e7304a08d353
+Size (bind-9.16.48.tar.xz) = 5131176 bytes
 SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98
 SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8
 SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
@ -27,7 +27,7 @@ SHA1 (patch-lib_dns_lookup.c) = 6c7463aca16abf6bd578aba1733a3217608a39d3
 SHA1 (patch-lib_dns_pkcs11ecdsa__link.c) = 99f386b056c5a6471f69841c41a2698d36b6b275
 SHA1 (patch-lib_dns_pkcs11eddsa__link.c) = bd887a6c8960da3a8663cdf5e955e045f16dee3f
 SHA1 (patch-lib_dns_rbt.c) = c14eff9a609e4b49aa9db18f395461cd7c8944be
-SHA1 (patch-lib_dns_rbtdb.c) = e8d61e1ba613b2a2fdcd3ff077e2e5b6ce2e45b2
+SHA1 (patch-lib_dns_rbtdb.c) = 561646a8e47df765a24b40a0ac9f3e5fc4267621
 SHA1 (patch-lib_dns_request.c) = 82560e819cba0259883da8d47618ffabead22c55
 SHA1 (patch-lib_dns_sdb.c) = ed447ec7a134e620765b25ee36124a19dfd9fab0
 SHA1 (patch-lib_dns_sdlz.c) = 4fc15a577c64501c10c144eab147e54686e80309
@ -40,7 +40,7 @@ SHA1 (patch-lib_isc_include_isc_netmgr.h) = 48ac44c6a9b81e6b442deba6c075653d3691
 SHA1 (patch-lib_isc_include_isc_socket.h) = 07c1218a500435b447d6ce458ff0055421fee05e
 SHA1 (patch-lib_isc_include_isc_types.h) = e5fcf15ee03d1d032a67f2e6d23b2e409042ab64
 SHA1 (patch-lib_isc_netmgr_netmgr-int.h) = d84993edf254605f85421fbdd2fc523255c7316d
-SHA1 (patch-lib_isc_netmgr_netmgr.c) = 3df1d37061f6ceb37e309a0dc4f782fc35863146
+SHA1 (patch-lib_isc_netmgr_netmgr.c) = b8ac7c6ef13b48cdaddb470abd4c65f9f95e613b
 SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82
 SHA1 (patch-lib_isc_siphash.c) = a6642bd91aef22afb7ec4e2e0912275371644a3f
 SHA1 (patch-lib_isc_stats.c) = 8d962fa360740770588fccf1d303d7fe22ae724b
--- a/net/bind916/patches/patch-lib_dns_rbtdb.c
+++ b/net/bind916/patches/patch-lib_dns_rbtdb.c
@ -1,11 +1,11 @@
-$NetBSD: patch-lib_dns_rbtdb.c,v 1.2 2022/04/21 14:14:46 taca Exp $
+$NetBSD: patch-lib_dns_rbtdb.c,v 1.2.14.1 2024/02/13 16:56:43 bsiegert Exp $

 * Take from NetBSD base.

--- lib/dns/rbtdb.c.orig	2022-04-11 15:28:12.000000000 +0000
+--- lib/dns/rbtdb.c.orig	2024-02-11 11:31:39.000000000 +0000
 +++ lib/dns/rbtdb.c
-@@ -2277,7 +2277,7 @@ prune_tree(isc_task_t *task, isc_event_t
- 	NODE_UNLOCK(&rbtdb->node_locks[locknum].lock, isc_rwlocktype_write);
+@@ -2327,7 +2327,7 @@ prune_tree(isc_task_t *task, isc_event_t
+ 	}
 	RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
 
 -	detach((dns_db_t **)&rbtdb);
--- a/net/bind916/patches/patch-lib_isc_netmgr_netmgr.c
+++ b/net/bind916/patches/patch-lib_isc_netmgr_netmgr.c
@ -1,19 +1,19 @@
-$NetBSD: patch-lib_isc_netmgr_netmgr.c,v 1.2 2021/10/24 06:40:28 taca Exp $
+$NetBSD: patch-lib_isc_netmgr_netmgr.c,v 1.2.18.1 2024/02/13 16:56:43 bsiegert Exp $

 * Take from NetBSD base.

--- lib/isc/netmgr/netmgr.c.orig	2021-09-07 09:37:05.000000000 +0000
+--- lib/isc/netmgr/netmgr.c.orig	2024-02-11 11:31:39.000000000 +0000
 +++ lib/isc/netmgr/netmgr.c
-@@ -373,7 +373,7 @@ isc__netmgr_create(isc_mem_t *mctx, uint
+@@ -358,7 +358,7 @@ isc__netmgr_create(isc_mem_t *mctx, uint
 		mgr->workers_running++;
 		isc_thread_create(nm_thread, &mgr->workers[i], &worker->thread);
 
-		snprintf(name, sizeof(name), "isc-net-%04zu", i);
-+		snprintf(name, sizeof(name), "net-%04zu", i);
+-		snprintf(name, sizeof(name), "isc-net-%04d", i);
+		snprintf(name, sizeof(name), "net-%04d", i);
 		isc_thread_setname(worker->thread, name);
 	}
 
-@@ -1828,6 +1828,13 @@ isc_nmhandle_getdata(isc_nmhandle_t *han
+@@ -1794,6 +1794,13 @@ isc_nmhandle_getdata(isc_nmhandle_t *han
 	return (handle->opaque);
 }
 
--- a/net/bind918/Makefile
+++ b/net/bind918/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/11/18 04:07:28 taca Exp $
+# $NetBSD: Makefile,v 1.24.2.1 2024/02/13 16:45:51 bsiegert Exp $

 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
@ -15,7 +15,7 @@ CONFLICTS+=	host-[0-9]*

 MAKE_JOBS_SAFE=	no

-BIND_VERSION=	9.18.20
+BIND_VERSION=	9.18.24

 BUILD_DEFS+=	BIND_DIR VARBASE

--- a/net/bind918/buildlink3.mk
+++ b/net/bind918/buildlink3.mk
@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+# $NetBSD: buildlink3.mk,v 1.1.10.1 2024/02/13 16:45:51 bsiegert Exp $

 BUILDLINK_TREE+=	bind

@ -6,7 +6,7 @@ BUILDLINK_TREE+=	bind
 BIND_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.bind+=	bind>=9.18.0
-BUILDLINK_ABI_DEPENDS.bind?=	bind>=9.18.30nb1
+BUILDLINK_ABI_DEPENDS.bind?=	bind>=9.18.21
 BUILDLINK_PKGSRCDIR.bind?=	../../net/bind918
 .endif # BIND_BUILDLINK3_MK

--- a/net/bind918/distinfo
+++ b/net/bind918/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2023/11/18 04:07:28 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2024/02/13 16:45:51 bsiegert Exp $

-BLAKE2s (bind-9.18.20.tar.xz) = da6374b0d437c6e816791ad972dfa0042898a356720fe0d54fdb0d2b967a0c36
-SHA512 (bind-9.18.20.tar.xz) = 1ad89e5aa3d83a3c6536c2931e2ecdf6aca0d9d2678cf45dca8b0fb37968f7ef7aedff5d351083e6b09aeee1329b8885fd06263b21f5ebcde959ef0d84a86ffb
-Size (bind-9.18.20.tar.xz) = 5506368 bytes
+BLAKE2s (bind-9.18.24.tar.xz) = be5193356fcdd06256343776425012970124d0940ff950ff31367be17b40ae9f
+SHA512 (bind-9.18.24.tar.xz) = 465f5b01570fdde5c95adfb780f54e0585814bd25baf914bb95bf5972f15a672e3e7b743a55f1804e69e17609d5a0cd66cc2bbab9174238b3c89e5ad732dc085
+Size (bind-9.18.24.tar.xz) = 5515528 bytes
 SHA1 (patch-bin_named_main.c) = 4e4a763c478f1fcecb7e65968cf6ca20dacf01f1
 SHA1 (patch-bin_named_os.c) = 5ecb0883076575d8ac5fcad68f9daad6c9be0d0b
 SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
@ -12,7 +12,7 @@ SHA1 (patch-lib_dns_byaddr.c) = 647ddaaaf040233e18d1a87d83bc2bd63d2a20e3
 SHA1 (patch-lib_dns_gssapi__link.c) = 72296598b0bdd2a57d0f38ecf1775e2898a041c6
 SHA1 (patch-lib_dns_include_dns_zone.h) = e6dfcd43430538ac2a39b217fcae0d81e4c4d163
 SHA1 (patch-lib_dns_lookup.c) = 6c7463aca16abf6bd578aba1733a3217608a39d3
-SHA1 (patch-lib_dns_rbtdb.c) = e8d61e1ba613b2a2fdcd3ff077e2e5b6ce2e45b2
+SHA1 (patch-lib_dns_rbtdb.c) = f216c1f629add101daf1cec45e1f693204beeefe
 SHA1 (patch-lib_dns_request.c) = 4a9d0409afcf9f989aa9297efb97c578b4863d9c
 SHA1 (patch-lib_dns_sdb.c) = ed447ec7a134e620765b25ee36124a19dfd9fab0
 SHA1 (patch-lib_dns_sdlz.c) = 4fc15a577c64501c10c144eab147e54686e80309
@ -22,7 +22,7 @@ SHA1 (patch-lib_dns_zone.c) = cd7bc1e76caf1d664393efa318786c2b33c000de
 SHA1 (patch-lib_isc_include_isc_netmgr.h) = 48ac44c6a9b81e6b442deba6c075653d3691464b
 SHA1 (patch-lib_isc_net.c) = 743de2701fa96ef25e5689f40e381628cff641d5
 SHA1 (patch-lib_isc_netmgr_netmgr-int.h) = d84993edf254605f85421fbdd2fc523255c7316d
-SHA1 (patch-lib_isc_netmgr_netmgr.c) = 3df1d37061f6ceb37e309a0dc4f782fc35863146
+SHA1 (patch-lib_isc_netmgr_netmgr.c) = 0e94f78e0f6ac43197883adac7828a3f0d04291c
 SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82
 SHA1 (patch-lib_isc_siphash.c) = 2dd80dde7bd8e869a3cf03c1699665b56eaaf866
 SHA1 (patch-lib_isc_time.c) = 22780fd25d89a0ece46ec1624b3977ca4c46281a
--- a/net/bind918/patches/patch-lib_dns_rbtdb.c
+++ b/net/bind918/patches/patch-lib_dns_rbtdb.c
@ -1,11 +1,11 @@
-$NetBSD: patch-lib_dns_rbtdb.c,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+$NetBSD: patch-lib_dns_rbtdb.c,v 1.1.10.1 2024/02/13 16:45:51 bsiegert Exp $

 * Take from NetBSD base.

--- lib/dns/rbtdb.c.orig	2022-04-11 15:28:12.000000000 +0000
+--- lib/dns/rbtdb.c.orig	2024-02-11 10:42:55.656990155 +0000
 +++ lib/dns/rbtdb.c
-@@ -2277,7 +2277,7 @@ prune_tree(isc_task_t *task, isc_event_t
- 	NODE_UNLOCK(&rbtdb->node_locks[locknum].lock, isc_rwlocktype_write);
+@@ -2234,7 +2234,7 @@ prune_tree(isc_task_t *task, isc_event_t
+ 	}
 	RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
 
 -	detach((dns_db_t **)&rbtdb);
--- a/net/bind918/patches/patch-lib_isc_netmgr_netmgr.c
+++ b/net/bind918/patches/patch-lib_isc_netmgr_netmgr.c
@ -1,19 +1,19 @@
-$NetBSD: patch-lib_isc_netmgr_netmgr.c,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+$NetBSD: patch-lib_isc_netmgr_netmgr.c,v 1.1.10.1 2024/02/13 16:45:51 bsiegert Exp $

 * Take from NetBSD base.

--- lib/isc/netmgr/netmgr.c.orig	2021-09-07 09:37:05.000000000 +0000
+--- lib/isc/netmgr/netmgr.c.orig	2024-02-11 10:42:55.700991300 +0000
 +++ lib/isc/netmgr/netmgr.c
-@@ -373,7 +373,7 @@ isc__netmgr_create(isc_mem_t *mctx, uint
+@@ -314,7 +314,7 @@ isc__netmgr_create(isc_mem_t *mctx, uint
 		mgr->workers_running++;
 		isc_thread_create(nm_thread, &mgr->workers[i], &worker->thread);
 
-		snprintf(name, sizeof(name), "isc-net-%04zu", i);
-+		snprintf(name, sizeof(name), "net-%04zu", i);
+-		snprintf(name, sizeof(name), "isc-net-%04d", i);
+		snprintf(name, sizeof(name), "net-%04d", i);
 		isc_thread_setname(worker->thread, name);
 	}
 
-@@ -1828,6 +1828,13 @@ isc_nmhandle_getdata(isc_nmhandle_t *han
+@@ -1910,6 +1910,13 @@ isc_nmhandle_getdata(isc_nmhandle_t *han
 	return (handle->opaque);
 }
 
--- a/net/libfetch/Makefile
+++ b/net/libfetch/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2023/10/24 22:10:22 wiz Exp $
+# $NetBSD: Makefile,v 1.64.2.1 2024/01/13 12:49:09 bsiegert Exp $

 DISTNAME=	libfetch-2.39
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
--- a/net/libfetch/files/common.c
+++ b/net/libfetch/files/common.c
@ -1,4 +1,4 @@
-/*	$NetBSD: common.c,v 1.31 2016/10/20 21:25:57 joerg Exp $	*/
+/*	$NetBSD: common.c,v 1.31.58.1 2024/01/13 12:49:09 bsiegert Exp $	*/
 /*-
 * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
 * Copyright (c) 2008, 2010 Joerg Sonnenberger <joerg@NetBSD.org>
@ -37,6 +37,10 @@
 #include <nbcompat.h>
 #endif

+#ifdef __NetBSD__
+#include <sys/param.h>		/* __NetBSD_Version__ */
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@ -451,6 +455,12 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose)
 	conn->ssl_meth = SSLv23_client_method();
 	conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth);
 	SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY);
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 1000000000
+	if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
+		SSL_CTX_set_default_verify_paths(conn->ssl_ctx);
+		SSL_CTX_set_verify(conn->ssl_ctx, SSL_VERIFY_PEER, NULL);
+	}
+#endif

 	conn->ssl = SSL_new(conn->ssl_ctx);
 	if (conn->ssl == NULL){
--- a/net/libfetch/files/fetch.3
+++ b/net/libfetch/files/fetch.3
@ -25,9 +25,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: fetch.3,v 1.64 2007/12/18 11:03:26 des Exp $
-.\" $NetBSD: fetch.3,v 1.17 2016/05/31 18:02:36 abhinav Exp $
+.\" $NetBSD: fetch.3,v 1.17.62.1 2024/01/13 12:49:09 bsiegert Exp $
 .\"
-.Dd January 22, 2010
+.Dd December 22, 2023
 .Dt FETCH 3
 .Os
 .Sh NAME
@ -638,6 +638,10 @@ which proxies should not be used.
 Same as
 .Ev NO_PROXY ,
 for compatibility.
+.It Ev SSL_NO_VERIFY_PEER
+If defined,
+.Nm
+will skip validating certificates when fetching HTTPS URLs.
 .El
 .Sh EXAMPLES
 To access a proxy server on
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.237 2023/10/24 22:10:40 wiz Exp $
+# $NetBSD: Makefile,v 1.237.2.1 2024/01/13 12:49:09 bsiegert Exp $

 # Notes to package maintainers:
 #
@ -7,7 +7,7 @@
 # change in the pkg_* tools that pkgsrc relies on for proper operation.

 PKGNAME=		pkg_install-${VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		pkgtools

 MAINTAINER=		agc@NetBSD.org
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2023/11/08 13:20:39 wiz Exp $
+# $NetBSD: Makefile,v 1.128.2.1 2024/01/13 12:49:09 bsiegert Exp $

 DISTNAME=		pkgin-23.8.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		pkgtools
 MASTER_SITES=		${MASTER_SITE_GITHUB:=NetBSDfr/}
 GITHUB_TAG=		v${PKGVERSION_NOREV}
--- a/security/libfido2/Makefile
+++ b/security/libfido2/Makefile
@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2023/12/07 12:35:46 adam Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2024/03/01 17:29:55 bsiegert Exp $

 DISTNAME=	libfido2-1.14.0
+PKGREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	https://developers.yubico.com/libfido2/Releases/

--- a/security/libfido2/distinfo
+++ b/security/libfido2/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2023/12/07 12:35:46 adam Exp $
+$NetBSD: distinfo,v 1.10.2.1 2024/03/01 17:29:55 bsiegert Exp $

 BLAKE2s (libfido2-1.14.0.tar.gz) = 805620349129b744d12a5103399ea70c1832b49c66a1c82b4ef89d2da9d857a3
 SHA512 (libfido2-1.14.0.tar.gz) = 83454b0db0cc8546f377d0dd59f95785fe6b73cf28e499a6182a6ece4b7bce17c3e750155262adf71f339ec0b3b6c3d3d64a07b01c8428b4b91de97ae768f0e6
 Size (libfido2-1.14.0.tar.gz) = 660289 bytes
-SHA1 (patch-CMakeLists.txt) = 7b1f8653d6d6cdd542e866754fd6eaf556277ab3
+SHA1 (patch-CMakeLists.txt) = b3bbd4ecb0cc4eac5d4b43cab2176418e1b3df03
--- a/security/libfido2/patches/patch-CMakeLists.txt
+++ b/security/libfido2/patches/patch-CMakeLists.txt
@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2023/09/01 09:56:56 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.1.4.1 2024/03/01 17:29:55 bsiegert Exp $

 Remove overzealous compiler options and let pkgsrc define the
 stack protection to use.
@ -13,15 +13,6 @@ stack protection to use.
 
 check_include_files(cbor.h HAVE_CBOR_H)
 check_include_files(endian.h HAVE_ENDIAN_H)
-@@ -123,7 +122,7 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC
- try_compile(HAVE_POSIX_IOCTL
-     "${CMAKE_CURRENT_BINARY_DIR}/posix_ioctl_check.o"
-     "${CMAKE_CURRENT_SOURCE_DIR}/openbsd-compat/posix_ioctl_check.c"
-    COMPILE_DEFINITIONS "-Werror -Woverflow -Wsign-conversion")
-+    COMPILE_DEFINITIONS "-Woverflow -Wsign-conversion")
- 
- list(APPEND CHECK_VARIABLES
- 	HAVE_ARC4RANDOM_BUF
@@ -295,7 +294,6 @@ else()
 
 	add_compile_options(-Wall)
--- a/sysutils/strace/Makefile
+++ b/sysutils/strace/Makefile
@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2022/06/28 11:36:05 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.34.12.1 2024/02/11 09:15:17 spz Exp $

 DISTNAME=		strace-4.5.15
 PKGREVISION=		16
@ -12,9 +11,6 @@ HOMEPAGE=		https://sourceforge.net/projects/strace/
 COMMENT=		Trace system calls
 LICENSE=		modified-bsd

-#			NetBSD < 3.99.16
-NOT_FOR_PLATFORM=	NetBSD-[012]*-* NetBSD-3.[0-9][._]*-* \
-			NetBSD-3.99.[0-9]-* NetBSD-3.99.1[0-5]-*
 # "not supported" according to joerg@
 NOT_FOR_PLATFORM+=	DragonFly-*-*

--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2023/11/14 14:02:59 wiz Exp $
+# $NetBSD: Makefile,v 1.88.2.1 2023/12/31 21:50:35 bsiegert Exp $

 DISTNAME=	awesome-4.3
 PKGREVISION=	14
@ -44,9 +44,18 @@ CONF_FILES=	${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua

 .include "../../lang/ruby/rubyversion.mk"
 TOOL_DEPENDS+=	${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
-TOOL_DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
 DEPENDS+=	${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi

+# Switched to ImageMagick6 to work around image conversion failures with
+# the convert tool provided by the most recent ImageMagick 7 releases.
+TOOL_DEPENDS+=	ImageMagick6-[0-9]*:../../graphics/ImageMagick6
+
+SUBST_CLASSES+=		convert
+SUBST_STAGE.convert=	pre-configure
+SUBST_MESSAGE.convert=	Fixing ImageMagick convert executable name.
+SUBST_FILES.convert+=	awesomeConfig.cmake
+SUBST_SED.convert=	-e 's|CONVERT_EXECUTABLE convert|CONVERT_EXECUTABLE convert6|'
+
 SUBST_CLASSES+=		lua
 SUBST_STAGE.lua=	pre-configure
 SUBST_MESSAGE.lua=	Fixing lua executable name.
Author	SHA1	Message	Date
bsiegert	5404bdcd00	Mention pullup ticket #6839	2024-03-05 14:24:44 +00:00
bsiegert	d0d5242e77	Pullup ticket #6839 - requested by nia editors/nano: build fix Revisions pulled up: - editors/nano/Makefile 1.107 - editors/nano/options.mk 1.7 --- Module Name: pkgsrc Committed By: nia Date: Sat Mar 2 10:33:07 UTC 2024 Modified Files: pkgsrc/editors/nano: Makefile options.mk Log Message: nano: force use of ncurses until PR pkg/57749 is resolved	2024-03-05 14:24:29 +00:00
bsiegert	968b5fcd18	Mention pullup ticket #6838	2024-03-01 18:25:04 +00:00
bsiegert	eef195d57f	Pullup ticket #6838 - requested by riastradh security/libfido2: NetBSD build fix security/libfido2: Fix NetBSD support (PR 57919) by not patching away -Werror in a critical place where the build system relies on it to detect whether ioctl argument is int or long. When the build system infers the wrong answer, it builds a libfido2 that doesn't work on NetBSD because it sends the wrong (sign-extended) ioctl commands to the kernel for USB stuff. Revisions pulled up: - security/libfido2/Makefile 1.14 - security/libfido2/distinfo 1.11 - security/libfido2/patches/patch-CMakeLists.txt 1.2 --- Module Name: pkgsrc Committed By: riastradh Date: Sat Feb 10 03:10:53 UTC 2024 Modified Files: pkgsrc/security/libfido2: Makefile distinfo pkgsrc/security/libfido2/patches: patch-CMakeLists.txt Log Message: security/libfido2: Fix NetBSD build, PR pkg/57919. Patching away -Werror may be reasonable in general, but in this case it breaks libfido2's detection of whether ioctl takes int or unsigned long on NetBSD -- without -Werror, it wrongly concludes int, and proceeds to build a libfido2 that casts every ioctl command to int first, which leads to sign extension, which leads to the wrong ioctls being passed into the kernel, which leads libfido2 to fail in any attempts to open fido devices on NetBSD.	2024-03-01 17:29:55 +00:00
bsiegert	2ca2d80bb1	Mention pullup tickets #6835 and #6836	2024-02-13 16:58:11 +00:00
bsiegert	19d9d7a606	Pullup ticket #6836 - requested by taca net/bind916: security fix Revisions pulled up: - net/bind916/Makefile 1.67-1.68 - net/bind916/distinfo 1.53 - net/bind916/patches/patch-lib_dns_rbtdb.c 1.3 - net/bind916/patches/patch-lib_isc_netmgr_netmgr.c 1.3 --- Module Name: pkgsrc Committed By: adam Date: Tue Jan 30 18:29:21 UTC 2024 Modified Files: pkgsrc/audio/libilbc: Makefile pkgsrc/audio/termusic: Makefile pkgsrc/biology/plinkseq: Makefile pkgsrc/chat/ekg: Makefile pkgsrc/chat/libgadu: Makefile buildlink3.mk pkgsrc/databases/postgresql-postgis2: Makefile pkgsrc/devel/abseil: buildlink3.mk pkgsrc/devel/compizconfig-backend-gconf: Makefile buildlink3.mk pkgsrc/devel/cre2: Makefile pkgsrc/devel/libcompizconfig: Makefile buildlink3.mk pkgsrc/devel/protobuf: Makefile buildlink3.mk pkgsrc/devel/protobuf-c: Makefile buildlink3.mk pkgsrc/devel/py-compizconfig: Makefile buildlink3.mk pkgsrc/devel/re2: Makefile buildlink3.mk pkgsrc/graphics/opencv: Makefile buildlink3.mk pkgsrc/graphics/opencv-contrib-face: Makefile buildlink3.mk pkgsrc/graphics/py-Willow: Makefile pkgsrc/inputmethod/fcitx5-mozc: Makefile pkgsrc/misc/libreoffice: Makefile pkgsrc/net/bind916: Makefile pkgsrc/net/bind918: Makefile pkgsrc/net/dnsdist: Makefile pkgsrc/net/frr: Makefile pkgsrc/net/grpc: Makefile buildlink3.mk pkgsrc/net/mosh: Makefile pkgsrc/net/py-grpcio: Makefile pkgsrc/net/py-grpcio-tools: Makefile pkgsrc/net/qt6-qtgrpc: Makefile buildlink3.mk pkgsrc/net/ratman: Makefile pkgsrc/net/unbound: Makefile pkgsrc/sysutils/collectd-grpc: Makefile pkgsrc/sysutils/collectd-pinba: Makefile pkgsrc/sysutils/collectd-riemann: Makefile pkgsrc/sysutils/collectd-write_prometheus: Makefile pkgsrc/sysutils/riemann-client: Makefile pkgsrc/wm/ccsm: Makefile Log Message: revbump for devel/abseil --- Module Name: pkgsrc Committed By: taca Date: Tue Feb 13 15:25:33 UTC 2024 Modified Files: pkgsrc/net/bind916: Makefile distinfo pkgsrc/net/bind916/patches: patch-lib_dns_rbtdb.c patch-lib_isc_netmgr_netmgr.c Log Message: net/bind916: update to 9.16.48 --- 9.16.48 released --- 6343. [bug] Fix case insensitive setting for isc_ht hashtable. [GL #4568] --- 9.16.47 released --- 6322. [security] Specific DNS answers could cause a denial-of-service condition due to DNS validation taking a long time. (CVE-2023-50387) [GL #4424] 6321. [security] Change 6315 inadvertently introduced regressions that could cause named to crash. [GL #4234] --- 9.16.46 released --- 6319. [security] Query patterns that continuously triggered cache database maintenance could exhaust all available memory on the host running named. (CVE-2023-6516) [GL #4383] 6317. [security] Restore DNS64 state when handling a serve-stale timeout. (CVE-2023-5679) [GL #4334] 6316. [security] Specific queries could trigger an assertion check with nxdomain-redirect enabled. (CVE-2023-5517) [GL #4281] 6315. [security] Speed up parsing of DNS messages with many different names. (CVE-2023-4408) [GL #4234] 6314. [bug] Address race conditions in dns_tsigkey_find(). [GL #4182] 6304. [bug] The wrong time was being used to determine what RRSIGs where to be generated when dnssec-policy was in use. [GL #4494] 6282. [func] Deprecate AES-based DNS cookies. [GL #4421]	2024-02-13 16:56:43 +00:00
bsiegert	593d794a74	Pullup ticket #6835 - requested by taca net/bind918: security fix Revisions pulled up: - net/bind918/Makefile 1.25-1.27 - net/bind918/buildlink3.mk 1.2 - net/bind918/distinfo 1.14-1.15 - net/bind918/patches/patch-lib_dns_rbtdb.c 1.2 - net/bind918/patches/patch-lib_isc_netmgr_netmgr.c 1.2 --- Module Name: pkgsrc Committed By: taca Date: Fri Jan 5 01:52:20 UTC 2024 Modified Files: pkgsrc/net/bind918: Makefile distinfo Log Message: net/bind918: update to 9.18.21 9.18.21 (2023-12-20) 6297. [bug] Improve LRU cleaning behaviour. [GL #4448] 6296. [func] The "resolver-nonbackoff-tries" and "resolver-retry-interval" options are deprecated; a warning will be logged if they are used. [GL #4405] 6294. [bug] BIND might sometimes crash after startup or re-configuration when one 'tls' entry is used multiple times to connect to remote servers due to initialisation attempts from contexts of multiple threads. That has been fixed. [GL #4464] 6290. [bug] Dig +yaml will now report "no servers could be reached" also for UDP setup failure when no other servers or tries are left. [GL #1229] 6287. [bug] Recognize escapes when reading the public key from file. [GL !8502] 6286. [bug] Dig +yaml will now report "no servers could be reached" on TCP connection failure as well as for UDP timeouts. [GL #4396] 6282. [func] Deprecate AES-based DNS cookies. [GL #4421] --- Module Name: pkgsrc Committed By: adam Date: Tue Jan 30 18:29:21 UTC 2024 Modified Files: pkgsrc/audio/libilbc: Makefile pkgsrc/audio/termusic: Makefile pkgsrc/biology/plinkseq: Makefile pkgsrc/chat/ekg: Makefile pkgsrc/chat/libgadu: Makefile buildlink3.mk pkgsrc/databases/postgresql-postgis2: Makefile pkgsrc/devel/abseil: buildlink3.mk pkgsrc/devel/compizconfig-backend-gconf: Makefile buildlink3.mk pkgsrc/devel/cre2: Makefile pkgsrc/devel/libcompizconfig: Makefile buildlink3.mk pkgsrc/devel/protobuf: Makefile buildlink3.mk pkgsrc/devel/protobuf-c: Makefile buildlink3.mk pkgsrc/devel/py-compizconfig: Makefile buildlink3.mk pkgsrc/devel/re2: Makefile buildlink3.mk pkgsrc/graphics/opencv: Makefile buildlink3.mk pkgsrc/graphics/opencv-contrib-face: Makefile buildlink3.mk pkgsrc/graphics/py-Willow: Makefile pkgsrc/inputmethod/fcitx5-mozc: Makefile pkgsrc/misc/libreoffice: Makefile pkgsrc/net/bind916: Makefile pkgsrc/net/bind918: Makefile pkgsrc/net/dnsdist: Makefile pkgsrc/net/frr: Makefile pkgsrc/net/grpc: Makefile buildlink3.mk pkgsrc/net/mosh: Makefile pkgsrc/net/py-grpcio: Makefile pkgsrc/net/py-grpcio-tools: Makefile pkgsrc/net/qt6-qtgrpc: Makefile buildlink3.mk pkgsrc/net/ratman: Makefile pkgsrc/net/unbound: Makefile pkgsrc/sysutils/collectd-grpc: Makefile pkgsrc/sysutils/collectd-pinba: Makefile pkgsrc/sysutils/collectd-riemann: Makefile pkgsrc/sysutils/collectd-write_prometheus: Makefile pkgsrc/sysutils/riemann-client: Makefile pkgsrc/wm/ccsm: Makefile Log Message: revbump for devel/abseil --- Module Name: pkgsrc Committed By: taca Date: Fri Jan 5 01:53:35 UTC 2024 Modified Files: pkgsrc/net/bind918: buildlink3.mk Log Message: net/bind918: fix BUILDLINK_ABI_DEPENDS We have 9.8.21 but not yet 9.18.30nb1. --- Module Name: pkgsrc Committed By: taca Date: Tue Feb 13 13:50:39 UTC 2024 Modified Files: pkgsrc/net/bind918: Makefile distinfo pkgsrc/net/bind918/patches: patch-lib_dns_rbtdb.c patch-lib_isc_netmgr_netmgr.c Log Message: net/bind918: update to 9.18.24 9.18.24 (2024-02-13) --- 9.18.24 released --- 6343. [bug] Fix case insensitive setting for isc_ht hashtable. [GL #4568] --- 9.18.23 released --- 6322. [security] Specific DNS answers could cause a denial-of-service condition due to DNS validation taking a long time. (CVE-2023-50387) [GL #4424] 6321. [security] Change 6315 inadvertently introduced regressions that could cause named to crash. [GL #4234] 6320. [bug] Under some circumstances, the DoT code in client mode could process more than one message at a time when that was not expected. That has been fixed. [GL #4487] --- 9.18.22 released --- 6319. [func] Limit isc_task_send() overhead for RBTDB tree pruning. [GL #4383] 6317. [security] Restore DNS64 state when handling a serve-stale timeout. (CVE-2023-5679) [GL #4334] 6316. [security] Specific queries could trigger an assertion check with nxdomain-redirect enabled. (CVE-2023-5517) [GL #4281] 6315. [security] Speed up parsing of DNS messages with many different names. (CVE-2023-4408) [GL #4234] 6314. [bug] Address race conditions in dns_tsigkey_find(). [GL #4182] 6312. [bug] Conversion from NSEC3 signed to NSEC signed could temporarily put the zone into a state where it was treated as unsigned until the NSEC chain was built. Additionally conversion from one set of NSEC3 parameters to another could also temporarily put the zone into a state where it was treated as unsigned until the new NSEC3 chain was built. [GL #1794] [GL #4495] 6310. [bug] Memory leak in zone.c:sign_zone. When named signed a zone it could leak dst_keys due to a misplaced 'continue'. [GL #4488] 6306. [func] Log more details about the cause of "not exact" errors. [GL #4500] 6304. [bug] The wrong time was being used to determine what RRSIGs where to be generated when dnssec-policy was in use. [GL #4494] 6302. [func] The "trust-anchor-telemetry" statement is no longer marked as experimental. This silences a relevant log message that was emitted even when the feature was explicitly disabled. [GL #4497] 6300. [bug] Fix statistics export to use full 64 bit signed numbers instead of truncating values to unsigned 32 bits. [GL #4467] 6299. [port] NetBSD has added 'hmac' to libc which collides with our use of 'hmac'. [GL #4478]	2024-02-13 16:45:51 +00:00
spz	da2882a12e	#6833	2024-02-11 14:54:15 +00:00
spz	1192ef3ec6	Pullup ticket #6833 - requested by bsiegert sysutils/strace: bugfix Revisions pulled up: - sysutils/strace/Makefile 1.35 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: wiz Date: Thu Jan 11 06:23:44 UTC 2024 Modified Files: pkgsrc/sysutils/strace: Makefile Log Message: strace: remove incorrect pattern that disallows NetBSD<4 NetBSD 4 has been desupported for so long, we don't need this any longer. Addresses PR 57834 by George Georgalis. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/strace/Makefile	2024-02-11 09:15:17 +00:00
bsiegert	a29dfabce3	Mention pullup ticket #6834	2024-01-19 20:16:25 +00:00
bsiegert	ba61a46b12	Pullup ticket #6834 - requested by wiz math/py-numpy: Python 3.12 build fix (via patch) Revisions pulled up: - math/py-numpy/Makefile 1.117-1.119 - math/py-numpy/PLIST 1.46 - math/py-numpy/distinfo 1.87-1.88 - math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py 1.1 - math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py 1.1	2024-01-19 20:15:33 +00:00
bsiegert	69626ca70d	Mention pullup ticket #6832	2024-01-13 12:50:39 +00:00
bsiegert	7a46218a61	Pullup ticket #6832 - requested by riastradh net/libfetch: enable HTTPS cert validation on NetBSD 10 pkgtools/pkg_install, pkgtools/pkgin: revbump (via patch) net/libfetch: Enable HTTPS certificate validation, but limit it to NetBSD>=10 for now. The switch has been flipped on for all platforms in pkgsrc-current with net/libfetch 2.40. To avoid trouble with future updates to pkgsrc-2024Q1, the attached patch -- which is limited at compile-time to NetBSD>=10 -- bumps the version to 2.39nb3 instead, so that the version in pkgsrc-2024Q1 will appear newer. See https://mail-index.netbsd.org/pkgsrc-users/2023/12/31/msg038682.html https://mail-index.netbsd.org/tech-pkg/2023/12/09/msg028590.html for discussion. (A future pullup might rip off the NetBSD>=10 bandaid, but I'd like to get this part in ASAP.)	2024-01-13 12:49:09 +00:00
bsiegert	5b8012c008	Pullup ticket #6831 - requested by ryoon inputmethod/mozc-server: build fix Revisions pulled up: - inputmethod/ibus-mozc/Makefile 1.91 - inputmethod/mozc-elisp/Makefile 1.81 - inputmethod/mozc-renderer/Makefile 1.72 - inputmethod/mozc-server/Makefile 1.89 - inputmethod/mozc-server/Makefile.common 1.39-1.40 - inputmethod/mozc-tool/Makefile 1.86 - inputmethod/uim-mozc/Makefile 1.72 --- Module Name: pkgsrc Committed By: ryoon Date: Mon Jan 1 11:53:13 UTC 2024 Modified Files: pkgsrc/inputmethod/mozc-server: Makefile.common Log Message: mozc-server: Fix build failure * Use internal protobuf and abseil. --- Module Name: pkgsrc Committed By: ryoon Date: Mon Jan 1 16:05:23 UTC 2024 Modified Files: pkgsrc/inputmethod/ibus-mozc: Makefile pkgsrc/inputmethod/mozc-elisp: Makefile pkgsrc/inputmethod/mozc-renderer: Makefile pkgsrc/inputmethod/mozc-server: Makefile Makefile.common pkgsrc/inputmethod/mozc-tool: Makefile pkgsrc/inputmethod/uim-mozc: Makefile Log Message: mozc-, ibus-mozc, uim-mozc: Remove unused protobuf dependency Bump PKGREVISION.	2024-01-11 16:45:39 +00:00
bsiegert	567083e34e	Mention pullup ticket #6830	2024-01-08 22:06:30 +00:00
bsiegert	84fdb29874	Pullup ticket #6830 - requested by wiz devel/py-setuptools: build fix (via patch) Stop fetching in install phase	2024-01-08 21:29:54 +00:00
bsiegert	6287c4f86d	Mention the first three pull-up tickets on the branch	2024-01-03 20:17:45 +00:00
bsiegert	aec2dea63e	Pullup ticket #6829 - requested by wiz devel/py-pybind11: build fix Revisions pulled up: - devel/py-pybind11/buildlink3.mk 1.5 --- Module Name: pkgsrc Committed By: tnn Date: Fri Dec 29 20:27:03 UTC 2023 Modified Files: pkgsrc/devel/py-pybind11: buildlink3.mk Log Message: py-pybind11: avoid duplicate pre-configure target in gnuradio-core	2024-01-03 20:17:17 +00:00
bsiegert	ecca5ffd11	Pullup ticket #6828 - requested by schmonz graphics/ImageMagick: bugfix Revisions pulled up: - graphics/ImageMagick/Makefile 1.334 - graphics/ImageMagick/distinfo 1.296 - graphics/ImageMagick/patches/patch-MagickCore_blob.c 1.1 - graphics/p5-PerlMagick/Makefile 1.201 --- Module Name: pkgsrc Committed By: schmonz Date: Sat Dec 30 14:24:29 UTC 2023 Modified Files: pkgsrc/graphics/ImageMagick: Makefile distinfo pkgsrc/graphics/p5-PerlMagick: Makefile Added Files: pkgsrc/graphics/ImageMagick/patches: patch-MagickCore_blob.c Log Message: {Image,p5-Perl}Magick: apply upstream fix for NetBSD test regressions.	2024-01-01 10:29:55 +00:00
bsiegert	a8e71adde7	Pullup ticket #6827 - requested by gutteridge wm/awesome: build fix Revisions pulled up: - wm/awesome/Makefile 1.89 --- Module Name: pkgsrc Committed By: gutteridge Date: Thu Dec 28 18:19:03 UTC 2023 Modified Files: pkgsrc/wm/awesome: Makefile Log Message: awesome: fix builds Switched to ImageMagick6 to work around image conversion failures with the convert tool provided by the most recent ImageMagick 7 releases.	2023-12-31 21:50:35 +00:00
gdt	536a6c37d5	doc: Add CHANGES for 2023Q4	2023-12-28 16:37:52 +00:00