On 2022/01/07 12:12, Gonzalo Rodriguez wrote:
> Hello,
>
> This is a new port for the Solokeys cli "solo":
>
> https://github.com/solokeys/solo-python
> https://solokeys.com/
>
> Attached also 2 diffs for py-click and py-fido2 to make solo work, don't
> take them as real upgrades.
It would be nice to get elasticsearch-curator updated so click could
be updated for real, this is coming up with other ports too.
Any reason why you went for 7.1 rather than 7.1.2 of click?
Unfortunately py-fido2 is a can of worms. Updating py-fido2 means
yubikey-manager needs an update to 4.x. But yubikey-manager 4.x has some
fairly big changes and doesn't work with OpenBSD as-is.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/py-fido2/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile 2 Nov 2021 00:02:17 -0000 1.6
> +++ Makefile 6 Jan 2022 18:17:01 -0000
> @@ -8,14 +8,13 @@ COMMENT = Python module to communicate
> # which in turn needs an update of py-click.
> GH_ACCOUNT = Yubico
> GH_PROJECT = python-fido2
> -GH_COMMIT = 46a0b649b9aa9af79566e6e3961021e070d98b1c
> +GH_COMMIT = 58471d4af1c09cc9fe316771d6203b4844cbc668
>
> -MODPY_EGG_VERSION = 0.8.2.dev0
> +MODPY_EGG_VERSION = 0.9.3
this should use GH_TAGNAME=0.9.3 / MODPY_EGG_VERSION=${GH_TAGNAME} or
similar.
>
> #DISTNAME = fido2-${MODPY_EGG_VERSION}
> #PKGNAME = py-${DISTNAME}
> -DISTNAME = py-fido2-0.8.2pre20200313
> -REVISION = 1
> +DISTNAME = py-fido2-0.9.3
>
> CATEGORIES = security
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/security/py-fido2/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 23 May 2020 21:55:55 -0000 1.3
> +++ distinfo 6 Jan 2022 18:17:01 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (py-fido2-0.8.2pre20200313-46a0b649.tar.gz) =
> WH4RUQ6IOeruJ8Zp0iBIaI6buEPJmdvU8mPpXXhrPu4=
> -SIZE (py-fido2-0.8.2pre20200313-46a0b649.tar.gz) = 210085
> +SHA256 (py-fido2-0.9.3-58471d4a.tar.gz) =
> IYt3dGb+Znm6esEtTQhIfU4Fjqd4yW7NU2n8/LjXylU=
> +SIZE (py-fido2-0.9.3-58471d4a.tar.gz) = 219249
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/py-fido2/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 23 May 2020 21:55:55 -0000 1.3
> +++ pkg/PLIST 6 Jan 2022 18:17:01 -0000
> @@ -1,25 +1,20 @@
> @comment $OpenBSD: PLIST,v 1.3 2020/05/23 21:55:55 sthen Exp $
> @pkgpath security/py-fido2
> lib/python${MODPY_VERSION}/site-packages/fido2/
> -lib/python${MODPY_VERSION}/site-packages/fido2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> -lib/python${MODPY_VERSION}/site-packages/fido2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> -lib/python${MODPY_VERSION}/site-packages/fido2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> -lib/python${MODPY_VERSION}/site-packages/fido2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> -lib/python${MODPY_VERSION}/site-packages/fido2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
> -lib/python${MODPY_VERSION}/site-packages/fido2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> +lib/python${MODPY_VERSION}/site-packages/fido2-0.9.4.dev0-py${MODPY_VERSION}.egg-info/
> +lib/python${MODPY_VERSION}/site-packages/fido2-0.9.4.dev0-py${MODPY_VERSION}.egg-info/PKG-INFO
> +lib/python${MODPY_VERSION}/site-packages/fido2-0.9.4.dev0-py${MODPY_VERSION}.egg-info/SOURCES.txt
> +lib/python${MODPY_VERSION}/site-packages/fido2-0.9.4.dev0-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/fido2-0.9.4.dev0-py${MODPY_VERSION}.egg-info/requires.txt
> +lib/python${MODPY_VERSION}/site-packages/fido2-0.9.4.dev0-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/fido2/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}_tpm.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}attestation.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}cbor.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}cose.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}ctap.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}ctap1.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}ctap2.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}hid.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}nfc.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}pcsc.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}rpid.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -27,34 +22,61 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}webauthn.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/fido2/${MODPY_PYCACHE}win_api.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}hidtransport.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}openbsd.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/base.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/freebsd.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/hidtransport.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/linux.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/macos.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/openbsd.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/_pyu2f/windows.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/_tpm.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/attestation.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}android.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}apple.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}packed.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}tpm.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/${MODPY_PYCACHE}u2f.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/android.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/apple.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/base.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/packed.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/tpm.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/attestation/u2f.py
> lib/python${MODPY_VERSION}/site-packages/fido2/cbor.py
> lib/python${MODPY_VERSION}/site-packages/fido2/client.py
> lib/python${MODPY_VERSION}/site-packages/fido2/cose.py
> lib/python${MODPY_VERSION}/site-packages/fido2/ctap.py
> lib/python${MODPY_VERSION}/site-packages/fido2/ctap1.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/ctap2.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/extensions.py
> -lib/python${MODPY_VERSION}/site-packages/fido2/hid.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}bio.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}blob.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}credman.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/${MODPY_PYCACHE}pin.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/base.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/bio.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/blob.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/config.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/credman.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/extensions.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/ctap2/pin.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}openbsd.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/base.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/freebsd.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/linux.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/macos.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/openbsd.py
> +lib/python${MODPY_VERSION}/site-packages/fido2/hid/windows.py
> lib/python${MODPY_VERSION}/site-packages/fido2/nfc.py
> lib/python${MODPY_VERSION}/site-packages/fido2/pcsc.py
> lib/python${MODPY_VERSION}/site-packages/fido2/public_suffix_list.dat
> @@ -67,9 +89,13 @@ share/examples/${MODPY_PY_PREFIX}fido2/
> share/examples/${MODPY_PY_PREFIX}fido2/acr122u.py
> share/examples/${MODPY_PY_PREFIX}fido2/acr122usam.py
> share/examples/${MODPY_PY_PREFIX}fido2/acr1252u.py
> +share/examples/${MODPY_PY_PREFIX}fido2/bio_enrollment.py
> +share/examples/${MODPY_PY_PREFIX}fido2/cred_blob.py
> share/examples/${MODPY_PY_PREFIX}fido2/credential.py
> share/examples/${MODPY_PY_PREFIX}fido2/get_info.py
> share/examples/${MODPY_PY_PREFIX}fido2/hmac_secret.py
> +share/examples/${MODPY_PY_PREFIX}fido2/large_blobs.py
> share/examples/${MODPY_PY_PREFIX}fido2/multi_device.py
> share/examples/${MODPY_PY_PREFIX}fido2/resident_key.py
> share/examples/${MODPY_PY_PREFIX}fido2/u2f_nfc.py
> +share/examples/${MODPY_PY_PREFIX}fido2/verify_attestation.py
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-click/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 2 Nov 2021 00:00:27 -0000 1.14
> +++ Makefile 6 Jan 2022 18:16:24 -0000
> @@ -4,10 +4,9 @@ COMMENT= command line library for Python
>
> # py-elasticsearch-curator-5.8.1 requires click <7.0; when updated to 5.8.4
> # that will allow 7.x (but not 8.x yet)
> -MODPY_EGG_VERSION=6.7
> +MODPY_EGG_VERSION=7.1
> DISTNAME= click-${MODPY_EGG_VERSION}
> PKGNAME= py-click-${MODPY_EGG_VERSION}
> -REVISION= 6
>
> CATEGORIES= devel
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-click/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 15 Apr 2017 17:25:39 -0000 1.3
> +++ distinfo 6 Jan 2022 18:16:24 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (click-6.7.tar.gz) = 8VUW30eNWlYYD7+A5o8gYBDm0WD8OfpQi2XgNf11Ews=
> -SIZE (click-6.7.tar.gz) = 279019
> +SHA256 (click-7.1.tar.gz) = SC9VLy1UUrnu/8RBZei3kN1T91vM4JmoErZeA1foYOI=
> +SIZE (click-7.1.tar.gz) = 297143
