From 6b3a8d59f6c2c940c0b5d1e91f71183eff051f9c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 19 May 2022 20:54:18 -0600
Subject: [PATCH] Update to 0.9.3 (bz#2087023)

---
 .gitignore              |  1 +
 python-fido2-mock.patch | 48 +++++++++++++++++++++++++++++++++++++++++
 python-fido2.spec       | 10 ++++++---
 sources                 |  2 +-
 4 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 python-fido2-mock.patch

diff --git a/.gitignore b/.gitignore
index 630b789..b2cbf95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /python-python-fido2-0.9.0.tar.gz
 /python-python-fido2-0.9.1.tar.gz
 /python-python-fido2-0.9.2.tar.gz
+/python-python-fido2-0.9.3.tar.gz
diff --git a/python-fido2-mock.patch b/python-fido2-mock.patch
new file mode 100644
index 0000000..d8ad5cd
--- /dev/null
+++ b/python-fido2-mock.patch
@@ -0,0 +1,48 @@
+diff -up python-fido2-0.9.3/test/test_client.py.mock python-fido2-0.9.3/test/test_client.py
+--- python-fido2-0.9.3/test/test_client.py.mock	2021-11-09 04:15:13.000000000 -0700
++++ python-fido2-0.9.3/test/test_client.py	2022-05-19 20:47:06.165307669 -0600
+@@ -29,7 +29,7 @@
+ 
+ from __future__ import absolute_import, unicode_literals
+ 
+-import mock
++from unittest import mock
+ import unittest
+ from threading import Event, Timer
+ from binascii import a2b_hex
+diff -up python-fido2-0.9.3/test/test_ctap2.py.mock python-fido2-0.9.3/test/test_ctap2.py
+--- python-fido2-0.9.3/test/test_ctap2.py.mock	2021-11-09 04:15:13.000000000 -0700
++++ python-fido2-0.9.3/test/test_ctap2.py	2022-05-19 20:44:27.276937443 -0600
+@@ -45,7 +45,7 @@ from cryptography.hazmat.backends import
+ from cryptography.hazmat.primitives.asymmetric import ec
+ 
+ import unittest
+-import mock
++from unittest import mock
+ 
+ _AAGUID = a2b_hex("F8A011F38C0A4D15800617111F9EDC7D")
+ _INFO = a2b_hex(
+diff -up python-fido2-0.9.3/test/test_pcsc.py.mock python-fido2-0.9.3/test/test_pcsc.py
+--- python-fido2-0.9.3/test/test_pcsc.py.mock	2021-11-09 04:15:13.000000000 -0700
++++ python-fido2-0.9.3/test/test_pcsc.py	2022-05-19 20:45:11.291317012 -0600
+@@ -28,7 +28,7 @@
+ from __future__ import absolute_import, unicode_literals
+ 
+ import unittest
+-import mock
++from unittest import mock
+ import sys
+ from fido2.hid import CTAPHID
+ 
+diff -up python-fido2-0.9.3/test/test_ctap1.py.mock python-fido2-0.9.3/test/test_ctap1.py
+--- python-fido2-0.9.3/test/test_ctap1.py.mock	2021-11-09 04:15:13.000000000 -0700
++++ python-fido2-0.9.3/test/test_ctap1.py	2022-05-19 20:49:43.312664818 -0600
+@@ -30,7 +30,7 @@ from __future__ import absolute_import,
+ from fido2.ctap1 import Ctap1, ApduError
+ from binascii import a2b_hex
+ import unittest
+-import mock
++from unittest import mock
+ 
+ 
+ class TestCtap1(unittest.TestCase):
diff --git a/python-fido2.spec b/python-fido2.spec
index 5c213c8..c70dddb 100644
--- a/python-fido2.spec
+++ b/python-fido2.spec
@@ -3,8 +3,8 @@
 %global srcname fido2
 
 Name:           python-%{srcname}
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Functionality for FIDO 2.0, including USB device communication
 
 # Main code is BSD
@@ -15,6 +15,8 @@ URL:            https://github.com/Yubico/python-fido2
 Source0:        https://github.com/Yubico/python-%{srcname}/archive/%{version}/python-%{name}-%{version}.tar.gz
 # Deal with old setuptools on EPEL7
 Patch0:         python-fido2-setup.patch
+# Use python 3.8's unittest.mock
+Patch1:         python-fido2-mock.patch
 BuildArch:      noarch
 
 %global _description\
@@ -42,7 +44,6 @@ BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-cryptography
 BuildRequires:  python%{python3_pkgversion}-six
 # For tests
-BuildRequires:  python%{python3_pkgversion}-mock
 BuildRequires:  python%{python3_pkgversion}-pyfakefs >= 3.4
 %if %{undefined __pythondist_requires}
 Requires:       python%{python3_pkgversion}-cryptography
@@ -77,6 +78,9 @@ Requires:       python%{python3_pkgversion}-six
 
 
 %changelog
+* Fri May 20 2022 Orion Poplawski <orion@nwra.com> - 0.9.3-1
+- Update to 0.9.3 (bz#2087023)
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index c6d4686..597c1b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-python-fido2-0.9.2.tar.gz) = 0b5ca100fe03666066cfbb6ab70562ab92cae006c47a5a706d67246bcd487ddf18aa6ebbc8a0a5a2f2892cc9cb2be89c1b51b890cbe1bf1e9d361c2d8870a5fb
+SHA512 (python-python-fido2-0.9.3.tar.gz) = 76d121eaa64f62e96e80f151b9f526e04276feab035494c5cde4bb7ae35fbed9c7bbd73c1d22f309b26ece3b71b0532a7a01c5a2f10c09a843def4e9a7c0b04b