* [PR PATCH] New package: python3-pynitrokey-0.5.0
@ 2024-09-16 19:42 slymattz
2024-09-16 20:04 ` [PR PATCH] [Updated] " slymattz
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: slymattz @ 2024-09-16 19:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1659 bytes --]
There is a new pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240
New package: python3-pynitrokey-0.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (I've tested 0.5.0 rc1 with Nitrokey 3 and I'm now testing the proper release).
#### Changes when compared to the previous release
pynitrokey requires far fewer dependencies than 0.4.50. It should also work on any platform unlike version 0.4.50 where cmsis-pack-manager was restricted to x86. I know it's not a common practice to close a PR and open another but I've decided to close https://github.com/void-linux/void-packages/pull/52002 because of how much these two differ.
I've also decided to go with the PyPi packages as I've heard they are preferred to GH releases.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-glibc (crossbuild)
- armv7l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 25263 bytes --]
From 670ef73477a8b9cc7f05e1f78b97a0859e44a936 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/17] New package: python3-hidapi-0.14.0
---
srcpkgs/python3-hidapi/patches/5cc527e4.patch | 40 +++++++++++++++++++
srcpkgs/python3-hidapi/template | 24 +++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/python3-hidapi/patches/5cc527e4.patch
create mode 100644 srcpkgs/python3-hidapi/template
diff --git a/srcpkgs/python3-hidapi/patches/5cc527e4.patch b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
new file mode 100644
index 00000000000000..92835c9df8c7ba
--- /dev/null
+++ b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
@@ -0,0 +1,40 @@
+From 5cc527e4cc6fb82bed718cc9f0cdc7e47b61bb9c Mon Sep 17 00:00:00 2001
+From: Shawn Hoffman <godisgovernment@gmail.com>
+Date: Mon, 11 Sep 2023 17:27:52 -0700
+Subject: [PATCH] use pyxdep file to locate chid.pxd
+
+---
+ hid.pyxdep | 1 +
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 hid.pyxdep
+
+diff --git a/hid.pyxdep b/hid.pyxdep
+new file mode 100644
+index 0000000..7480bc8
+--- /dev/null
++++ b/hid.pyxdep
+@@ -0,0 +1 @@
++chid.pxd
+diff --git a/setup.py b/setup.py
+index 4c311ba..73066b0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@
+ hidapi_include = os.path.join(hidapi_topdir, "hidapi")
+ system_hidapi = 0
+ libs = []
+-src = ["hid.pyx", "chid.pxd"]
++src = ["hid.pyx"]
+
+
+ def hidapi_src(platform):
+@@ -42,7 +42,7 @@ def hidapi_src(platform):
+ )
+ )
+ libs = ["udev", "rt"]
+- src = ["hidraw.pyx", "chid.pxd"]
++ src = ["hidraw.pyx"]
+ if system_hidapi == 1:
+ libs.append("hidapi-hidraw")
+ else:
diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..c303fe3a3adc41
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi --without-libusb"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.tar.gz"
+checksum=a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be
+
+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 ea79b9c00fdba75fe35f3dd286e12e9190650f95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:45:11 +0200
Subject: [PATCH 02/17] New package: python3-poetry-plugin-export-1.8.0
---
srcpkgs/python3-poetry-plugin-export/template | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-poetry-plugin-export/template
diff --git a/srcpkgs/python3-poetry-plugin-export/template b/srcpkgs/python3-poetry-plugin-export/template
new file mode 100644
index 00000000000000..a180731e4e77c3
--- /dev/null
+++ b/srcpkgs/python3-poetry-plugin-export/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poetry-plugin-export'
+pkgname=python3-poetry-plugin-export
+version=1.8.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+# This plugin depends on poetry, but poetry depends on it as well.
+# Poetry is therefore not listed to avoid a cyclic dependecy.
+# See: https://github.com/python-poetry/poetry/pull/5980
+short_desc="Poetry plugin to export the dependencies to various formats"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/poetry-plugin-export"
+distfiles="${PYPI_SITE}/p/poetry_plugin_export/poetry_plugin_export-${version}.tar.gz"
+checksum=1fa6168a85d59395d835ca564bc19862a7c76061e60c3e7dfaec70d50937fc61
+
+post_install() {
+ vlicense LICENSE
+}
From e758cf895a5d96fb714864d08cd62a2b7c05fe60 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:56:57 +0200
Subject: [PATCH 03/17] New package: python3-cachecontrol-0.14.0
---
srcpkgs/python3-cachecontrol/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-cachecontrol/template
diff --git a/srcpkgs/python3-cachecontrol/template b/srcpkgs/python3-cachecontrol/template
new file mode 100644
index 00000000000000..6196950bab9d8a
--- /dev/null
+++ b/srcpkgs/python3-cachecontrol/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-cachecontrol'
+pkgname=python3-cachecontrol
+version=0.14.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3-msgpack python3-requests"
+short_desc="CacheControl implements caching algorithms in httplib2"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/psf/cachecontrol"
+distfiles="${PYPI_SITE}/c/cachecontrol/cachecontrol-${version}.tar.gz"
+checksum=7db1195b41c81f8274a7bbd97c956f44e8348265a1bc7641c37dfebc39f0c938
From 90d82ac4bbda63381d62568acface0f9d73df82e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:03:56 +0200
Subject: [PATCH 04/17] New package: python3-cleo-2.1.0
---
srcpkgs/python3-cleo/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-cleo/template
diff --git a/srcpkgs/python3-cleo/template b/srcpkgs/python3-cleo/template
new file mode 100644
index 00000000000000..1d19736b6a2297
--- /dev/null
+++ b/srcpkgs/python3-cleo/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-cleo'
+pkgname=python3-cleo
+version=2.1.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-crashtest python3-rapidfuzz"
+short_desc="Create beautiful and testable command-line interfaces"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/cleo"
+distfiles="${PYPI_SITE}/c/cleo/cleo-${version}.tar.gz"
+checksum=0b2c880b5d13660a7ea651001fb4acb527696c01f15c9ee650f377aa543fd523
+
+post_install() {
+ vlicense LICENSE
+}
From 6686b5b5225287a56b9314518e7519213b58b901 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:27:39 +0200
Subject: [PATCH 05/17] New package: python3-crashtest-0.4.1
---
srcpkgs/python3-crashtest/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-crashtest/template
diff --git a/srcpkgs/python3-crashtest/template b/srcpkgs/python3-crashtest/template
new file mode 100644
index 00000000000000..85519e9b23c1a0
--- /dev/null
+++ b/srcpkgs/python3-crashtest/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-crashtest'
+pkgname=python3-crashtest
+version=0.4.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-poetry-core"
+depends="python3"
+short_desc="Manage Python errors with ease"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/sdispater/crashtest"
+distfiles="${PYPI_SITE}/c/crashtest/crashtest-${version}.tar.gz"
+checksum=80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce
+
+post_install() {
+ vlicense LICENSE
+}
From 1514902e99421e86d02118076ec84ee023f86a42 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:40:57 +0200
Subject: [PATCH 06/17] New package: poetry-1.8.3
---
srcpkgs/poetry/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/poetry/template
diff --git a/srcpkgs/poetry/template b/srcpkgs/poetry/template
new file mode 100644
index 00000000000000..1c4b84d9aa71f3
--- /dev/null
+++ b/srcpkgs/poetry/template
@@ -0,0 +1,24 @@
+# Template file for 'poetry'
+pkgname=poetry
+version=1.8.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-poetry-core python3-poetry-plugin-export
+ python3-build python3-cachecontrol python3-cleo
+ python3-crashtest python3-dulwich python3-fastjsonschema
+ python3-installer python3-keyring python3-packaging
+ python3-pexpect python3-pkginfo python3-platformdirs
+ python3-pyproject-hooks python3-requests
+ python3-requests-toolbelt python3-shellingham
+ python3-tomlkit python3-trove-classifiers python3-virtualenv"
+short_desc="Python3 dependency management and packaging system"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://python-poetry.org"
+distfiles="${PYPI_SITE}/p/poetry/poetry-${version}.tar.gz"
+checksum=67f4eb68288eab41e841cc71a00d26cf6bdda9533022d0189a145a34d0a35f48
+
+post_install() {
+ vlicense LICENSE
+}
From 075ff1895eefe055dde2210e639956018e4c03f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 07/17] New package: python3-nitrokey-0.2.0
---
srcpkgs/python3-nitrokey/template | 21 +++++++++++++++++++++
1 file changed, 21 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..e53cae1f655618
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="poetry"
+depends="python3"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=a167e1cbb323d549eb0bbd06edfa64978ab8b86d0276f3b4047c1f258b33477d
+
+do_build() {
+ poetry build
+}
+
+post_install() {
+ vlicense LICENSES/MIT.txt
+}
From c7e8b61c0fc66153464ef9a0680bf53e81f0f6c9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 08/17] New package: python3-pynitrokey-0.5.0
---
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..bd3577dac3f803
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.5.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-certifi python3-cffi python3-click
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-intelhex python3-nkdfu python3-nitrokey
+ python3-dateutil python3-usb python3-requests
+ python3-tqdm python3-tlv8 python3-typing_extensions
+ python3-click-aliases python3-semver python3-libusb1
+ python3-protobuf python3-nethsm python3-chardet
+ python3-crcmod python3-hidapi python3-pyserial libnitrokey"
+short_desc="Python Library for Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=f1a794f9c05a202cb5d3a8d45d1105f5436294752d64b7d93b1cf327672be8d9
+
+post_install() {
+ # PyPi package does not include LICENSE files
+ vlicense "${FILESDIR}/LICENSE-MIT"
+}
From b8bb0a065abd2263d9b95883c808021dfff69ea5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 09/17] New package: python3-click-aliases-1.0.4
---
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..58525800ae6599
--- /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.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+ vlicense LICENSE
+}
From 8e8e1885c1ac4b15da27df1c9fedc258da0293e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 10/17] 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 <slymattz@gmail.com>"
+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 6857ae9435f4cd25d214ffed6ed002d0fcd39d94 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 11/17] 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..0e104519918b11
--- /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-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="https://github.com/Nitrokey/nkdfu/archive/refs/tags/v${version}.tar.gz"
+checksum=b9cd3e383a7e97372bdf26852f314014ac73a77c5f09b3c5a9426350a4af4713
From 92433ce9f12dfd229f45047082274568f25b77bd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 12/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684
From a1bdca3ae866e4abf63ca9c29fca6c927df1c721 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 13/17] New package: python3-fire-0.6.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..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66
From 78ed149edcc5a6484ef61ca885dfeeeb45974065 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 14/17] python3-protobuf: update to 5.28.0
---
srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
srcpkgs/python3-protobuf/template | 21 ++++++--------------
2 files changed, 6 insertions(+), 26 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 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
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 <orphan@voidlinux.org>"
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=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
-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
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
post_install() {
sed -n 1,29p google/protobuf/__init__.py >LICENSE
From ef93ff5960567d3523dfeef89ec8a909259141fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 15/17] 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 8e6bb07a2a7614cf274a730e438dd18632d348cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 16/17] python3-ecdsa: update to 0.19.0
---
srcpkgs/python3-ecdsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ecdsa'
pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 770fa294d42f99b217443a2680b5eedee0c2b0aa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 17/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-pynitrokey-0.5.0
2024-09-16 19:42 [PR PATCH] New package: python3-pynitrokey-0.5.0 slymattz
@ 2024-09-16 20:04 ` slymattz
2024-09-20 15:10 ` slymattz
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: slymattz @ 2024-09-16 20:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1664 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240
New package: python3-pynitrokey-0.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (I've tested 0.5.0 rc1 with Nitrokey 3 and I'm now testing the proper release).
#### Changes when compared to the previous release
pynitrokey requires far fewer dependencies than 0.4.50. It should also work on any platform unlike version 0.4.50 where cmsis-pack-manager was restricted to x86. I know it's not a common practice to close a PR and open another but I've decided to close https://github.com/void-linux/void-packages/pull/52002 because of how much these two differ.
I've also decided to go with the PyPi packages as I've heard they are preferred to GH releases.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-glibc (crossbuild)
- armv7l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 25237 bytes --]
From 670ef73477a8b9cc7f05e1f78b97a0859e44a936 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/17] New package: python3-hidapi-0.14.0
---
srcpkgs/python3-hidapi/patches/5cc527e4.patch | 40 +++++++++++++++++++
srcpkgs/python3-hidapi/template | 24 +++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/python3-hidapi/patches/5cc527e4.patch
create mode 100644 srcpkgs/python3-hidapi/template
diff --git a/srcpkgs/python3-hidapi/patches/5cc527e4.patch b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
new file mode 100644
index 00000000000000..92835c9df8c7ba
--- /dev/null
+++ b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
@@ -0,0 +1,40 @@
+From 5cc527e4cc6fb82bed718cc9f0cdc7e47b61bb9c Mon Sep 17 00:00:00 2001
+From: Shawn Hoffman <godisgovernment@gmail.com>
+Date: Mon, 11 Sep 2023 17:27:52 -0700
+Subject: [PATCH] use pyxdep file to locate chid.pxd
+
+---
+ hid.pyxdep | 1 +
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 hid.pyxdep
+
+diff --git a/hid.pyxdep b/hid.pyxdep
+new file mode 100644
+index 0000000..7480bc8
+--- /dev/null
++++ b/hid.pyxdep
+@@ -0,0 +1 @@
++chid.pxd
+diff --git a/setup.py b/setup.py
+index 4c311ba..73066b0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@
+ hidapi_include = os.path.join(hidapi_topdir, "hidapi")
+ system_hidapi = 0
+ libs = []
+-src = ["hid.pyx", "chid.pxd"]
++src = ["hid.pyx"]
+
+
+ def hidapi_src(platform):
+@@ -42,7 +42,7 @@ def hidapi_src(platform):
+ )
+ )
+ libs = ["udev", "rt"]
+- src = ["hidraw.pyx", "chid.pxd"]
++ src = ["hidraw.pyx"]
+ if system_hidapi == 1:
+ libs.append("hidapi-hidraw")
+ else:
diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..c303fe3a3adc41
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi --without-libusb"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.tar.gz"
+checksum=a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be
+
+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 ea79b9c00fdba75fe35f3dd286e12e9190650f95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:45:11 +0200
Subject: [PATCH 02/17] New package: python3-poetry-plugin-export-1.8.0
---
srcpkgs/python3-poetry-plugin-export/template | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-poetry-plugin-export/template
diff --git a/srcpkgs/python3-poetry-plugin-export/template b/srcpkgs/python3-poetry-plugin-export/template
new file mode 100644
index 00000000000000..a180731e4e77c3
--- /dev/null
+++ b/srcpkgs/python3-poetry-plugin-export/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poetry-plugin-export'
+pkgname=python3-poetry-plugin-export
+version=1.8.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+# This plugin depends on poetry, but poetry depends on it as well.
+# Poetry is therefore not listed to avoid a cyclic dependecy.
+# See: https://github.com/python-poetry/poetry/pull/5980
+short_desc="Poetry plugin to export the dependencies to various formats"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/poetry-plugin-export"
+distfiles="${PYPI_SITE}/p/poetry_plugin_export/poetry_plugin_export-${version}.tar.gz"
+checksum=1fa6168a85d59395d835ca564bc19862a7c76061e60c3e7dfaec70d50937fc61
+
+post_install() {
+ vlicense LICENSE
+}
From e758cf895a5d96fb714864d08cd62a2b7c05fe60 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:56:57 +0200
Subject: [PATCH 03/17] New package: python3-cachecontrol-0.14.0
---
srcpkgs/python3-cachecontrol/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-cachecontrol/template
diff --git a/srcpkgs/python3-cachecontrol/template b/srcpkgs/python3-cachecontrol/template
new file mode 100644
index 00000000000000..6196950bab9d8a
--- /dev/null
+++ b/srcpkgs/python3-cachecontrol/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-cachecontrol'
+pkgname=python3-cachecontrol
+version=0.14.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3-msgpack python3-requests"
+short_desc="CacheControl implements caching algorithms in httplib2"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/psf/cachecontrol"
+distfiles="${PYPI_SITE}/c/cachecontrol/cachecontrol-${version}.tar.gz"
+checksum=7db1195b41c81f8274a7bbd97c956f44e8348265a1bc7641c37dfebc39f0c938
From 90d82ac4bbda63381d62568acface0f9d73df82e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:03:56 +0200
Subject: [PATCH 04/17] New package: python3-cleo-2.1.0
---
srcpkgs/python3-cleo/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-cleo/template
diff --git a/srcpkgs/python3-cleo/template b/srcpkgs/python3-cleo/template
new file mode 100644
index 00000000000000..1d19736b6a2297
--- /dev/null
+++ b/srcpkgs/python3-cleo/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-cleo'
+pkgname=python3-cleo
+version=2.1.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-crashtest python3-rapidfuzz"
+short_desc="Create beautiful and testable command-line interfaces"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/cleo"
+distfiles="${PYPI_SITE}/c/cleo/cleo-${version}.tar.gz"
+checksum=0b2c880b5d13660a7ea651001fb4acb527696c01f15c9ee650f377aa543fd523
+
+post_install() {
+ vlicense LICENSE
+}
From 6686b5b5225287a56b9314518e7519213b58b901 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:27:39 +0200
Subject: [PATCH 05/17] New package: python3-crashtest-0.4.1
---
srcpkgs/python3-crashtest/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-crashtest/template
diff --git a/srcpkgs/python3-crashtest/template b/srcpkgs/python3-crashtest/template
new file mode 100644
index 00000000000000..85519e9b23c1a0
--- /dev/null
+++ b/srcpkgs/python3-crashtest/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-crashtest'
+pkgname=python3-crashtest
+version=0.4.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-poetry-core"
+depends="python3"
+short_desc="Manage Python errors with ease"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/sdispater/crashtest"
+distfiles="${PYPI_SITE}/c/crashtest/crashtest-${version}.tar.gz"
+checksum=80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce
+
+post_install() {
+ vlicense LICENSE
+}
From 1514902e99421e86d02118076ec84ee023f86a42 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:40:57 +0200
Subject: [PATCH 06/17] New package: poetry-1.8.3
---
srcpkgs/poetry/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/poetry/template
diff --git a/srcpkgs/poetry/template b/srcpkgs/poetry/template
new file mode 100644
index 00000000000000..1c4b84d9aa71f3
--- /dev/null
+++ b/srcpkgs/poetry/template
@@ -0,0 +1,24 @@
+# Template file for 'poetry'
+pkgname=poetry
+version=1.8.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-poetry-core python3-poetry-plugin-export
+ python3-build python3-cachecontrol python3-cleo
+ python3-crashtest python3-dulwich python3-fastjsonschema
+ python3-installer python3-keyring python3-packaging
+ python3-pexpect python3-pkginfo python3-platformdirs
+ python3-pyproject-hooks python3-requests
+ python3-requests-toolbelt python3-shellingham
+ python3-tomlkit python3-trove-classifiers python3-virtualenv"
+short_desc="Python3 dependency management and packaging system"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://python-poetry.org"
+distfiles="${PYPI_SITE}/p/poetry/poetry-${version}.tar.gz"
+checksum=67f4eb68288eab41e841cc71a00d26cf6bdda9533022d0189a145a34d0a35f48
+
+post_install() {
+ vlicense LICENSE
+}
From 075ff1895eefe055dde2210e639956018e4c03f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 07/17] New package: python3-nitrokey-0.2.0
---
srcpkgs/python3-nitrokey/template | 21 +++++++++++++++++++++
1 file changed, 21 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..e53cae1f655618
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="poetry"
+depends="python3"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=a167e1cbb323d549eb0bbd06edfa64978ab8b86d0276f3b4047c1f258b33477d
+
+do_build() {
+ poetry build
+}
+
+post_install() {
+ vlicense LICENSES/MIT.txt
+}
From c7e8b61c0fc66153464ef9a0680bf53e81f0f6c9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 08/17] New package: python3-pynitrokey-0.5.0
---
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..bd3577dac3f803
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.5.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-certifi python3-cffi python3-click
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-intelhex python3-nkdfu python3-nitrokey
+ python3-dateutil python3-usb python3-requests
+ python3-tqdm python3-tlv8 python3-typing_extensions
+ python3-click-aliases python3-semver python3-libusb1
+ python3-protobuf python3-nethsm python3-chardet
+ python3-crcmod python3-hidapi python3-pyserial libnitrokey"
+short_desc="Python Library for Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=f1a794f9c05a202cb5d3a8d45d1105f5436294752d64b7d93b1cf327672be8d9
+
+post_install() {
+ # PyPi package does not include LICENSE files
+ vlicense "${FILESDIR}/LICENSE-MIT"
+}
From b8bb0a065abd2263d9b95883c808021dfff69ea5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 09/17] New package: python3-click-aliases-1.0.4
---
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..58525800ae6599
--- /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.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+ vlicense LICENSE
+}
From 8e8e1885c1ac4b15da27df1c9fedc258da0293e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 10/17] 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 <slymattz@gmail.com>"
+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 970f2d379db0ab513e1f1b94dd0cb3f982024d17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 11/17] 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..f04a65bf8ab0f0
--- /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-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz"
+checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8
From 2f019b83ba29bf563fe80bcd21400fd39598cd1e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 12/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684
From d7d87290b37c93a3af830d8dfb0a7391cceb13a2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 13/17] New package: python3-fire-0.6.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..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66
From efabb9165c907b4e3363b329290974f3a10a7b75 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 14/17] python3-protobuf: update to 5.28.0
---
srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
srcpkgs/python3-protobuf/template | 21 ++++++--------------
2 files changed, 6 insertions(+), 26 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 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
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 <orphan@voidlinux.org>"
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=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
-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
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
post_install() {
sed -n 1,29p google/protobuf/__init__.py >LICENSE
From 641b8df18438bef792445d7ce991d487cd1fded0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 15/17] 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 e137edf04971a16a00c17e3fea253b81ad2e1771 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 16/17] python3-ecdsa: update to 0.19.0
---
srcpkgs/python3-ecdsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ecdsa'
pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 87d355efc32e545dac3869498332448b6d09d27a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 17/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-pynitrokey-0.5.0
2024-09-16 19:42 [PR PATCH] New package: python3-pynitrokey-0.5.0 slymattz
2024-09-16 20:04 ` [PR PATCH] [Updated] " slymattz
@ 2024-09-20 15:10 ` slymattz
2024-09-25 12:10 ` slymattz
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: slymattz @ 2024-09-20 15:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3043 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240
New package: python3-pynitrokey-0.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (I've tested 0.5.0 rc1 with Nitrokey 3 and I'm now testing the proper release).
#### Changes when compared to the previous release
pynitrokey requires far fewer dependencies than 0.4.50. It should also work on any platform unlike version 0.4.50 where cmsis-pack-manager was restricted to x86. I know it's not a common practice to close a PR and open another but I've decided to close https://github.com/void-linux/void-packages/pull/52002 because of how much these two differ.
I've also decided to go with the PyPi packages as I've heard they are preferred to GH releases.
#### Dependencies
1. https://github.com/Nitrokey/pynitrokey/blob/master/pyproject.toml (pyscard seems to be a non-critical dep but I'll probably add it just in case anyone needs this integration). Arch, for instance lists pyscard as an optional dep.
I wanted to check where it is used so I ran `find /usr/lib/python3.12/site-packages/pynitrokey -type f -name "*.py" | xargs grep -i "from smartcard"` and it returned:
```
/usr/lib/python3.12/site-packages/pynitrokey/cli/trussed/tests.py: from smartcard import System
/usr/lib/python3.12/site-packages/pynitrokey/cli/trussed/tests.py: from smartcard.CardConnection import CardConnection
/usr/lib/python3.12/site-packages/pynitrokey/cli/trussed/tests.py: from smartcard.Exceptions import NoCardException
```
Reference: https://pyscard.sourceforge.io/pyscard-framework.html#framework-samples
2. https://github.com/Nitrokey/nitrokey-sdk-py/blob/main/pyproject.toml
3. https://github.com/Nitrokey/nethsm-sdk-py/blob/main/pyproject.toml
Although python3-chardet is not listed anywhere, I got a warning about this module.
#### How other distros package this
I wouldn't rely on Alpine as it just bumped the version with no changes to [the deps](https://github.com/Nitrokey/pynitrokey/compare/v0.4.50...v0.5.0). I would wait for Arch to update the package and cross-examine their PKGBUILD.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-glibc (crossbuild)
- armv7l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 25255 bytes --]
From 670ef73477a8b9cc7f05e1f78b97a0859e44a936 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/17] New package: python3-hidapi-0.14.0
---
srcpkgs/python3-hidapi/patches/5cc527e4.patch | 40 +++++++++++++++++++
srcpkgs/python3-hidapi/template | 24 +++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/python3-hidapi/patches/5cc527e4.patch
create mode 100644 srcpkgs/python3-hidapi/template
diff --git a/srcpkgs/python3-hidapi/patches/5cc527e4.patch b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
new file mode 100644
index 00000000000000..92835c9df8c7ba
--- /dev/null
+++ b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
@@ -0,0 +1,40 @@
+From 5cc527e4cc6fb82bed718cc9f0cdc7e47b61bb9c Mon Sep 17 00:00:00 2001
+From: Shawn Hoffman <godisgovernment@gmail.com>
+Date: Mon, 11 Sep 2023 17:27:52 -0700
+Subject: [PATCH] use pyxdep file to locate chid.pxd
+
+---
+ hid.pyxdep | 1 +
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 hid.pyxdep
+
+diff --git a/hid.pyxdep b/hid.pyxdep
+new file mode 100644
+index 0000000..7480bc8
+--- /dev/null
++++ b/hid.pyxdep
+@@ -0,0 +1 @@
++chid.pxd
+diff --git a/setup.py b/setup.py
+index 4c311ba..73066b0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@
+ hidapi_include = os.path.join(hidapi_topdir, "hidapi")
+ system_hidapi = 0
+ libs = []
+-src = ["hid.pyx", "chid.pxd"]
++src = ["hid.pyx"]
+
+
+ def hidapi_src(platform):
+@@ -42,7 +42,7 @@ def hidapi_src(platform):
+ )
+ )
+ libs = ["udev", "rt"]
+- src = ["hidraw.pyx", "chid.pxd"]
++ src = ["hidraw.pyx"]
+ if system_hidapi == 1:
+ libs.append("hidapi-hidraw")
+ else:
diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..c303fe3a3adc41
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi --without-libusb"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.tar.gz"
+checksum=a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be
+
+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 ea79b9c00fdba75fe35f3dd286e12e9190650f95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:45:11 +0200
Subject: [PATCH 02/17] New package: python3-poetry-plugin-export-1.8.0
---
srcpkgs/python3-poetry-plugin-export/template | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-poetry-plugin-export/template
diff --git a/srcpkgs/python3-poetry-plugin-export/template b/srcpkgs/python3-poetry-plugin-export/template
new file mode 100644
index 00000000000000..a180731e4e77c3
--- /dev/null
+++ b/srcpkgs/python3-poetry-plugin-export/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poetry-plugin-export'
+pkgname=python3-poetry-plugin-export
+version=1.8.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+# This plugin depends on poetry, but poetry depends on it as well.
+# Poetry is therefore not listed to avoid a cyclic dependecy.
+# See: https://github.com/python-poetry/poetry/pull/5980
+short_desc="Poetry plugin to export the dependencies to various formats"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/poetry-plugin-export"
+distfiles="${PYPI_SITE}/p/poetry_plugin_export/poetry_plugin_export-${version}.tar.gz"
+checksum=1fa6168a85d59395d835ca564bc19862a7c76061e60c3e7dfaec70d50937fc61
+
+post_install() {
+ vlicense LICENSE
+}
From e758cf895a5d96fb714864d08cd62a2b7c05fe60 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:56:57 +0200
Subject: [PATCH 03/17] New package: python3-cachecontrol-0.14.0
---
srcpkgs/python3-cachecontrol/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-cachecontrol/template
diff --git a/srcpkgs/python3-cachecontrol/template b/srcpkgs/python3-cachecontrol/template
new file mode 100644
index 00000000000000..6196950bab9d8a
--- /dev/null
+++ b/srcpkgs/python3-cachecontrol/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-cachecontrol'
+pkgname=python3-cachecontrol
+version=0.14.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3-msgpack python3-requests"
+short_desc="CacheControl implements caching algorithms in httplib2"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/psf/cachecontrol"
+distfiles="${PYPI_SITE}/c/cachecontrol/cachecontrol-${version}.tar.gz"
+checksum=7db1195b41c81f8274a7bbd97c956f44e8348265a1bc7641c37dfebc39f0c938
From 90d82ac4bbda63381d62568acface0f9d73df82e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:03:56 +0200
Subject: [PATCH 04/17] New package: python3-cleo-2.1.0
---
srcpkgs/python3-cleo/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-cleo/template
diff --git a/srcpkgs/python3-cleo/template b/srcpkgs/python3-cleo/template
new file mode 100644
index 00000000000000..1d19736b6a2297
--- /dev/null
+++ b/srcpkgs/python3-cleo/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-cleo'
+pkgname=python3-cleo
+version=2.1.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-crashtest python3-rapidfuzz"
+short_desc="Create beautiful and testable command-line interfaces"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/cleo"
+distfiles="${PYPI_SITE}/c/cleo/cleo-${version}.tar.gz"
+checksum=0b2c880b5d13660a7ea651001fb4acb527696c01f15c9ee650f377aa543fd523
+
+post_install() {
+ vlicense LICENSE
+}
From 6686b5b5225287a56b9314518e7519213b58b901 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:27:39 +0200
Subject: [PATCH 05/17] New package: python3-crashtest-0.4.1
---
srcpkgs/python3-crashtest/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-crashtest/template
diff --git a/srcpkgs/python3-crashtest/template b/srcpkgs/python3-crashtest/template
new file mode 100644
index 00000000000000..85519e9b23c1a0
--- /dev/null
+++ b/srcpkgs/python3-crashtest/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-crashtest'
+pkgname=python3-crashtest
+version=0.4.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-poetry-core"
+depends="python3"
+short_desc="Manage Python errors with ease"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/sdispater/crashtest"
+distfiles="${PYPI_SITE}/c/crashtest/crashtest-${version}.tar.gz"
+checksum=80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce
+
+post_install() {
+ vlicense LICENSE
+}
From 1514902e99421e86d02118076ec84ee023f86a42 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:40:57 +0200
Subject: [PATCH 06/17] New package: poetry-1.8.3
---
srcpkgs/poetry/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/poetry/template
diff --git a/srcpkgs/poetry/template b/srcpkgs/poetry/template
new file mode 100644
index 00000000000000..1c4b84d9aa71f3
--- /dev/null
+++ b/srcpkgs/poetry/template
@@ -0,0 +1,24 @@
+# Template file for 'poetry'
+pkgname=poetry
+version=1.8.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-poetry-core python3-poetry-plugin-export
+ python3-build python3-cachecontrol python3-cleo
+ python3-crashtest python3-dulwich python3-fastjsonschema
+ python3-installer python3-keyring python3-packaging
+ python3-pexpect python3-pkginfo python3-platformdirs
+ python3-pyproject-hooks python3-requests
+ python3-requests-toolbelt python3-shellingham
+ python3-tomlkit python3-trove-classifiers python3-virtualenv"
+short_desc="Python3 dependency management and packaging system"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://python-poetry.org"
+distfiles="${PYPI_SITE}/p/poetry/poetry-${version}.tar.gz"
+checksum=67f4eb68288eab41e841cc71a00d26cf6bdda9533022d0189a145a34d0a35f48
+
+post_install() {
+ vlicense LICENSE
+}
From 075ff1895eefe055dde2210e639956018e4c03f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 07/17] New package: python3-nitrokey-0.2.0
---
srcpkgs/python3-nitrokey/template | 21 +++++++++++++++++++++
1 file changed, 21 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..e53cae1f655618
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="poetry"
+depends="python3"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=a167e1cbb323d549eb0bbd06edfa64978ab8b86d0276f3b4047c1f258b33477d
+
+do_build() {
+ poetry build
+}
+
+post_install() {
+ vlicense LICENSES/MIT.txt
+}
From 367ee174447019fc3c5434046cf584cd654a66c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 08/17] New package: python3-pynitrokey-0.5.0
---
srcpkgs/python3-pynitrokey/files/LICENSE-MIT | 23 +++++++++++++++++
srcpkgs/python3-pynitrokey/template | 27 ++++++++++++++++++++
2 files changed, 50 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..576966bea7bbcc
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.5.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-certifi python3-cffi python3-click
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-intelhex python3-nkdfu python3-nitrokey
+ python3-dateutil python3-usb python3-requests
+ python3-tqdm python3-tlv8 python3-typing_extensions
+ python3-click-aliases python3-semver python3-libusb1
+ python3-protobuf python3-nethsm python3-chardet
+ python3-crcmod python3-hidapi python3-pyserial
+ python3-pyscard libnitrokey"
+short_desc="Python Library for Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=f1a794f9c05a202cb5d3a8d45d1105f5436294752d64b7d93b1cf327672be8d9
+
+post_install() {
+ # PyPi package does not include LICENSE files
+ vlicense "${FILESDIR}/LICENSE-MIT"
+}
From b5130b2f78589621a19100e26d0dde20b0986c7f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 09/17] New package: python3-click-aliases-1.0.4
---
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..58525800ae6599
--- /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.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+ vlicense LICENSE
+}
From 33fc4c67e154e013c24480fdb38ae60bb607c25c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 10/17] 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 <slymattz@gmail.com>"
+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 1065199a57ddbaf3c04b87a55b8070f6c3a67875 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 11/17] 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..f04a65bf8ab0f0
--- /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-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz"
+checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8
From 3fef02374eb95c39546ea7393f174a2388134e46 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 12/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684
From c494346a400c37bba79217fc4b1dca07fb8860fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 13/17] New package: python3-fire-0.6.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..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66
From 511ac465fc2138ce3f93feb16603842da599521e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 14/17] python3-protobuf: update to 5.28.0
---
srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
srcpkgs/python3-protobuf/template | 21 ++++++--------------
2 files changed, 6 insertions(+), 26 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 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
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 <orphan@voidlinux.org>"
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=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
-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
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
post_install() {
sed -n 1,29p google/protobuf/__init__.py >LICENSE
From d2331c94a474c6a8ffef37e00192cc47db85bde7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 15/17] 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 475d10a913354f9701563a6e574b14dcd721b179 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 16/17] python3-ecdsa: update to 0.19.0
---
srcpkgs/python3-ecdsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ecdsa'
pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 b5cb62ddac42affb606a6f631c6984c093a14455 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 17/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-pynitrokey-0.5.0
2024-09-16 19:42 [PR PATCH] New package: python3-pynitrokey-0.5.0 slymattz
2024-09-16 20:04 ` [PR PATCH] [Updated] " slymattz
2024-09-20 15:10 ` slymattz
@ 2024-09-25 12:10 ` slymattz
2024-09-29 14:06 ` [PR PATCH] [Updated] New package: python3-pynitrokey-0.6.0 slymattz
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: slymattz @ 2024-09-25 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2277 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240
New package: python3-pynitrokey-0.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (I've tested 0.5.0 rc1 with Nitrokey 3 and I'm now testing the proper release).
#### Changes when compared to the previous release
pynitrokey requires far fewer dependencies than 0.4.50. It should also work on any platform unlike version 0.4.50 where cmsis-pack-manager was restricted to x86. I know it's not a common practice to close a PR and open another but I've decided to close https://github.com/void-linux/void-packages/pull/52002 because of how much these two differ.
I've also decided to go with the PyPi packages as I've heard they are preferred to GH releases.
#### Dependencies
1. https://github.com/Nitrokey/pynitrokey/blob/master/pyproject.toml
2. https://github.com/Nitrokey/nitrokey-sdk-py/blob/main/pyproject.toml
3. https://github.com/Nitrokey/nethsm-sdk-py/blob/main/pyproject.toml
Although python3-chardet is not listed anywhere, I got a warning about this module and included it.
#### How other distros package this
I wouldn't rely on Alpine as they just bumped the version with no changes to [the deps](https://github.com/Nitrokey/pynitrokey/compare/v0.4.50...v0.5.0). I would wait for Arch to update the package and cross-examine their PKGBUILD.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-glibc (crossbuild)
- armv7l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 25274 bytes --]
From 670ef73477a8b9cc7f05e1f78b97a0859e44a936 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/17] New package: python3-hidapi-0.14.0
---
srcpkgs/python3-hidapi/patches/5cc527e4.patch | 40 +++++++++++++++++++
srcpkgs/python3-hidapi/template | 24 +++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/python3-hidapi/patches/5cc527e4.patch
create mode 100644 srcpkgs/python3-hidapi/template
diff --git a/srcpkgs/python3-hidapi/patches/5cc527e4.patch b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
new file mode 100644
index 00000000000000..92835c9df8c7ba
--- /dev/null
+++ b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
@@ -0,0 +1,40 @@
+From 5cc527e4cc6fb82bed718cc9f0cdc7e47b61bb9c Mon Sep 17 00:00:00 2001
+From: Shawn Hoffman <godisgovernment@gmail.com>
+Date: Mon, 11 Sep 2023 17:27:52 -0700
+Subject: [PATCH] use pyxdep file to locate chid.pxd
+
+---
+ hid.pyxdep | 1 +
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 hid.pyxdep
+
+diff --git a/hid.pyxdep b/hid.pyxdep
+new file mode 100644
+index 0000000..7480bc8
+--- /dev/null
++++ b/hid.pyxdep
+@@ -0,0 +1 @@
++chid.pxd
+diff --git a/setup.py b/setup.py
+index 4c311ba..73066b0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@
+ hidapi_include = os.path.join(hidapi_topdir, "hidapi")
+ system_hidapi = 0
+ libs = []
+-src = ["hid.pyx", "chid.pxd"]
++src = ["hid.pyx"]
+
+
+ def hidapi_src(platform):
+@@ -42,7 +42,7 @@ def hidapi_src(platform):
+ )
+ )
+ libs = ["udev", "rt"]
+- src = ["hidraw.pyx", "chid.pxd"]
++ src = ["hidraw.pyx"]
+ if system_hidapi == 1:
+ libs.append("hidapi-hidraw")
+ else:
diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..c303fe3a3adc41
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi --without-libusb"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.tar.gz"
+checksum=a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be
+
+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 ea79b9c00fdba75fe35f3dd286e12e9190650f95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:45:11 +0200
Subject: [PATCH 02/17] New package: python3-poetry-plugin-export-1.8.0
---
srcpkgs/python3-poetry-plugin-export/template | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-poetry-plugin-export/template
diff --git a/srcpkgs/python3-poetry-plugin-export/template b/srcpkgs/python3-poetry-plugin-export/template
new file mode 100644
index 00000000000000..a180731e4e77c3
--- /dev/null
+++ b/srcpkgs/python3-poetry-plugin-export/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poetry-plugin-export'
+pkgname=python3-poetry-plugin-export
+version=1.8.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+# This plugin depends on poetry, but poetry depends on it as well.
+# Poetry is therefore not listed to avoid a cyclic dependecy.
+# See: https://github.com/python-poetry/poetry/pull/5980
+short_desc="Poetry plugin to export the dependencies to various formats"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/poetry-plugin-export"
+distfiles="${PYPI_SITE}/p/poetry_plugin_export/poetry_plugin_export-${version}.tar.gz"
+checksum=1fa6168a85d59395d835ca564bc19862a7c76061e60c3e7dfaec70d50937fc61
+
+post_install() {
+ vlicense LICENSE
+}
From e758cf895a5d96fb714864d08cd62a2b7c05fe60 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:56:57 +0200
Subject: [PATCH 03/17] New package: python3-cachecontrol-0.14.0
---
srcpkgs/python3-cachecontrol/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-cachecontrol/template
diff --git a/srcpkgs/python3-cachecontrol/template b/srcpkgs/python3-cachecontrol/template
new file mode 100644
index 00000000000000..6196950bab9d8a
--- /dev/null
+++ b/srcpkgs/python3-cachecontrol/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-cachecontrol'
+pkgname=python3-cachecontrol
+version=0.14.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3-msgpack python3-requests"
+short_desc="CacheControl implements caching algorithms in httplib2"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/psf/cachecontrol"
+distfiles="${PYPI_SITE}/c/cachecontrol/cachecontrol-${version}.tar.gz"
+checksum=7db1195b41c81f8274a7bbd97c956f44e8348265a1bc7641c37dfebc39f0c938
From 90d82ac4bbda63381d62568acface0f9d73df82e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:03:56 +0200
Subject: [PATCH 04/17] New package: python3-cleo-2.1.0
---
srcpkgs/python3-cleo/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-cleo/template
diff --git a/srcpkgs/python3-cleo/template b/srcpkgs/python3-cleo/template
new file mode 100644
index 00000000000000..1d19736b6a2297
--- /dev/null
+++ b/srcpkgs/python3-cleo/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-cleo'
+pkgname=python3-cleo
+version=2.1.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-crashtest python3-rapidfuzz"
+short_desc="Create beautiful and testable command-line interfaces"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/cleo"
+distfiles="${PYPI_SITE}/c/cleo/cleo-${version}.tar.gz"
+checksum=0b2c880b5d13660a7ea651001fb4acb527696c01f15c9ee650f377aa543fd523
+
+post_install() {
+ vlicense LICENSE
+}
From 6686b5b5225287a56b9314518e7519213b58b901 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:27:39 +0200
Subject: [PATCH 05/17] New package: python3-crashtest-0.4.1
---
srcpkgs/python3-crashtest/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-crashtest/template
diff --git a/srcpkgs/python3-crashtest/template b/srcpkgs/python3-crashtest/template
new file mode 100644
index 00000000000000..85519e9b23c1a0
--- /dev/null
+++ b/srcpkgs/python3-crashtest/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-crashtest'
+pkgname=python3-crashtest
+version=0.4.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-poetry-core"
+depends="python3"
+short_desc="Manage Python errors with ease"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/sdispater/crashtest"
+distfiles="${PYPI_SITE}/c/crashtest/crashtest-${version}.tar.gz"
+checksum=80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce
+
+post_install() {
+ vlicense LICENSE
+}
From 1514902e99421e86d02118076ec84ee023f86a42 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:40:57 +0200
Subject: [PATCH 06/17] New package: poetry-1.8.3
---
srcpkgs/poetry/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/poetry/template
diff --git a/srcpkgs/poetry/template b/srcpkgs/poetry/template
new file mode 100644
index 00000000000000..1c4b84d9aa71f3
--- /dev/null
+++ b/srcpkgs/poetry/template
@@ -0,0 +1,24 @@
+# Template file for 'poetry'
+pkgname=poetry
+version=1.8.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-poetry-core python3-poetry-plugin-export
+ python3-build python3-cachecontrol python3-cleo
+ python3-crashtest python3-dulwich python3-fastjsonschema
+ python3-installer python3-keyring python3-packaging
+ python3-pexpect python3-pkginfo python3-platformdirs
+ python3-pyproject-hooks python3-requests
+ python3-requests-toolbelt python3-shellingham
+ python3-tomlkit python3-trove-classifiers python3-virtualenv"
+short_desc="Python3 dependency management and packaging system"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://python-poetry.org"
+distfiles="${PYPI_SITE}/p/poetry/poetry-${version}.tar.gz"
+checksum=67f4eb68288eab41e841cc71a00d26cf6bdda9533022d0189a145a34d0a35f48
+
+post_install() {
+ vlicense LICENSE
+}
From 075ff1895eefe055dde2210e639956018e4c03f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 07/17] New package: python3-nitrokey-0.2.0
---
srcpkgs/python3-nitrokey/template | 21 +++++++++++++++++++++
1 file changed, 21 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..e53cae1f655618
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="poetry"
+depends="python3"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=a167e1cbb323d549eb0bbd06edfa64978ab8b86d0276f3b4047c1f258b33477d
+
+do_build() {
+ poetry build
+}
+
+post_install() {
+ vlicense LICENSES/MIT.txt
+}
From a47fef962d5474edfef8e5a6a9aa2ffc28d8dd04 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 08/17] New package: python3-pynitrokey-0.6.0
---
srcpkgs/python3-pynitrokey/files/LICENSE-MIT | 23 +++++++++++++++++
srcpkgs/python3-pynitrokey/template | 27 ++++++++++++++++++++
2 files changed, 50 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..824d40ad6e30a5
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.6.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-certifi python3-cffi python3-click
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-intelhex python3-nkdfu python3-nitrokey
+ python3-dateutil python3-usb python3-requests
+ python3-tqdm python3-tlv8 python3-typing_extensions
+ python3-click-aliases python3-semver python3-libusb1
+ python3-protobuf python3-nethsm python3-chardet
+ python3-crcmod python3-hidapi python3-pyserial
+ python3-pyscard python3-asn1crypto libnitrokey"
+short_desc="Python Library for Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=a58e804ce4590cf1919e437a76c7b5b3f0f3411a699436cf00650753813b53d3
+
+post_install() {
+ # PyPi package does not include LICENSE files
+ vlicense "${FILESDIR}/LICENSE-MIT"
+}
From ef36cb8f31b67aedc81823eb12f2b2fdfffc97b9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 09/17] New package: python3-click-aliases-1.0.4
---
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..58525800ae6599
--- /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.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+ vlicense LICENSE
+}
From 6e2d09653c252f55ca905c634c1b916b2966d586 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 10/17] 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 <slymattz@gmail.com>"
+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 bd0bdd55209a9226f074ea0345b485351fd66173 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 11/17] 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..f04a65bf8ab0f0
--- /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-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz"
+checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8
From f55166707045dcd7248d48ec128394e574dc95f2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 12/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684
From 77b20d780240d61f2886adb08be56581cf429778 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 13/17] New package: python3-fire-0.6.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..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66
From bf3c037fde09eef26c606c9dea022c2f4e2e52ad Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 14/17] python3-protobuf: update to 5.28.0
---
srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
srcpkgs/python3-protobuf/template | 21 ++++++--------------
2 files changed, 6 insertions(+), 26 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 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
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 <orphan@voidlinux.org>"
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=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
-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
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
post_install() {
sed -n 1,29p google/protobuf/__init__.py >LICENSE
From eea41847232d71d4757c0d88752c867156eb4af7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 15/17] 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 b27a9745f930b59cfcacaf2309e18f90d7d3e3e7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 16/17] python3-ecdsa: update to 0.19.0
---
srcpkgs/python3-ecdsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ecdsa'
pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 40ca5d31512339800e1f435748768d2bf7f4a7ce Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 17/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-pynitrokey-0.6.0
2024-09-16 19:42 [PR PATCH] New package: python3-pynitrokey-0.5.0 slymattz
` (2 preceding siblings ...)
2024-09-25 12:10 ` slymattz
@ 2024-09-29 14:06 ` slymattz
2024-09-29 14:16 ` slymattz
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: slymattz @ 2024-09-29 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2396 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240
New package: python3-pynitrokey-0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Changes when compared to release 0.4.50
pynitrokey 0.6.0 requires far fewer dependencies than 0.4.50 thanks to the lack of spsdk and libusbsio as dependencies. It should also work on any platform unlike the previous version where cmsis-pack-manager was restricted to x86. I know it's not a common practice to close a PR and open another but I've decided to close https://github.com/void-linux/void-packages/pull/52002 because of how much these two differ.
I've also decided to go with the PyPi packages as I've heard they are preferred to GH releases.
#### Dependencies
1. https://github.com/Nitrokey/pynitrokey/blob/master/pyproject.toml
2. https://github.com/Nitrokey/nitrokey-sdk-py/blob/main/pyproject.toml
3. https://github.com/Nitrokey/nethsm-sdk-py/blob/main/pyproject.toml
Although python3-chardet is not listed anywhere, I got a warning about this module and included it.
#### How other distros package this
I wouldn't rely on Alpine as they just bumped the version with no changes to [the deps](https://github.com/Nitrokey/pynitrokey/compare/v0.4.50...v0.6.0). I would wait for Arch or any other distro to update the package and cross-examine their PKGBUILD.
Sep 29: [Arch: v. 0.6.0 already in testing](https://archlinux.org/packages/extra-testing/any/python-pynitrokey)
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-glibc (crossbuild)
- armv7l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 25282 bytes --]
From 670ef73477a8b9cc7f05e1f78b97a0859e44a936 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/17] New package: python3-hidapi-0.14.0
---
srcpkgs/python3-hidapi/patches/5cc527e4.patch | 40 +++++++++++++++++++
srcpkgs/python3-hidapi/template | 24 +++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/python3-hidapi/patches/5cc527e4.patch
create mode 100644 srcpkgs/python3-hidapi/template
diff --git a/srcpkgs/python3-hidapi/patches/5cc527e4.patch b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
new file mode 100644
index 00000000000000..92835c9df8c7ba
--- /dev/null
+++ b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
@@ -0,0 +1,40 @@
+From 5cc527e4cc6fb82bed718cc9f0cdc7e47b61bb9c Mon Sep 17 00:00:00 2001
+From: Shawn Hoffman <godisgovernment@gmail.com>
+Date: Mon, 11 Sep 2023 17:27:52 -0700
+Subject: [PATCH] use pyxdep file to locate chid.pxd
+
+---
+ hid.pyxdep | 1 +
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 hid.pyxdep
+
+diff --git a/hid.pyxdep b/hid.pyxdep
+new file mode 100644
+index 0000000..7480bc8
+--- /dev/null
++++ b/hid.pyxdep
+@@ -0,0 +1 @@
++chid.pxd
+diff --git a/setup.py b/setup.py
+index 4c311ba..73066b0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@
+ hidapi_include = os.path.join(hidapi_topdir, "hidapi")
+ system_hidapi = 0
+ libs = []
+-src = ["hid.pyx", "chid.pxd"]
++src = ["hid.pyx"]
+
+
+ def hidapi_src(platform):
+@@ -42,7 +42,7 @@ def hidapi_src(platform):
+ )
+ )
+ libs = ["udev", "rt"]
+- src = ["hidraw.pyx", "chid.pxd"]
++ src = ["hidraw.pyx"]
+ if system_hidapi == 1:
+ libs.append("hidapi-hidraw")
+ else:
diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..c303fe3a3adc41
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi --without-libusb"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.tar.gz"
+checksum=a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be
+
+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 ea79b9c00fdba75fe35f3dd286e12e9190650f95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:45:11 +0200
Subject: [PATCH 02/17] New package: python3-poetry-plugin-export-1.8.0
---
srcpkgs/python3-poetry-plugin-export/template | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-poetry-plugin-export/template
diff --git a/srcpkgs/python3-poetry-plugin-export/template b/srcpkgs/python3-poetry-plugin-export/template
new file mode 100644
index 00000000000000..a180731e4e77c3
--- /dev/null
+++ b/srcpkgs/python3-poetry-plugin-export/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poetry-plugin-export'
+pkgname=python3-poetry-plugin-export
+version=1.8.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+# This plugin depends on poetry, but poetry depends on it as well.
+# Poetry is therefore not listed to avoid a cyclic dependecy.
+# See: https://github.com/python-poetry/poetry/pull/5980
+short_desc="Poetry plugin to export the dependencies to various formats"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/poetry-plugin-export"
+distfiles="${PYPI_SITE}/p/poetry_plugin_export/poetry_plugin_export-${version}.tar.gz"
+checksum=1fa6168a85d59395d835ca564bc19862a7c76061e60c3e7dfaec70d50937fc61
+
+post_install() {
+ vlicense LICENSE
+}
From e758cf895a5d96fb714864d08cd62a2b7c05fe60 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:56:57 +0200
Subject: [PATCH 03/17] New package: python3-cachecontrol-0.14.0
---
srcpkgs/python3-cachecontrol/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-cachecontrol/template
diff --git a/srcpkgs/python3-cachecontrol/template b/srcpkgs/python3-cachecontrol/template
new file mode 100644
index 00000000000000..6196950bab9d8a
--- /dev/null
+++ b/srcpkgs/python3-cachecontrol/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-cachecontrol'
+pkgname=python3-cachecontrol
+version=0.14.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3-msgpack python3-requests"
+short_desc="CacheControl implements caching algorithms in httplib2"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/psf/cachecontrol"
+distfiles="${PYPI_SITE}/c/cachecontrol/cachecontrol-${version}.tar.gz"
+checksum=7db1195b41c81f8274a7bbd97c956f44e8348265a1bc7641c37dfebc39f0c938
From 90d82ac4bbda63381d62568acface0f9d73df82e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:03:56 +0200
Subject: [PATCH 04/17] New package: python3-cleo-2.1.0
---
srcpkgs/python3-cleo/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-cleo/template
diff --git a/srcpkgs/python3-cleo/template b/srcpkgs/python3-cleo/template
new file mode 100644
index 00000000000000..1d19736b6a2297
--- /dev/null
+++ b/srcpkgs/python3-cleo/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-cleo'
+pkgname=python3-cleo
+version=2.1.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-crashtest python3-rapidfuzz"
+short_desc="Create beautiful and testable command-line interfaces"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/python-poetry/cleo"
+distfiles="${PYPI_SITE}/c/cleo/cleo-${version}.tar.gz"
+checksum=0b2c880b5d13660a7ea651001fb4acb527696c01f15c9ee650f377aa543fd523
+
+post_install() {
+ vlicense LICENSE
+}
From 6686b5b5225287a56b9314518e7519213b58b901 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:27:39 +0200
Subject: [PATCH 05/17] New package: python3-crashtest-0.4.1
---
srcpkgs/python3-crashtest/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-crashtest/template
diff --git a/srcpkgs/python3-crashtest/template b/srcpkgs/python3-crashtest/template
new file mode 100644
index 00000000000000..85519e9b23c1a0
--- /dev/null
+++ b/srcpkgs/python3-crashtest/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-crashtest'
+pkgname=python3-crashtest
+version=0.4.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-poetry-core"
+depends="python3"
+short_desc="Manage Python errors with ease"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/sdispater/crashtest"
+distfiles="${PYPI_SITE}/c/crashtest/crashtest-${version}.tar.gz"
+checksum=80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce
+
+post_install() {
+ vlicense LICENSE
+}
From 1514902e99421e86d02118076ec84ee023f86a42 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:40:57 +0200
Subject: [PATCH 06/17] New package: poetry-1.8.3
---
srcpkgs/poetry/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/poetry/template
diff --git a/srcpkgs/poetry/template b/srcpkgs/poetry/template
new file mode 100644
index 00000000000000..1c4b84d9aa71f3
--- /dev/null
+++ b/srcpkgs/poetry/template
@@ -0,0 +1,24 @@
+# Template file for 'poetry'
+pkgname=poetry
+version=1.8.3
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-poetry-core python3-poetry-plugin-export
+ python3-build python3-cachecontrol python3-cleo
+ python3-crashtest python3-dulwich python3-fastjsonschema
+ python3-installer python3-keyring python3-packaging
+ python3-pexpect python3-pkginfo python3-platformdirs
+ python3-pyproject-hooks python3-requests
+ python3-requests-toolbelt python3-shellingham
+ python3-tomlkit python3-trove-classifiers python3-virtualenv"
+short_desc="Python3 dependency management and packaging system"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://python-poetry.org"
+distfiles="${PYPI_SITE}/p/poetry/poetry-${version}.tar.gz"
+checksum=67f4eb68288eab41e841cc71a00d26cf6bdda9533022d0189a145a34d0a35f48
+
+post_install() {
+ vlicense LICENSE
+}
From 794e4e3a565ffdc6be8f860f4c84b7a9935c849e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 07/17] New package: python3-nitrokey-0.2.0
---
srcpkgs/python3-nitrokey/template | 17 +++++++++++++++++
1 file changed, 17 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..fe7df2d3c06e96
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-poetry-core"
+depends="python3"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=a167e1cbb323d549eb0bbd06edfa64978ab8b86d0276f3b4047c1f258b33477d
+
+post_install() {
+ vlicense LICENSES/MIT.txt
+}
From 072e85a0be8b2a5031da52cde4c4296f73f12dd2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 08/17] New package: python3-pynitrokey-0.6.0
---
srcpkgs/python3-pynitrokey/files/LICENSE-MIT | 23 +++++++++++++++++
srcpkgs/python3-pynitrokey/template | 27 ++++++++++++++++++++
2 files changed, 50 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..824d40ad6e30a5
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.6.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-certifi python3-cffi python3-click
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-intelhex python3-nkdfu python3-nitrokey
+ python3-dateutil python3-usb python3-requests
+ python3-tqdm python3-tlv8 python3-typing_extensions
+ python3-click-aliases python3-semver python3-libusb1
+ python3-protobuf python3-nethsm python3-chardet
+ python3-crcmod python3-hidapi python3-pyserial
+ python3-pyscard python3-asn1crypto libnitrokey"
+short_desc="Python Library for Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=a58e804ce4590cf1919e437a76c7b5b3f0f3411a699436cf00650753813b53d3
+
+post_install() {
+ # PyPi package does not include LICENSE files
+ vlicense "${FILESDIR}/LICENSE-MIT"
+}
From 89197cc375ad86fa1110ed652772c54a121b4abf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 09/17] New package: python3-click-aliases-1.0.4
---
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..58525800ae6599
--- /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.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+ vlicense LICENSE
+}
From c6c7df7d72906fb388bc40cc4bab8db015435106 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 10/17] 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 <slymattz@gmail.com>"
+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 f516d635ebe4ad819031821e2a4656de62825a7d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 11/17] 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..f04a65bf8ab0f0
--- /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-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz"
+checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8
From 428dec954bb5ba4a16914ad3507513da1796a8b8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 12/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684
From 6703904862d95ceccbcb5d5bd25aa76cb3682814 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 13/17] New package: python3-fire-0.6.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..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66
From af6d1629700ec8a47d295114cba9e63e35136518 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 14/17] python3-protobuf: update to 5.28.0
---
srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
srcpkgs/python3-protobuf/template | 21 ++++++--------------
2 files changed, 6 insertions(+), 26 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 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
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 <orphan@voidlinux.org>"
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=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
-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
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
post_install() {
sed -n 1,29p google/protobuf/__init__.py >LICENSE
From a64f7ef0a307b851065ec309ab590fe1ca06725b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 15/17] 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 c5491f423f05ee8b15c078c026717b9b279af6d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 16/17] python3-ecdsa: update to 0.19.0
---
srcpkgs/python3-ecdsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ecdsa'
pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 9524b76b33cb2ab16f4a77a06b6f540304896253 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 17/17] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-pynitrokey-0.6.0
2024-09-16 19:42 [PR PATCH] New package: python3-pynitrokey-0.5.0 slymattz
` (3 preceding siblings ...)
2024-09-29 14:06 ` [PR PATCH] [Updated] New package: python3-pynitrokey-0.6.0 slymattz
@ 2024-09-29 14:16 ` slymattz
2024-09-29 14:53 ` slymattz
2024-09-29 15:07 ` slymattz
6 siblings, 0 replies; 8+ messages in thread
From: slymattz @ 2024-09-29 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2396 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240
New package: python3-pynitrokey-0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Changes when compared to release 0.4.50
pynitrokey 0.6.0 requires far fewer dependencies than 0.4.50 thanks to the lack of spsdk and libusbsio as dependencies. It should also work on any platform unlike the previous version where cmsis-pack-manager was restricted to x86. I know it's not a common practice to close a PR and open another but I've decided to close https://github.com/void-linux/void-packages/pull/52002 because of how much these two differ.
I've also decided to go with the PyPi packages as I've heard they are preferred to GH releases.
#### Dependencies
1. https://github.com/Nitrokey/pynitrokey/blob/master/pyproject.toml
2. https://github.com/Nitrokey/nitrokey-sdk-py/blob/main/pyproject.toml
3. https://github.com/Nitrokey/nethsm-sdk-py/blob/main/pyproject.toml
Although python3-chardet is not listed anywhere, I got a warning about this module and included it.
#### How other distros package this
I wouldn't rely on Alpine as they just bumped the version with no changes to [the deps](https://github.com/Nitrokey/pynitrokey/compare/v0.4.50...v0.6.0). I would wait for Arch or any other distro to update the package and cross-examine their PKGBUILD.
Sep 29: [Arch: v. 0.6.0 already in testing](https://archlinux.org/packages/extra-testing/any/python-pynitrokey)
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-glibc (crossbuild)
- armv7l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 18973 bytes --]
From 670ef73477a8b9cc7f05e1f78b97a0859e44a936 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/12] New package: python3-hidapi-0.14.0
---
srcpkgs/python3-hidapi/patches/5cc527e4.patch | 40 +++++++++++++++++++
srcpkgs/python3-hidapi/template | 24 +++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/python3-hidapi/patches/5cc527e4.patch
create mode 100644 srcpkgs/python3-hidapi/template
diff --git a/srcpkgs/python3-hidapi/patches/5cc527e4.patch b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
new file mode 100644
index 00000000000000..92835c9df8c7ba
--- /dev/null
+++ b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
@@ -0,0 +1,40 @@
+From 5cc527e4cc6fb82bed718cc9f0cdc7e47b61bb9c Mon Sep 17 00:00:00 2001
+From: Shawn Hoffman <godisgovernment@gmail.com>
+Date: Mon, 11 Sep 2023 17:27:52 -0700
+Subject: [PATCH] use pyxdep file to locate chid.pxd
+
+---
+ hid.pyxdep | 1 +
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 hid.pyxdep
+
+diff --git a/hid.pyxdep b/hid.pyxdep
+new file mode 100644
+index 0000000..7480bc8
+--- /dev/null
++++ b/hid.pyxdep
+@@ -0,0 +1 @@
++chid.pxd
+diff --git a/setup.py b/setup.py
+index 4c311ba..73066b0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@
+ hidapi_include = os.path.join(hidapi_topdir, "hidapi")
+ system_hidapi = 0
+ libs = []
+-src = ["hid.pyx", "chid.pxd"]
++src = ["hid.pyx"]
+
+
+ def hidapi_src(platform):
+@@ -42,7 +42,7 @@ def hidapi_src(platform):
+ )
+ )
+ libs = ["udev", "rt"]
+- src = ["hidraw.pyx", "chid.pxd"]
++ src = ["hidraw.pyx"]
+ if system_hidapi == 1:
+ libs.append("hidapi-hidraw")
+ else:
diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..c303fe3a3adc41
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi --without-libusb"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.tar.gz"
+checksum=a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be
+
+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 a6c20993b7abf8f159a1bad6f8f4d6a02453b69e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 02/12] New package: python3-nitrokey-0.2.0
---
srcpkgs/python3-nitrokey/template | 17 +++++++++++++++++
1 file changed, 17 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..fe7df2d3c06e96
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-poetry-core"
+depends="python3"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=a167e1cbb323d549eb0bbd06edfa64978ab8b86d0276f3b4047c1f258b33477d
+
+post_install() {
+ vlicense LICENSES/MIT.txt
+}
From dccfa75680bb13ce0914210563893569ced5a329 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 03/12] New package: python3-pynitrokey-0.6.0
---
srcpkgs/python3-pynitrokey/files/LICENSE-MIT | 23 +++++++++++++++++
srcpkgs/python3-pynitrokey/template | 27 ++++++++++++++++++++
2 files changed, 50 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..824d40ad6e30a5
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.6.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-certifi python3-cffi python3-click
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-intelhex python3-nkdfu python3-nitrokey
+ python3-dateutil python3-usb python3-requests
+ python3-tqdm python3-tlv8 python3-typing_extensions
+ python3-click-aliases python3-semver python3-libusb1
+ python3-protobuf python3-nethsm python3-chardet
+ python3-crcmod python3-hidapi python3-pyserial
+ python3-pyscard python3-asn1crypto libnitrokey"
+short_desc="Python Library for Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=a58e804ce4590cf1919e437a76c7b5b3f0f3411a699436cf00650753813b53d3
+
+post_install() {
+ # PyPi package does not include LICENSE files
+ vlicense "${FILESDIR}/LICENSE-MIT"
+}
From 2da0c7e5e8546a85836eeedf45562d09ccab9155 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 04/12] New package: python3-click-aliases-1.0.4
---
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..58525800ae6599
--- /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.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+ vlicense LICENSE
+}
From 39b8397fbe4859cb986d65699bdf4d7c119ab408 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 05/12] 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 <slymattz@gmail.com>"
+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 45779d5ef91683fc3a81b3c204789b0672b5f23a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 06/12] 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..f04a65bf8ab0f0
--- /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-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz"
+checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8
From 52816962ddb03085574fb6074a27093c7f1ac3c4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 07/12] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684
From c2b3495f7dbc712667ab25a44a5f5814d5181cc3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 08/12] New package: python3-fire-0.6.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..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66
From 1685e1b701f884ec2dcdb4fbcc91dc15ac3ac9e8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 09/12] python3-protobuf: update to 5.28.0
---
srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
srcpkgs/python3-protobuf/template | 21 ++++++--------------
2 files changed, 6 insertions(+), 26 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 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
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 <orphan@voidlinux.org>"
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=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
-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
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
post_install() {
sed -n 1,29p google/protobuf/__init__.py >LICENSE
From 711356c11321e5fa839a90eb7c2d51eef24c8d04 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 10/12] 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 8cb722cbb6f276a7814b7585989bcd93c7b6f8b5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 11/12] python3-ecdsa: update to 0.19.0
---
srcpkgs/python3-ecdsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ecdsa'
pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 019cdc22533ad050cf4d088e335d99ff4723e6a9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 12/12] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-pynitrokey-0.6.0
2024-09-16 19:42 [PR PATCH] New package: python3-pynitrokey-0.5.0 slymattz
` (4 preceding siblings ...)
2024-09-29 14:16 ` slymattz
@ 2024-09-29 14:53 ` slymattz
2024-09-29 15:07 ` slymattz
6 siblings, 0 replies; 8+ messages in thread
From: slymattz @ 2024-09-29 14:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2698 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240
New package: python3-pynitrokey-0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Changes when compared to release 0.4.50
pynitrokey 0.6.0 requires far fewer dependencies than 0.4.50 thanks to the lack of spsdk and libusbsio as dependencies. It should also work on any platform unlike the previous version where cmsis-pack-manager was restricted to x86. I know it's not a common practice to close a PR and open another but I've decided to close https://github.com/void-linux/void-packages/pull/52002 because of how much these two differ.
#### Dependencies
1. https://github.com/Nitrokey/pynitrokey/blob/master/pyproject.toml
2. https://github.com/Nitrokey/nitrokey-sdk-py/blob/main/pyproject.toml
3. https://github.com/Nitrokey/nethsm-sdk-py/blob/main/pyproject.toml
#### How other distros package this
Sep 29: [Arch: v. 0.6.0 is already in testing](https://archlinux.org/packages/extra-testing/any/python-pynitrokey) and it does make alterations to the dependency list just like my PR (fewer deps are now required because _python3-nitrokey_ accommodates the necessary code from some of the formerly required deps).
#### poetry not needed
Sep 29: I dropped redundant commits of the following new packages to keep it simple:
- [x] python3-poetry-plugin-export-1.8.0 (dep of poetry)
- [x] python3-cachecontrol-0.14.0 (dep of poetry)
- [x] python3-cleo-2.1.0 (dep of poetry)
- [x] python3-crashtest-0.4.1 (dep of poetry)
- [x] poetry-1.8.3
The reason being _poetry_ is not required to build _python3-nitrokey_. _python3-poetry-core_ in hostmakedepends suffices.
Although python3-chardet is not listed anywhere, I got a warning about this module and included it.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-glibc (crossbuild)
- armv7l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 19155 bytes --]
From 670ef73477a8b9cc7f05e1f78b97a0859e44a936 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/12] New package: python3-hidapi-0.14.0
---
srcpkgs/python3-hidapi/patches/5cc527e4.patch | 40 +++++++++++++++++++
srcpkgs/python3-hidapi/template | 24 +++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/python3-hidapi/patches/5cc527e4.patch
create mode 100644 srcpkgs/python3-hidapi/template
diff --git a/srcpkgs/python3-hidapi/patches/5cc527e4.patch b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
new file mode 100644
index 00000000000000..92835c9df8c7ba
--- /dev/null
+++ b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
@@ -0,0 +1,40 @@
+From 5cc527e4cc6fb82bed718cc9f0cdc7e47b61bb9c Mon Sep 17 00:00:00 2001
+From: Shawn Hoffman <godisgovernment@gmail.com>
+Date: Mon, 11 Sep 2023 17:27:52 -0700
+Subject: [PATCH] use pyxdep file to locate chid.pxd
+
+---
+ hid.pyxdep | 1 +
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 hid.pyxdep
+
+diff --git a/hid.pyxdep b/hid.pyxdep
+new file mode 100644
+index 0000000..7480bc8
+--- /dev/null
++++ b/hid.pyxdep
+@@ -0,0 +1 @@
++chid.pxd
+diff --git a/setup.py b/setup.py
+index 4c311ba..73066b0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@
+ hidapi_include = os.path.join(hidapi_topdir, "hidapi")
+ system_hidapi = 0
+ libs = []
+-src = ["hid.pyx", "chid.pxd"]
++src = ["hid.pyx"]
+
+
+ def hidapi_src(platform):
+@@ -42,7 +42,7 @@ def hidapi_src(platform):
+ )
+ )
+ libs = ["udev", "rt"]
+- src = ["hidraw.pyx", "chid.pxd"]
++ src = ["hidraw.pyx"]
+ if system_hidapi == 1:
+ libs.append("hidapi-hidraw")
+ else:
diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..c303fe3a3adc41
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi --without-libusb"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.tar.gz"
+checksum=a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be
+
+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 74058d551b665006c1d2da48b8285c70db82ff99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 02/12] New package: python3-nitrokey-0.2.0
---
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..830dd6acc11206
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.0
+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-ecdsa
+ python3-protobuf python3-pyserial python3-typing_extensions"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=a167e1cbb323d549eb0bbd06edfa64978ab8b86d0276f3b4047c1f258b33477d
+
+post_install() {
+ vlicense LICENSES/MIT.txt
+}
From cc0298f434c45a3fc3e7af64267a611890d51492 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 03/12] New package: python3-pynitrokey-0.6.0
---
srcpkgs/python3-pynitrokey/files/LICENSE-MIT | 23 +++++++++++++++++
srcpkgs/python3-pynitrokey/template | 27 ++++++++++++++++++++
2 files changed, 50 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..824d40ad6e30a5
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.6.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-certifi python3-cffi python3-click
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-intelhex python3-nkdfu python3-nitrokey
+ python3-dateutil python3-usb python3-requests
+ python3-tqdm python3-tlv8 python3-typing_extensions
+ python3-click-aliases python3-semver python3-libusb1
+ python3-protobuf python3-nethsm python3-chardet
+ python3-crcmod python3-hidapi python3-pyserial
+ python3-pyscard python3-asn1crypto libnitrokey"
+short_desc="Python Library for Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=a58e804ce4590cf1919e437a76c7b5b3f0f3411a699436cf00650753813b53d3
+
+post_install() {
+ # PyPi package does not include LICENSE files
+ vlicense "${FILESDIR}/LICENSE-MIT"
+}
From 617d5faad396f2b3eb5829ed2e3ac0c8f7935f4f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 04/12] New package: python3-click-aliases-1.0.4
---
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..58525800ae6599
--- /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.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+ vlicense LICENSE
+}
From a0238890f72823261cedf6a55eb00e8cd126c2e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 05/12] 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 <slymattz@gmail.com>"
+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 59a61f96ffc00d439d64a2827ff22216c690b91a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 06/12] 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..f04a65bf8ab0f0
--- /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-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz"
+checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8
From 13e94fda5d6a9f120d5da45c34b4ce4e4b926155 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 07/12] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684
From 66a018c41a09a0d64baa48df11e6e0bd397cce05 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 08/12] New package: python3-fire-0.6.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..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66
From 8437a8093af26430c39c99678602e417d1f07c19 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 09/12] python3-protobuf: update to 5.28.0
---
srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
srcpkgs/python3-protobuf/template | 21 ++++++--------------
2 files changed, 6 insertions(+), 26 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 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
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 <orphan@voidlinux.org>"
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=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
-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
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
post_install() {
sed -n 1,29p google/protobuf/__init__.py >LICENSE
From 1045cd9456c14d9b865a2bbdcd4d26d1429bbace Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 10/12] 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 f8aa01ffc3cbe23009bdf6d83592f5e6f51716cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 11/12] python3-ecdsa: update to 0.19.0
---
srcpkgs/python3-ecdsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ecdsa'
pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 da2b7740b2c065426161cbe6484a001760b94dab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 12/12] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] New package: python3-pynitrokey-0.6.0
2024-09-16 19:42 [PR PATCH] New package: python3-pynitrokey-0.5.0 slymattz
` (5 preceding siblings ...)
2024-09-29 14:53 ` slymattz
@ 2024-09-29 15:07 ` slymattz
6 siblings, 0 replies; 8+ messages in thread
From: slymattz @ 2024-09-29 15:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2855 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages nitrokey-0.5.0
https://github.com/void-linux/void-packages/pull/52240
New package: python3-pynitrokey-0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Changes when compared to release 0.4.50
pynitrokey 0.6.0 requires far fewer dependencies than 0.4.50 thanks to the lack of spsdk and libusbsio as dependencies. It should also work on any platform unlike the previous version where cmsis-pack-manager was restricted to x86. I know it's not a common practice to close a PR and open another but I've decided to close https://github.com/void-linux/void-packages/pull/52002 because of how much these two differ.
#### Dependencies
1. https://github.com/Nitrokey/pynitrokey/blob/master/pyproject.toml
2. https://github.com/Nitrokey/nitrokey-sdk-py/blob/main/pyproject.toml
3. https://github.com/Nitrokey/nethsm-sdk-py/blob/main/pyproject.toml
My primary base for deps were the above resources. But I also consulted Arch's PKGBUILD just to make sure no dependency has been omitted (see below).
Although _python3-chardet_ is not listed anywhere, I got a warning about this module and included it.
#### How other distros package this
Sep 29: [Arch: v. 0.6.0 is already in testing](https://archlinux.org/packages/extra-testing/any/python-pynitrokey) and it does make alterations to the dependency list just like my PR (fewer deps are now required because _python3-nitrokey_ accommodates the necessary code from some of the formerly required deps).
#### poetry not needed
Sep 29: I dropped redundant commits of the following new packages to keep it simple:
- [x] python3-poetry-plugin-export-1.8.0 (dep of poetry)
- [x] python3-cachecontrol-0.14.0 (dep of poetry)
- [x] python3-cleo-2.1.0 (dep of poetry)
- [x] python3-crashtest-0.4.1 (dep of poetry)
- [x] poetry-1.8.3
The reason being _poetry_ is not required to build _python3-nitrokey_. _python3-poetry-core_ in hostmakedepends suffices.
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-glibc (crossbuild)
- armv7l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/52240.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nitrokey-0.5.0-52240.patch --]
[-- Type: text/x-diff, Size: 19185 bytes --]
From 670ef73477a8b9cc7f05e1f78b97a0859e44a936 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 17:25:46 +0200
Subject: [PATCH 01/12] New package: python3-hidapi-0.14.0
---
srcpkgs/python3-hidapi/patches/5cc527e4.patch | 40 +++++++++++++++++++
srcpkgs/python3-hidapi/template | 24 +++++++++++
2 files changed, 64 insertions(+)
create mode 100644 srcpkgs/python3-hidapi/patches/5cc527e4.patch
create mode 100644 srcpkgs/python3-hidapi/template
diff --git a/srcpkgs/python3-hidapi/patches/5cc527e4.patch b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
new file mode 100644
index 00000000000000..92835c9df8c7ba
--- /dev/null
+++ b/srcpkgs/python3-hidapi/patches/5cc527e4.patch
@@ -0,0 +1,40 @@
+From 5cc527e4cc6fb82bed718cc9f0cdc7e47b61bb9c Mon Sep 17 00:00:00 2001
+From: Shawn Hoffman <godisgovernment@gmail.com>
+Date: Mon, 11 Sep 2023 17:27:52 -0700
+Subject: [PATCH] use pyxdep file to locate chid.pxd
+
+---
+ hid.pyxdep | 1 +
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 hid.pyxdep
+
+diff --git a/hid.pyxdep b/hid.pyxdep
+new file mode 100644
+index 0000000..7480bc8
+--- /dev/null
++++ b/hid.pyxdep
+@@ -0,0 +1 @@
++chid.pxd
+diff --git a/setup.py b/setup.py
+index 4c311ba..73066b0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -9,7 +9,7 @@
+ hidapi_include = os.path.join(hidapi_topdir, "hidapi")
+ system_hidapi = 0
+ libs = []
+-src = ["hid.pyx", "chid.pxd"]
++src = ["hid.pyx"]
+
+
+ def hidapi_src(platform):
+@@ -42,7 +42,7 @@ def hidapi_src(platform):
+ )
+ )
+ libs = ["udev", "rt"]
+- src = ["hidraw.pyx", "chid.pxd"]
++ src = ["hidraw.pyx"]
+ if system_hidapi == 1:
+ libs.append("hidapi-hidraw")
+ else:
diff --git a/srcpkgs/python3-hidapi/template b/srcpkgs/python3-hidapi/template
new file mode 100644
index 00000000000000..c303fe3a3adc41
--- /dev/null
+++ b/srcpkgs/python3-hidapi/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-hidapi'
+pkgname=python3-hidapi
+version=0.14.0
+revision=1
+build_style=python3-module
+make_build_args="--with-system-hidapi --without-libusb"
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
+makedepends="eudev-libudev-devel hidapi-devel libusb-devel python3-devel"
+depends="python3 hidapi"
+short_desc="Cython interface to the hidapi"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-3.0-or-later, BSD-3-Clause"
+homepage="https://github.com/trezor/cython-hidapi"
+distfiles="${PYPI_SITE}/h/hidapi/hidapi-${version}.tar.gz"
+checksum=a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be
+
+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 74058d551b665006c1d2da48b8285c70db82ff99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 18:57:15 +0200
Subject: [PATCH 02/12] New package: python3-nitrokey-0.2.0
---
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..830dd6acc11206
--- /dev/null
+++ b/srcpkgs/python3-nitrokey/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-nitrokey'
+pkgname=python3-nitrokey
+version=0.2.0
+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-ecdsa
+ python3-protobuf python3-pyserial python3-typing_extensions"
+short_desc="Python SDK to use and configure Nitrokey devices"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/nitrokey-sdk-py"
+distfiles="${PYPI_SITE}/n/nitrokey/nitrokey-${version}.tar.gz"
+checksum=a167e1cbb323d549eb0bbd06edfa64978ab8b86d0276f3b4047c1f258b33477d
+
+post_install() {
+ vlicense LICENSES/MIT.txt
+}
From 2d2eb0079765ab6659ea81732571d28198cd13c1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:14:30 +0200
Subject: [PATCH 03/12] New package: python3-pynitrokey-0.6.0
---
srcpkgs/python3-pynitrokey/files/LICENSE-MIT | 23 +++++++++++++++++
srcpkgs/python3-pynitrokey/template | 27 ++++++++++++++++++++
2 files changed, 50 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..db70432cc040d8
--- /dev/null
+++ b/srcpkgs/python3-pynitrokey/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-pynitrokey'
+pkgname=python3-pynitrokey
+version=0.6.0
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"
+hostmakedepends="python3-wheel python3-flit_core"
+depends="python3-certifi python3-cffi python3-click
+ python3-cryptography python3-ecdsa python3-fido2
+ python3-intelhex python3-nkdfu python3-nitrokey
+ python3-dateutil python3-usb python3-requests
+ python3-tqdm python3-tlv8 python3-typing_extensions
+ python3-click-aliases python3-semver python3-libusb1
+ python3-protobuf python3-nethsm python3-chardet
+ python3-crcmod python3-hidapi python3-pyserial
+ python3-pyscard python3-asn1crypto libnitrokey"
+short_desc="CLI for the Nitrokey FIDO2, Nitrokey Start, Nitrokey 3 and NetHSM"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/Nitrokey/pynitrokey"
+distfiles="${PYPI_SITE}/p/pynitrokey/pynitrokey-${version}.tar.gz"
+checksum=a58e804ce4590cf1919e437a76c7b5b3f0f3411a699436cf00650753813b53d3
+
+post_install() {
+ # PyPi package does not include LICENSE files
+ vlicense "${FILESDIR}/LICENSE-MIT"
+}
From e7b612f3a91859a9ba2b0006b4ed2ed4a9633299 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:15:37 +0200
Subject: [PATCH 04/12] New package: python3-click-aliases-1.0.4
---
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..58525800ae6599
--- /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.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core python3-wheel"
+depends="python3-click"
+short_desc="Enable aliases for Click"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-aliases"
+distfiles="${PYPI_SITE}/c/click_aliases/click_aliases-${version}.tar.gz"
+checksum=384313c5dc4c4bd64d9eadaff39ad91352747e8cdfd2f95d504d914c01eb4eda
+
+post_install() {
+ vlicense LICENSE
+}
From 574276dd1e2fe07c82a2de8ee3bf5955b56e6e61 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:16:43 +0200
Subject: [PATCH 05/12] 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 <slymattz@gmail.com>"
+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 49f47e6178455ad6ba94e3f89b4c578ed7d72844 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:22:13 +0200
Subject: [PATCH 06/12] 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..f04a65bf8ab0f0
--- /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-usb python3-tqdm"
+short_desc="DFU tool for updating Nitrokeys' firmware"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Nitrokey/nkdfu"
+distfiles="${PYPI_SITE}/n/nkdfu/nkdfu-${version}.tar.gz"
+checksum=f25f75ddd382c47285b6943cde9f51577b1496ed284f93d58b5e054ae609f5f8
From cd68c9a0c869488bee0ab535f1a4f83002c335ca Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:23:11 +0200
Subject: [PATCH 07/12] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/jlusiardi/tlv8_python"
+distfiles="${PYPI_SITE}/t/tlv8/tlv8-${version}.tar.gz"
+checksum=7930a590267b809952272ac2a27ee81b99ec5191fa2eba08050e0daee4262684
From 6e04266f9f2f3abfd14dcc8f3a432298004e1d7a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 9 Sep 2024 21:24:44 +0200
Subject: [PATCH 08/12] New package: python3-fire-0.6.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..05d777d871a265
--- /dev/null
+++ b/srcpkgs/python3-fire/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-fire'
+pkgname=python3-fire
+version=0.6.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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/python-fire"
+distfiles="${PYPI_SITE}/f/fire/fire-${version}.tar.gz"
+checksum=54ec5b996ecdd3c0309c800324a0703d6da512241bc73b553db959d98de0aa66
From e73f15053c7695ee26fa7a483c08beac2ca6c395 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:17:20 +0200
Subject: [PATCH 09/12] python3-protobuf: update to 5.28.0
---
srcpkgs/python3-protobuf/patches/cpp17.patch | 11 ----------
srcpkgs/python3-protobuf/template | 21 ++++++--------------
2 files changed, 6 insertions(+), 26 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 301489708bf35a..9cacac2ddc6281 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,30 +1,21 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.25.2
+version=5.28.0
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 <orphan@voidlinux.org>"
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=dde74af0fa774fa98892209992295adbfb91da3fa98c8f67a88afe8f5a349add
-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
+# building with c++ implementation is now the default behavior
+# https://github.com/protocolbuffers/protobuf/issues/12390#issuecomment-1502304165
post_install() {
sed -n 1,29p google/protobuf/__init__.py >LICENSE
From 77ddc7a615179315df2b8b6a308fd57e46a023d0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:50:43 +0200
Subject: [PATCH 10/12] 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 2427f95c9e5873649d3a53e548dee5adfdd554d6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 18:52:38 +0200
Subject: [PATCH 11/12] python3-ecdsa: update to 0.19.0
---
srcpkgs/python3-ecdsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index 0cce9910988f7c..719435d8eb3c22 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ecdsa'
pkgname=python3-ecdsa
-version=0.18.0
+version=0.19.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 05665080411961120b8484fbb979b332f2c9bdcd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 10 Sep 2024 19:30:11 +0200
Subject: [PATCH 12/12] 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 <slymattz@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/Nitrokey/nethsm-sdk-py"
+distfiles="${PYPI_SITE}/n/nethsm/nethsm-${version}.tar.gz"
+checksum=10fc462450861a5de9df22e533b347ef1b44552db0a118a028984be7b0348001
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-09-29 15:07 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-16 19:42 [PR PATCH] New package: python3-pynitrokey-0.5.0 slymattz
2024-09-16 20:04 ` [PR PATCH] [Updated] " slymattz
2024-09-20 15:10 ` slymattz
2024-09-25 12:10 ` slymattz
2024-09-29 14:06 ` [PR PATCH] [Updated] New package: python3-pynitrokey-0.6.0 slymattz
2024-09-29 14:16 ` slymattz
2024-09-29 14:53 ` slymattz
2024-09-29 15:07 ` slymattz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).