From c4231160664ba0a280c9fd34278386ddc29638bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 18 May 2021 19:59:57 +0200
Subject: [PATCH] Update to 1.26.4

- switch to %pytest
- don't ship our own ssl_match_hostname wrapper, use the one from upstream

Resolves: rhbz#1935737
---
 .gitignore                |  1 +
 python-urllib3.spec       | 25 ++++++++++++++-----------
 sources                   |  2 +-
 ssl_match_hostname_py3.py |  1 -
 4 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 ssl_match_hostname_py3.py

diff --git a/.gitignore b/.gitignore
index 35a75f1..b81808c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /urllib3-1.25.7.tar.gz
 /urllib3-1.25.8.tar.gz
 /urllib3-1.25.10.tar.gz
+/urllib3-1.26.4.tar.gz
diff --git a/python-urllib3.spec b/python-urllib3.spec
index 3fda5e8..5c8b8ea 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -5,15 +5,13 @@
 %bcond_with tests
 
 Name:           python-%{srcname}
-Version:        1.25.10
-Release:        6%{?dist}
+Version:        1.26.4
+Release:        1%{?dist}
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 
 License:        MIT
 URL:            https://github.com/urllib3/urllib3
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
-# Unbundle ssl_match_hostname since we depend on it
-Source1:        ssl_match_hostname_py3.py
 BuildArch:      noarch
 
 %description
@@ -25,9 +23,12 @@ Summary:        Python3 HTTP library with thread-safe connection pooling and fil
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 %if %{with tests}
+BuildRequires:  python3-dateutil
 BuildRequires:  python3-six
 BuildRequires:  python3-pysocks
 BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-freezegun
+BuildRequires:  python3-pytest-timeout
 BuildRequires:  python3-tornado
 BuildRequires:  python3-trustme
 BuildRequires:  python3-idna
@@ -88,12 +89,12 @@ sed -i -e 's/^import mock/from unittest import mock/' \
 %py3_install
 
 # Unbundle the Python 3 build
-rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py*
-rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six*
-rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/
+rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py
+rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six.*
+rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/_implementation.py
+rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/__pycache__/_implementation.*
 
 mkdir -p %{buildroot}/%{python3_sitelib}/urllib3/packages/
-cp -a %{SOURCE1} %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname.py
 ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py
 ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc \
       %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/
@@ -103,9 +104,7 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \
 
 %if %{with tests}
 %check
-pushd test
-PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pytest -v
-popd
+%pytest -v
 %endif
 
 
@@ -117,6 +116,10 @@ popd
 
 
 %changelog
+* Tue May 18 2021 Miro Hrončok <mhroncok@redhat.com> - 1.26.4-1
+- Update to 1.26.4
+Resolves: rhbz#1935737
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.25.10-6
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/sources b/sources
index 8412fcf..3ca6661 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (urllib3-1.25.10.tar.gz) = 7927e58de8ef24474179297e6ef7700bb3026a13d578e5bb01e32c6c4b6b5e70cc35980a815e3bcd976678e344250222d38fb86abe0f956e5023deb0f80bc1a1
+SHA512 (urllib3-1.26.4.tar.gz) = c770ae93e024af2bd79145d90426ad56f89184a4a02a55551bf54680a1ba369e683080e1899f00d57efcb085145e29a189f502ae6b41e572de111909297fb4e6
diff --git a/ssl_match_hostname_py3.py b/ssl_match_hostname_py3.py
deleted file mode 100644
index 99d425a..0000000
--- a/ssl_match_hostname_py3.py
+++ /dev/null
@@ -1 +0,0 @@
-from ssl import match_hostname, CertificateError