From 0db450391811ee095a15ea148688822e51c44771 Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Mon, 9 Sep 2024 17:25:46 +0200 Subject: [PATCH 01/13] New package: python3-hidapi-0.14.0 --- srcpkgs/python3-hidapi/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/python3-hidapi/template diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template new file mode 100644 index 00000000000000..08f0622b40564c --- /dev/null +++ b/srcpkgs/python3-hidapi/template @@ -0,0 +1,25 @@ +# Template file for 'python3-hidapi' +pkgname=python3-hidapi +version=0.14.0 +revision=1 +_subver=post2 +build_style=python3-module +make_build_args="--with-system-hidapi" +hostmakedepends="python3-setuptools python3-wheel python3-Cython pkg-config" +makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel" +depends="python3 hidapi python3-setuptools" +short_desc="Cython interface to the hidapi" +maintainer="Mateusz Sylwestrzak " +license="GPL-3.0-or-later, BSD-3-Clause" +homepage="https://github.com/trezor/cython-hidapi" +distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.${_subver}.tar.gz" +checksum=6c0e97ba6b059a309d51b495a8f0d5efbcea8756b640d98b6f6bb9fdef2458ac + +if [ $CROSS_BUILD ]; then + # without the following line, the compiler complains about the lack of hidapi.h + hostmakedepends+=" hidapi-devel" +fi + +post_install() { + vlicense LICENSE-bsd.txt +} From 3ba30bd11d578f81723b3b62a14e1c68ac013c6d Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Mon, 9 Sep 2024 18:57:15 +0200 Subject: [PATCH 02/13] New package: python3-nitrokey-0.2.3 --- srcpkgs/python3-nitrokey/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-nitrokey/template diff --git a/srcpkgs/python3-nitrokey/template b/srcpkgs/python3-nitrokey/template new file mode 100644 index 00000000000000..506f15fe9287ee --- /dev/null +++ b/srcpkgs/python3-nitrokey/template @@ -0,0 +1,19 @@ +# Template file for 'python3-nitrokey' +pkgname=python3-nitrokey +version=0.2.3 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-wheel python3-poetry-core" +depends="python3-fido2 python3-requests python3-semver python3-tlv8 + python3-crcmod python3-cryptography python3-hidapi + python3-protobuf python3-pyserial python3-typing_extensions" +short_desc="Python SDK to use and configure Nitrokey devices" +maintainer="Mateusz Sylwestrzak " +license="Apache-2.0, MIT" +homepage="https://github.com/Nitrokey/nitrokey-sdk-py" +distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz" +checksum=f088362c8ef0694fc86d4c00a72148d93c2d6ab4f96d8a2581eab5e128266c4a + +post_install() { + vlicense LICENSES/MIT.txt +} From 941930e387863c924357a8826e7deefa1721ccfc Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Mon, 9 Sep 2024 21:14:30 +0200 Subject: [PATCH 03/13] New package: python3-pynitrokey-0.7.3 --- srcpkgs/python3-pynitrokey/files/LICENSE-MIT | 23 +++++++++++++++++ srcpkgs/python3-pynitrokey/template | 26 ++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 srcpkgs/python3-pynitrokey/files/LICENSE-MIT create mode 100644 srcpkgs/python3-pynitrokey/template diff --git a/srcpkgs/python3-pynitrokey/files/LICENSE-MIT b/srcpkgs/python3-pynitrokey/files/LICENSE-MIT new file mode 100644 index 00000000000000..31aa79387f27e7 --- /dev/null +++ b/srcpkgs/python3-pynitrokey/files/LICENSE-MIT @@ -0,0 +1,23 @@ +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/srcpkgs/python3-pynitrokey/template b/srcpkgs/python3-pynitrokey/template new file mode 100644 index 00000000000000..f2be9e5fb0aa3c --- /dev/null +++ b/srcpkgs/python3-pynitrokey/template @@ -0,0 +1,26 @@ +# Template file for 'python3-pynitrokey' +pkgname=python3-pynitrokey +version=0.7.3 +revision=1 +build_style=python3-pep517 +make_build_args="--skip-dependency-check" +hostmakedepends="python3-wheel python3-flit_core" +depends="python3-cffi python3-click + python3-click-aliases python3-semver python3-libusb1 + python3-crcmod python3-hidapi python3-pyserial + python3-cryptography python3-ecdsa python3-fido2 + python3-usb python3-requests python3-intelhex + python3-nkdfu python3-nitrokey python3-protobuf + python3-nethsm python3-pyscard libnitrokey + python3-tqdm python3-tlv8 python3-chardet" +short_desc="CLI for the Nitrokey FIDO2, Nitrokey Start, Nitrokey 3 and NetHSM" +maintainer="Mateusz Sylwestrzak " +license="Apache-2.0, MIT" +homepage="https://github.com/Nitrokey/pynitrokey" +distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz" +checksum=faccdae193896c49487502d9169a16d33b3a29461aa51882de04f1723e8eaac8 + +post_install() { + # PyPi package does not include LICENSE files + vlicense "${FILESDIR}/LICENSE-MIT" +} From 6e7275aba00e55d53726391a859d5bf9b0d6dc84 Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Mon, 9 Sep 2024 21:15:37 +0200 Subject: [PATCH 04/13] New package: python3-click-aliases-1.0.5 --- srcpkgs/python3-click-aliases/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/python3-click-aliases/template diff --git a/srcpkgs/python3-click-aliases/template b/srcpkgs/python3-click-aliases/template new file mode 100644 index 00000000000000..0fbe15313733bc --- /dev/null +++ b/srcpkgs/python3-click-aliases/template @@ -0,0 +1,17 @@ +# Template file for 'python3-click-aliases' +pkgname=python3-click-aliases +version=1.0.5 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-poetry-core python3-wheel" +depends="python3-click" +short_desc="Enable aliases for Click" +maintainer="Mateusz Sylwestrzak " +license="MIT" +homepage="https://github.com/click-contrib/click-aliases" +distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz" +checksum=e37d4cabbaad68e1c48ec0f063a59dfa15f0e7450ec901bd1ce4f4b954bc881d + +post_install() { + vlicense LICENSE +} From 99638348d2bfa7c42dec5e6f2202fd81f9c7056e Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Mon, 9 Sep 2024 21:16:43 +0200 Subject: [PATCH 05/13] New package: python3-intelhex-2.3.0 --- srcpkgs/python3-intelhex/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/python3-intelhex/template diff --git a/srcpkgs/python3-intelhex/template b/srcpkgs/python3-intelhex/template new file mode 100644 index 00000000000000..88ffc7b7a827c5 --- /dev/null +++ b/srcpkgs/python3-intelhex/template @@ -0,0 +1,17 @@ +# Template file for 'python3-intelhex' +pkgname=python3-intelhex +version=2.3.0 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3" +short_desc="Python library for Intel HEX files manipulations" +maintainer="Mateusz Sylwestrzak " +license="MIT" +homepage="https://github.com/python-intelhex/intelhex" +distfiles="${PYPI_SITE}/i/intelhex/intelhex-${version}.tar.gz" +checksum=892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093 + +post_install() { + vlicense LICENSE.txt +} From 61dee5afb958311a397d43435b49fa6fd486d7fa Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Mon, 9 Sep 2024 21:22:13 +0200 Subject: [PATCH 06/13] New package: python3-nkdfu-0.2 --- srcpkgs/python3-nkdfu/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/python3-nkdfu/template diff --git a/srcpkgs/python3-nkdfu/template b/srcpkgs/python3-nkdfu/template new file mode 100644 index 00000000000000..bd833f736d89ca --- /dev/null +++ b/srcpkgs/python3-nkdfu/template @@ -0,0 +1,13 @@ +# Template file for 'python3-nkdfu' +pkgname=python3-nkdfu +version=0.2 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-flit_core" +depends="python3-fire python3-intelhex python3-libusb1 python3-usb python3-tqdm" +short_desc="DFU tool for updating Nitrokeys' firmware" +maintainer="Mateusz Sylwestrzak " +license="GPL-2.0-only" +homepage="https://github.com/Nitrokey/nkdfu" +distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz" +checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8 From 4662a1d8d34fac8a846115fabd4c033d6ae2d049 Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Mon, 9 Sep 2024 21:23:11 +0200 Subject: [PATCH 07/13] New package: python3-tlv8-0.10.0 --- srcpkgs/python3-tlv8/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/python3-tlv8/template diff --git a/srcpkgs/python3-tlv8/template b/srcpkgs/python3-tlv8/template new file mode 100644 index 00000000000000..e218fa5684ac1c --- /dev/null +++ b/srcpkgs/python3-tlv8/template @@ -0,0 +1,13 @@ +# Template file for 'python3-tlv8' +pkgname=python3-tlv8 +version=0.10.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools" +depends="python3" +short_desc="Module to handle type-length-value (TLV)" +maintainer="Mateusz Sylwestrzak " +license="Apache-2.0" +homepage="https://github.com/jlusiardi/tlv8_python" +distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz" +checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684 From ab24c91b6f247016ab799087f655d9949bff44d8 Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Mon, 9 Sep 2024 21:24:44 +0200 Subject: [PATCH 08/13] New package: python3-fire-0.7.0 --- srcpkgs/python3-fire/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/python3-fire/template diff --git a/srcpkgs/python3-fire/template b/srcpkgs/python3-fire/template new file mode 100644 index 00000000000000..b28fcc61820492 --- /dev/null +++ b/srcpkgs/python3-fire/template @@ -0,0 +1,13 @@ +# Template file for 'python3-fire' +pkgname=python3-fire +version=0.7.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-flit_core python3-wheel" +depends="python3-six python3-termcolor" +short_desc="Library for automatically generating command line interfaces" +maintainer="Mateusz Sylwestrzak " +license="Apache-2.0" +homepage="https://github.com/google/python-fire" +distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz" +checksum=961550f07936eaf65ad1dc8360f2b2bf8408fad46abbfa4d2a3794f8d2a95cdf From 078e1dba055f971006bc0f916ef28bd2a8ffad2c Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Tue, 10 Sep 2024 18:17:20 +0200 Subject: [PATCH 09/13] python3-protobuf: update to 5.29.2 --- srcpkgs/python3-protobuf/patches/cpp17.patch | 11 --------- srcpkgs/python3-protobuf/template | 24 +++++++------------- 2 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/python3-protobuf/patches/cpp17.patch diff --git a/srcpkgs/python3-protobuf/patches/cpp17.patch b/srcpkgs/python3-protobuf/patches/cpp17.patch deleted file mode 100644 index 97b81e1bfa5ad6..00000000000000 --- a/srcpkgs/python3-protobuf/patches/cpp17.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/python/setup.py 2023-07-05 23:53:30.000000000 +0200 -+++ - 2023-07-14 16:19:35.949677747 +0200 -@@ -370,7 +370,7 @@ - extra_compile_args.append('-Wno-invalid-offsetof') - extra_compile_args.append('-Wno-sign-compare') - extra_compile_args.append('-Wno-unused-variable') -- extra_compile_args.append('-std=c++14') -+ extra_compile_args.append('-std=c++17') - - if sys.platform == 'darwin': - extra_compile_args.append('-Wno-shorten-64-to-32') diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template index 389b19b8f233ba..3456af8886a608 100644 --- a/srcpkgs/python3-protobuf/template +++ b/srcpkgs/python3-protobuf/template @@ -1,30 +1,22 @@ # Template file for 'python3-protobuf' pkgname=python3-protobuf -version=4.25.2 -revision=2 +version=5.29.2 +revision=1 build_style=python3-module -build_wrksrc=python hostmakedepends="python3-setuptools python3-wheel protobuf" +makedepends="python3-devel protobuf-devel" depends="python3-setuptools python3-six" checkdepends="python3-numpy" short_desc="Python3 bindings for Google Protocol Buffers" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://developers.google.com/protocol-buffers/" -# PyPi release does not have bits for cppext -distfiles="https://github.com/protocolbuffers/protobuf/releases/download/v${version#*.}/protobuf-${version#*.}.tar.gz" -checksum=8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871 -make_check=no # ImportError: cannot import name 'unittest_retention_pb2' from 'google.protobuf' +distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz" +checksum=b2cc8e8bb7c9326996f0e160137b0861f1a82162502658df2951209d0cb0309e -build_options="cppext" -build_options_default="cppext" -desc_option_cppext="Build C++ extension to improve performance" - -if [ "$build_option_cppext" ]; then - make_build_args="--cpp_implementation" - make_install_args="--cpp_implementation" - makedepends+=" python3-devel protobuf-devel" -fi +# upb is now the default implementation +# https://github.com/protocolbuffers/protobuf/blob/main/python/README.md#implementation-backends +# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165 post_install() { sed -n 1,29p google/protobuf/__init__.py >LICENSE From 0fb70cc16c196aa2dc91b8aea6c0eb03fe1dfd01 Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Tue, 10 Sep 2024 18:50:43 +0200 Subject: [PATCH 10/13] hidapi: update to 0.14.0 --- srcpkgs/hidapi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template index 365e8eac36cacd..66bc48f737c9b2 100644 --- a/srcpkgs/hidapi/template +++ b/srcpkgs/hidapi/template @@ -1,6 +1,6 @@ # Template file for 'hidapi' pkgname=hidapi -version=0.13.1 +version=0.14.0 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="BSD-3-Clause" homepage="https://github.com/libusb/hidapi" changelog="https://github.com/libusb/hidapi/releases" distfiles="https://github.com/libusb/hidapi/archive/refs/tags/hidapi-${version}.tar.gz" -checksum=476a2c9a4dc7d1fc97dd223b84338dbea3809a84caea2dcd887d9778725490e3 +checksum=a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd post_install() { vlicense LICENSE-bsd.txt LICENSE From 9919284da1a06d2dba9f33426f2731ba2589407b Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Tue, 10 Sep 2024 18:52:38 +0200 Subject: [PATCH 11/13] python3-ecdsa: update to 0.19.0 --- srcpkgs/python3-ecdsa/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template index 3bb83bf7d6a124..719435d8eb3c22 100644 --- a/srcpkgs/python3-ecdsa/template +++ b/srcpkgs/python3-ecdsa/template @@ -1,7 +1,7 @@ # Template file for 'python3-ecdsa' pkgname=python3-ecdsa -version=0.18.0 -revision=2 +version=0.19.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/tlsfuzzer/python-ecdsa/" distfiles="https://github.com/tlsfuzzer/python-ecdsa/archive/python-ecdsa-${version}.tar.gz" -checksum=5d33bcc7c45be2d0bf0bd7d3a1e6502fac16efde1b69bc988c9a3ee7680c17d7 +checksum=1ba39e8358eaeebef1ba2a772db619528375ddf3fe0e1b20e43372d7d5ab3f77 do_check() { coverage run --branch -m pytest src/ecdsa From 8fe7420b39795ae61a954e5a01a2b1d20d329144 Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Tue, 10 Sep 2024 19:30:11 +0200 Subject: [PATCH 12/13] New package: python3-nethsm-1.2.1 --- srcpkgs/python3-nethsm/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/python3-nethsm/template diff --git a/srcpkgs/python3-nethsm/template b/srcpkgs/python3-nethsm/template new file mode 100644 index 00000000000000..9e01b4084a1163 --- /dev/null +++ b/srcpkgs/python3-nethsm/template @@ -0,0 +1,13 @@ +# Template file for 'python3-nethsm' +pkgname=python3-nethsm +version=1.2.1 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-flit_core" +depends="python3-certifi python3-cryptography python3-dateutil python3-typing_extensions python3-urllib3" +short_desc="Python Library to manage NetHSM(s)" +maintainer="Mateusz Sylwestrzak " +license="Apache-2.0" +homepage="https://github.com/Nitrokey/nethsm-sdk-py" +distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz" +checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001 From 906d786c7f23d4280cfbcd096645f58f55886cb7 Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Fri, 10 Jan 2025 19:01:21 +0100 Subject: [PATCH 13/13] python3-fido2: update to 1.2.0 --- srcpkgs/python3-fido2/patches/system-psl.patch | 6 +++--- srcpkgs/python3-fido2/template | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-fido2/patches/system-psl.patch b/srcpkgs/python3-fido2/patches/system-psl.patch index 147e585c0b7fd7..fb404397076511 100644 --- a/srcpkgs/python3-fido2/patches/system-psl.patch +++ b/srcpkgs/python3-fido2/patches/system-psl.patch @@ -1,6 +1,6 @@ ---- a/fido2/rpid.py -+++ b/fido2/rpid.py -@@ -41,7 +41,7 @@ import os +--- a/fido2/rpid.py 2024-11-27 09:52:04.615311400 +0100 ++++ b/fido2/rpid.py 2025-01-10 18:55:19.727647195 +0100 +@@ -41,7 +41,7 @@ from urllib.parse import urlparse diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template index c50ff8ab319c10..445f23f2f41b54 100644 --- a/srcpkgs/python3-fido2/template +++ b/srcpkgs/python3-fido2/template @@ -1,8 +1,8 @@ # Template file for 'python3-fido2' pkgname=python3-fido2 _pkgname=fido2 -version=1.1.2 -revision=2 +version=1.2.0 +revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-six python3-cryptography python3-pyscard" @@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-2-Clause, Apache-2.0" homepage="https://github.com/Yubico/python-fido2" distfiles="${PYPI_SITE}/f/${_pkgname}/${_pkgname}-${version}.tar.gz" -checksum=6110d913106f76199201b32d262b2857562cc46ba1d0b9c51fbce30dc936c573 +checksum=e39f95920122d64283fda5e5581d95a206e704fa42846bfa4662f86aa0d3333b post_extract() { rm -f fido2/public_suffix_list.dat