[arch-commits] Commit in python-pynitrokey/trunk (2 files)

[David Runge]

    Date: Monday, February 14, 2022 @ 20:40:51
  Author: dvzrv
Revision: 1133252

upgpkg: python-pynitrokey 0.4.16-3: Rebuild to remove python-spsdk from depends again.

Python-spsdk requires the use of python-libusbsio, which bundles proprietary shared libaries.
https://github.com/NXPmicro/spsdk/issues/36

Added:
  python-pynitrokey/trunk/python-pynitrokey-0.4.16-remove_spsdk.patch
Modified:
  python-pynitrokey/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |   19 ++++++++----
 python-pynitrokey-0.4.16-remove_spsdk.patch |   40 ++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-14 20:36:37 UTC (rev 1133251)
+++ PKGBUILD	2022-02-14 20:40:51 UTC (rev 1133252)
@@ -3,7 +3,7 @@
 _name=pynitrokey
 pkgname=python-pynitrokey
 pkgver=0.4.16
-pkgrel=2
+pkgrel=3
 pkgdesc="A command line interface for the Nitrokey FIDO2 and Nitrokey Start"
 arch=(any)
 url="https://github.com/Nitrokey/pynitrokey"
@@ -10,22 +10,29 @@
 license=(Apache)
 depends=(python-cbor python-cffi python-click python-cryptography
 python-dateutil python-ecdsa python-fido2 python-intelhex python-nkdfu
-python-pyusb python-requests python-spsdk python-tqdm python-urllib3)
+python-pyusb python-requests python-tqdm python-urllib3)
 makedepends=(git python-build python-flit python-install)
 source=(
   "git+https://github.com/nitrokey/pynitrokey#tag=v${pkgver}.nitrokey?signed"
+  $pkgname-0.4.16-remove_spsdk.patch
 )
-sha512sums=('SKIP')
-b2sums=('SKIP')
+sha512sums=('SKIP'
+            '4f5abd730bf6c23f69e8d2252b97e729273a0d48fe85708f9ea623afc10ef0d9ac07b25d17479edc3e7da70af0fe3956b4ecf93f3af69392f57974c6b3f76d94')
+b2sums=('SKIP'
+        '133d8770ec99db1ead4e9d175ec84ad229dd8e94c0772f2406e63d6cabf372446ba76814f7f71fc10ba3128ae0be6b5a68e859bf768be44c70ed8b87d12014b9')
 validpgpkeys=(868184069239FF65DE0BCD7DD9BAE35991DE5B22)  # Szczepan Zalega (Nitrokey) <szczepan at nitrokey.com>
 
+prepare() {
+  cd $_name
+  patch -Np1 -i ../$pkgname-0.4.16-remove_spsdk.patch
+}
 build() {
-  cd "${_name}"
+  cd $_name
   python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 package() {
-  cd "${_name}"
+  cd $_name
   python -m install --optimize=1 --destdir="$pkgdir" dist/*.whl
   # https://github.com/FFY00/python-install/pull/6
   chmod +x "$pkgdir"/usr/bin/*

Added: python-pynitrokey-0.4.16-remove_spsdk.patch
===================================================================
--- python-pynitrokey-0.4.16-remove_spsdk.patch	                        (rev 0)
+++ python-pynitrokey-0.4.16-remove_spsdk.patch	2022-02-14 20:40:51 UTC (rev 1133252)
@@ -0,0 +1,40 @@
+diff --git i/pynitrokey/cli/__init__.py w/pynitrokey/cli/__init__.py
+index dc27289..034cd60 100644
+--- i/pynitrokey/cli/__init__.py
++++ w/pynitrokey/cli/__init__.py
+@@ -18,7 +18,6 @@ import pynitrokey
+ import pynitrokey.fido2.operations
+ from pynitrokey.cli.fido2 import fido2
+ from pynitrokey.cli.nethsm import nethsm
+-from pynitrokey.cli.nk3 import nk3
+ from pynitrokey.cli.pro import pro
+ from pynitrokey.cli.start import start
+ from pynitrokey.cli.storage import storage
+@@ -58,7 +57,6 @@ def nitropy():
+ 
+ nitropy.add_command(fido2)
+ nitropy.add_command(nethsm)
+-nitropy.add_command(nk3)
+ nitropy.add_command(start)
+ nitropy.add_command(storage)
+ nitropy.add_command(pro)
+@@ -76,7 +74,6 @@ nitropy.add_command(version)
+ def _list():
+     fido2.commands["list"].callback()
+     start.commands["list"].callback()
+-    nk3.commands["list"].callback()
+ 
+ 
+ @click.command()
+diff --git i/pyproject.toml w/pyproject.toml
+index 36d76e4..87ae2e3 100644
+--- i/pyproject.toml
++++ w/pyproject.toml
+@@ -32,7 +32,6 @@ dependencies = [
+   "python-dateutil",
+   "pyusb",
+   "requests",
+-  "spsdk >=1.6.0",
+   "tqdm",
+   "urllib3",
+ ]