From a5b2aa9b9bca34faef125cc59c29e82300f3fc93 Mon Sep 17 00:00:00 2001
From: dvzrv <dvzrv@9fca08f4-af9d-4005-b8df-a31f2cc04f65>
Date: Sat, 22 Jan 2022 11:50:46 +0000
Subject: [PATCH] upgpkg: python-pynitrokey 0.4.13-1: Upgrade to 0.4.13.

Remove nitrokey 3 support until python-spsdk is packaged.
https://github.com/Nitrokey/pynitrokey/issues/162

git-svn-id: file:///srv/repos/svn-community/svn@1113423 9fca08f4-af9d-4005-b8df-a31f2cc04f65
---
 python-pynitrokey/trunk/PKGBUILD              | 19 +++++++--
 ...ython-pynitrokey-0.4.13-remove_spsdk.patch | 40 +++++++++++++++++++
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 python-pynitrokey/trunk/python-pynitrokey-0.4.13-remove_spsdk.patch

diff --git a/python-pynitrokey/trunk/PKGBUILD b/python-pynitrokey/trunk/PKGBUILD
index 975e25c49aef..ccdb29b74440 100644
--- a/python-pynitrokey/trunk/PKGBUILD
+++ b/python-pynitrokey/trunk/PKGBUILD
@@ -2,7 +2,7 @@
 
 _name=pynitrokey
 pkgname=python-pynitrokey
-pkgver=0.4.10
+pkgver=0.4.13
 pkgrel=1
 pkgdesc="A command line interface for the Nitrokey FIDO2 and Nitrokey Start"
 arch=(any)
@@ -12,11 +12,22 @@ depends=(python-cbor python-cffi python-click python-cryptography
 python-dateutil python-ecdsa python-fido2 python-intelhex python-nkdfu
 python-pygments python-pyserial python-pyusb python-requests python-urllib3)
 makedepends=(git python-build python-flit python-install)
-source=("git+https://github.com/nitrokey/pynitrokey#tag=v${pkgver}.nitrokey?signed")
-sha512sums=('SKIP')
-b2sums=('SKIP')
+source=(
+  "git+https://github.com/nitrokey/pynitrokey#tag=v${pkgver}.nitrokey?signed"
+  "${pkgname}-0.4.13-remove_spsdk.patch"
+)
+sha512sums=('SKIP'
+            'd40215ef06c9030abe0617c68063cf34a8a79e6bdb122094d5ab72c3a518952329215b78a5086e1b177beef498b072d7786fe86d499bc483ab64ce734644ed91')
+b2sums=('SKIP'
+        'cdcaec09cddfca5627f34a2a82e8b2360ab1d9ba0fde9881f8bd40fd46254f911461734a519ebf4a4472cba56ac4729f7841238b360e685772b9cb51a31df1df')
 validpgpkeys=(868184069239FF65DE0BCD7DD9BAE35991DE5B22)  # Szczepan Zalega (Nitrokey) <szczepan@nitrokey.com>
 
+prepare() {
+  cd "${_name}"
+  # remove nitrokey3 support for now, until spsdk is packaged: https://github.com/Nitrokey/pynitrokey/issues/162
+  patch -Np1 -i ../"${pkgname}-0.4.13-remove_spsdk.patch"
+}
+
 build() {
   cd "${_name}"
   python -m build --wheel --skip-dependency-check --no-isolation
diff --git a/python-pynitrokey/trunk/python-pynitrokey-0.4.13-remove_spsdk.patch b/python-pynitrokey/trunk/python-pynitrokey-0.4.13-remove_spsdk.patch
new file mode 100644
index 000000000000..48d128e6cdb7
--- /dev/null
+++ b/python-pynitrokey/trunk/python-pynitrokey-0.4.13-remove_spsdk.patch
@@ -0,0 +1,40 @@
+diff --git i/pynitrokey/cli/__init__.py w/pynitrokey/cli/__init__.py
+index 3dd8ca3..a22ff1f 100644
+--- i/pynitrokey/cli/__init__.py
++++ w/pynitrokey/cli/__init__.py
+@@ -17,7 +17,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
+@@ -57,7 +56,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)
+@@ -78,7 +76,6 @@ def ls():
+ 
+     fido2.commands["list"].callback()
+     start.commands["list"].callback()
+-    nk3.commands["list"].callback()
+ 
+ 
+ nitropy.add_command(ls)
+diff --git i/pyproject.toml w/pyproject.toml
+index 8c69386..c61c206 100644
+--- i/pyproject.toml
++++ w/pyproject.toml
+@@ -21,7 +21,6 @@ requires = [
+   "requests",
+   "pygments",
+   "python-dateutil",
+-  "spsdk >= 1.5.0",
+   "tqdm",
+   "urllib3",
+ 	"cffi",