From a4d9944d9af5add44e4ec076d7665d4108c1d5f2 Mon Sep 17 00:00:00 2001 From: chenhaxing Date: Thu, 19 Jan 2023 14:26:54 +0800 Subject: [PATCH] modify HOST_PORT_PAT in backport-fixed-issue-with-port-0-returning-None.patch --- backport-fixed-issue-with-port-0-returning-None.patch | 4 ++-- python-urllib3.spec | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/backport-fixed-issue-with-port-0-returning-None.patch b/backport-fixed-issue-with-port-0-returning-None.patch index 1e7de59..36164a7 100644 --- a/backport-fixed-issue-with-port-0-returning-None.patch +++ b/backport-fixed-issue-with-port-0-returning-None.patch @@ -21,7 +21,7 @@ index 6793de3..701ad75 100644 ZONE_ID_RE = re.compile("(" + ZONE_ID_PAT + r")\]$") -_HOST_PORT_PAT = ("^(%s|%s|%s)(?::0*([0-9]{0,5}))?$") % ( -+_HOST_PORT_PAT = ("^(%s|%s|%s)(?::0*?(|0|[1-9][0-9]{0,5}))?$") % ( ++_HOST_PORT_PAT = ("^(%s|%s|%s)(?::0*?(|0|[1-9][0-9]{0,4}))?$") % ( REG_NAME_PAT, IPV4_PAT, IPV6_ADDRZ_PAT, @@ -44,4 +44,4 @@ index 165a331..c8729e8 100644 U = Url("http", host="google.com") assert str(U) == U.url -- -2.27.0 \ No newline at end of file +2.27.0 diff --git a/python-urllib3.spec b/python-urllib3.spec index 9458d47..ec58512 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -3,7 +3,7 @@ Name: python-%{srcname} Version: 1.25.9 -Release: 6 +Release: 7 Summary: Sanity-friendly HTTP client for Python License: MIT URL: https://urllib3.readthedocs.io @@ -119,11 +119,17 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt %{python3_sitelib}/urllib3-*.egg-info %changelog +* Thu Jan 19 2023 chenhaixing - 1.25.9-7 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:modify HOST_PORT_PAT in backport-fixed-issue-with-port-0-returning-None.patch + * Mon Jan 16 2023 chenhaixing - 1.25.9-6 - Type:bugfix - CVE:NA - SUG:NA -- DESC:backport some patches +- DESC:fix parse port error and add server_hostname to SSL_KEYWORDS * Thu Jan 5 2023 chenhaixing - 1.25.9-5 - Type:bugfix -- Gitee