From b4c1e6f52d5d095b428f83b7ce9ac6a5f4c66e6d Mon Sep 17 00:00:00 2001 From: chenhaixing Date: Wed, 6 Jul 2022 20:49:34 +0800 Subject: [PATCH 1/3] add-patch-Bump-RECENT_DATE.patch --- Bump-RECENT_DATE.patch | 25 +++++++++++++++++++++++++ python-urllib3.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 Bump-RECENT_DATE.patch diff --git a/Bump-RECENT_DATE.patch b/Bump-RECENT_DATE.patch new file mode 100644 index 0000000..58c02da --- /dev/null +++ b/Bump-RECENT_DATE.patch @@ -0,0 +1,25 @@ +From 2d98f6b53c38ab8e224cb825d6323b8eb54c887f Mon Sep 17 00:00:00 2001 +From: Quentin Pradet +Date: Fri, 1 Jul 2022 14:43:18 +0400 +Subject: [PATCH] Bump RECENT_DATE + +--- + urllib3-1.26.7/src/urllib3/connection.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/urllib3-1.26.7/src/urllib3/connection.py b/urllib3-1.26.7/src/urllib3/connection.py +index 60f70f7..f4991e5 100644 +--- a/urllib3-1.26.7/src/urllib3/connection.py ++++ b/urllib3-1.26.7/src/urllib3/connection.py +@@ -68,7 +68,7 @@ port_by_scheme = {"http": 80, "https": 443} + + # When it comes time to update this value as a part of regular maintenance + # (ie test_recent_date is failing) update it to ~6 months before the current date. +-RECENT_DATE = datetime.date(2020, 7, 1) ++RECENT_DATE = datetime.date(2022, 1, 1) + + _CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]") + +-- +2.27.0 + diff --git a/python-urllib3.spec b/python-urllib3.spec index 36d9e13..116e0d6 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -3,7 +3,7 @@ Name: python-%{srcname} Version: 1.26.7 -Release: 1 +Release: 2 Summary: Sanity-friendly HTTP client for Python License: MIT URL: https://urllib3.readthedocs.io @@ -12,6 +12,7 @@ Source1: ssl_match_hostname_py3.py Patch0001: remove_mock.patch Patch6000: backport-CVE-2021-28363.patch +Patch6001: Bump-RECENT_DATE.patch BuildArch: noarch @@ -73,6 +74,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt %{python3_sitelib}/urllib3-*.egg-info %changelog +* Web Jul 06 2022 chenhaixing - 1.26.7.2 +- add patch Bump RECENT_DATE + * Wed Jan 19 2022 wangkerong - 1.26.7-1 - update to 1.26.7 and remove python-nose dependency -- Gitee From e83ad4a048074539533a64d9edefafd5f2ffca4c Mon Sep 17 00:00:00 2001 From: chenhaixing Date: Wed, 6 Jul 2022 21:15:11 +0800 Subject: [PATCH 2/3] add-patch-Bump-RECENT_DATE.patch --- python-urllib3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 116e0d6..f612983 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -74,7 +74,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt %{python3_sitelib}/urllib3-*.egg-info %changelog -* Web Jul 06 2022 chenhaixing - 1.26.7.2 +* Wed Jul 06 2022 chenhaixing - 1.26.7.2 - add patch Bump RECENT_DATE * Wed Jan 19 2022 wangkerong - 1.26.7-1 -- Gitee From 2c07008b975d7bb9bbf645da13634f8c0b5be467 Mon Sep 17 00:00:00 2001 From: chenhaixing Date: Wed, 6 Jul 2022 21:25:30 +0800 Subject: [PATCH 3/3] add-patch-Bump-RECENT_DATE.patch --- Bump-RECENT_DATE.patch | 8 ++++---- python-urllib3.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Bump-RECENT_DATE.patch b/Bump-RECENT_DATE.patch index 58c02da..770cb98 100644 --- a/Bump-RECENT_DATE.patch +++ b/Bump-RECENT_DATE.patch @@ -4,13 +4,13 @@ Date: Fri, 1 Jul 2022 14:43:18 +0400 Subject: [PATCH] Bump RECENT_DATE --- - urllib3-1.26.7/src/urllib3/connection.py | 2 +- + /src/urllib3/connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/urllib3-1.26.7/src/urllib3/connection.py b/urllib3-1.26.7/src/urllib3/connection.py +diff --git a/src/urllib3/connection.py b/urllib3-1.26.7/src/urllib3/connection.py index 60f70f7..f4991e5 100644 ---- a/urllib3-1.26.7/src/urllib3/connection.py -+++ b/urllib3-1.26.7/src/urllib3/connection.py +--- a/src/urllib3/connection.py ++++ b/src/urllib3/connection.py @@ -68,7 +68,7 @@ port_by_scheme = {"http": 80, "https": 443} # When it comes time to update this value as a part of regular maintenance diff --git a/python-urllib3.spec b/python-urllib3.spec index f612983..7c96b0a 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -74,7 +74,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt %{python3_sitelib}/urllib3-*.egg-info %changelog -* Wed Jul 06 2022 chenhaixing - 1.26.7.2 +* Wed Jul 06 2022 chenhaixing - 1.26.7-2 - add patch Bump RECENT_DATE * Wed Jan 19 2022 wangkerong - 1.26.7-1 -- Gitee