.gitignore

@@ -1 +1 @@
-SOURCES/python-yubico-1.3.2.tar.gz
+SOURCES/python-yubico-1.3.3.tar.gz

.python-yubico.metadata

@@ -1 +1 @@
-ce26775893e3d25c33e226b376d92dfe1ae114d6 SOURCES/python-yubico-1.3.2.tar.gz
+91a1fa9e7b0f028c8b56ff66fdacfdc6cfd9ff9f SOURCES/python-yubico-1.3.3.tar.gz

SOURCES/0001-literal-comparison.patch

@@ -0,0 +1,66 @@
+From b4a53389c3e6ad41c836aa82998149f427fe1ad8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tibor=20Dudl=C3=A1k?= <tdudlak@redhat.com>
+Date: Tue, 10 Sep 2019 19:12:19 +0200
+Subject: [PATCH] Do not use comparision with "is" for literals
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There is a warning with python 3.8 at fedora rawhide about
+comparision with "is" while running ipa-server install.
+See: https://bugs.python.org/issue34850
+
+Signed-off-by: Tibor Dudlák <tdudlak@redhat.com>
+---
+ yubico/yubikey_config.py  | 4 ++--
+ yubico/yubikey_usb_hid.py | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/yubico/yubikey_config.py b/yubico/yubikey_config.py
+index b5a30c4..caeed02 100644
+--- a/yubico/yubikey_config.py
++++ b/yubico/yubikey_config.py
+@@ -475,12 +475,12 @@ def to_frame(self, slot=1):
+         """
+         data = self.to_string()
+         payload = data.ljust(64, yubico_util.chr_byte(0x0))
+-        if slot is 1:
++        if slot == 1:
+             if self._update_config:
+                 command = SLOT.UPDATE1
+             else:
+                 command = SLOT.CONFIG
+-        elif slot is 2:
++        elif slot == 2:
+             if self._update_config:
+                 command = SLOT.UPDATE2
+             else:
+diff --git a/yubico/yubikey_usb_hid.py b/yubico/yubikey_usb_hid.py
+index c07dcaa..b87ff3c 100644
+--- a/yubico/yubikey_usb_hid.py
++++ b/yubico/yubikey_usb_hid.py
+@@ -285,13 +285,13 @@ def _waitfor(self, mode, mask, may_block, timeout=2):
+                         seconds_left = min(20, seconds_left)
+                         wait_num = (seconds_left * 2) - 1 + 6
+ 
+-            if mode is 'nand':
++            if mode == 'nand':
+                 if not flags & mask == mask:
+                     finished = True
+                 else:
+                     self._debug("Status %s (0x%x) has not cleared bits %s (0x%x)\n"
+                                 % (bin(flags), flags, bin(mask), mask))
+-            elif mode is 'and':
++            elif mode == 'and':
+                 if flags & mask == mask:
+                     finished = True
+                 else:
+@@ -303,7 +303,7 @@ def _waitfor(self, mode, mask, may_block, timeout=2):
+             if not finished:
+                 wait_num -= 1
+                 if wait_num == 0:
+-                    if mode is 'nand':
++                    if mode == 'nand':
+                         reason = 'Timed out waiting for YubiKey to clear status 0x%x' % mask
+                     else:
+                         reason = 'Timed out waiting for YubiKey to set status 0x%x' % mask

SOURCES/python-yubico-py3.patch

@@ -1,22 +0,0 @@
-From 7e6e424ed579c53a0767ba71eb47345ae1e472ca Mon Sep 17 00:00:00 2001
-From: minus <github@mnus.de>
-Date: Sat, 12 Mar 2016 12:18:44 +0100
-Subject: [PATCH] fixed Python 3 compatibility for Yubikey 4
-
----
- yubico/yubikey_4_usb_hid.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/yubico/yubikey_4_usb_hid.py b/yubico/yubikey_4_usb_hid.py
-index 31c6f5d..b44bb90 100644
---- a/yubico/yubikey_4_usb_hid.py
-+++ b/yubico/yubikey_4_usb_hid.py
-@@ -104,7 +104,7 @@ def _read_capabilities(self):
-         frame = yubikey_frame.YubiKeyFrame(command=SLOT.YK4_CAPABILITIES)
-         self._device._write(frame)
-         response = self._device._read_response()
--        r_len = ord(response[0])
-+        r_len = yubico_util.ord_byte(response[0])
- 
-         # 1 byte length, 2 byte CRC.
-         if not yubico_util.validate_crc16(response[:r_len+3]):

SPECS/python-yubico.spec

@@ -1,56 +1,28 @@
-%{!?_licensedir:%global license %%doc}
-
+%{?python_enable_dependency_generator}
 %global srcname yubico
 
-%if 0%{?rhel} > 7
-# Disable python2 build by default
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
-
 Name:           python-%{srcname}
-Version:        1.3.2
-Release:        9.1%{?dist}
+Version:        1.3.3
+Release:        7%{?dist}
 Summary:        Pure-python library for interacting with Yubikeys
 
 License:        BSD
 URL:            https://github.com/Yubico/%{name}
 Source0:        https://github.com/Yubico/%{name}/archive/%{name}-%{version}.tar.gz
-Patch0:         python-yubico-py3.patch
+Patch0001:      0001-literal-comparison.patch
 
 BuildArch:      noarch
 
-%if %{with python2}
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-nose
-BuildRequires:  python2-pyusb
-%endif # with python2
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-nose
-BuildRequires:  python3-pyusb
-
 %description
 Pure-python library for interacting with Yubikeys
 
-%if %{with python2}
-%package -n python2-%{srcname}
-Summary:        Pure-python library for interacting with Yubikeys
-Requires:       pyusb
-Obsoletes:      python-yubico < %{version}-%{release}
-
-%{?python_provide:%python_provide python2-%{srcname}}
-
-%description -n python2-%{srcname}
-Pure-python library for interacting with Yubikeys. For Python 2.
-%endif # with python2
 
 %package -n python3-%{srcname}
 Summary:        Pure-python library for interacting with Yubikeys
-Requires:       python3-pyusb
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-pytest
+BuildRequires:  python3-pyusb
 
 %{?python_provide:%python_provide python3-%{srcname}}
 
@@ -63,31 +35,16 @@ Pure-python library for interacting with Yubikeys. For Python 3.
 
 
 %build
-%if %{with python2}
-%py2_build
-%endif # with python2
 %py3_build
 
 
 %install
-%if %{with python2}
-%py2_install
-%endif # with python2
 %py3_install
 
 
 %check
-%if %{with python2}
-nosetests-%{python2_version} -e test_challenge_response -e test_serial -e test_status
-%endif # with python2
-nosetests-%{python3_version} -e test_challenge_response -e test_serial -e test_status
+%pytest test/soft/
 
-%if %{with python2}
-%files -n python2-%{srcname}
-%license COPYING
-%doc NEWS README
-%{python2_sitelib}/*
-%endif # with python2
 
 %files -n python3-%{srcname}
 %license COPYING
@@ -96,11 +53,60 @@ nosetests-%{python3_version} -e test_challenge_response -e test_serial -e test_s
 
 
 %changelog
-* Thu Jun 16 2022 Florence Blanc-Renaud <frenaud@redhat.com> - 1.3.2-9.1
-- Rebuilt to fix NVR issue (#2097803)
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.3-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Tue Jun 19 2018 Charalampos Stratakis <cstratak@redhat.com> - 1.3.2-9
-- Conditionalize the python2 subpackage
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.3-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Feb 03 18:03:23 CET 2021 Christian Heimes <cheimes@redhat.com> - 1.3.3-5
+- Use pytest instead of nose (#1918336)
+- Don't use is to compare literals (#1749216)
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.3-2
+- Rebuilt for Python 3.9
+
+* Thu Mar 05 2020 Mohan Boddu <mboddu@bhujji.com> - 1.3.3-1
+- Update to 1.3.3
+- Removing py3 patches
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Oct 21 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.2-17
+- Drop forgotten build dependency on python2-pyusb
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.2-16
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Sun Aug 18 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.2-15
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jan 11 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.2-12
+- Enable python dependency generator
+
+* Wed Jan 09 2019 Miro Hrončok <mhroncok@redhat.com> - 1.3.2-11
+- Subpackage python2-yubico has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.3.2-9
+- Rebuilt for Python 3.7
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild