!45 delete patch Bump-RECENT_DATE.patch and modify RECENT_DATE in python-urllib3.spec to adapt time change

From: @chen-haixing-hw 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-08-09 08:45:51 +00:00 committed by Gitee
commit 2c1c42850e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 27 deletions

View File

@ -1,25 +0,0 @@
From 2d98f6b53c38ab8e224cb825d6323b8eb54c887f Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@gmail.com>
Date: Fri, 1 Jul 2022 14:43:18 +0400
Subject: [PATCH] Bump RECENT_DATE
---
/src/urllib3/connection.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py
index 60f70f7..f4991e5 100644
--- 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
# (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

View File

@ -3,7 +3,7 @@
Name: python-%{srcname} Name: python-%{srcname}
Version: 1.26.8 Version: 1.26.8
Release: 1 Release: 2
Summary: Sanity-friendly HTTP client for Python Summary: Sanity-friendly HTTP client for Python
License: MIT License: MIT
URL: https://urllib3.readthedocs.io URL: https://urllib3.readthedocs.io
@ -12,7 +12,6 @@ Source1: ssl_match_hostname_py3.py
Patch0001: remove_mock.patch Patch0001: remove_mock.patch
Patch6000: backport-CVE-2021-28363.patch Patch6000: backport-CVE-2021-28363.patch
Patch6001: Bump-RECENT_DATE.patch
BuildArch: noarch BuildArch: noarch
@ -37,6 +36,10 @@ Python3 HTTP module with connection pooling and file POST abilities.
%prep %prep
%autosetup -n %{srcname}-%{version} -p1 %autosetup -n %{srcname}-%{version} -p1
recent_date=$(date --date "7 month ago" +"%Y, %_m, %_d")
sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_date)/" src/urllib3/connection.py
#Failure use case circumvention #Failure use case circumvention
rm -rf test/with_dummyserver/ rm -rf test/with_dummyserver/
rm -rf test/appengine/ rm -rf test/appengine/
@ -74,6 +77,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt
%{python3_sitelib}/urllib3-*.egg-info %{python3_sitelib}/urllib3-*.egg-info
%changelog %changelog
* Tue Aug 09 2022 chenhaixing <chenhaixing@huawei.com> - 1.26.8-2
- delete patch Bump-RECENT_DATE.patch and modify RECENT_DATE in python-urllib3.spec to adapt time change
* Mon Jul 18 2022 OpenStack_SIG <openstack@openeuler.org> - 1.26.8-1 * Mon Jul 18 2022 OpenStack_SIG <openstack@openeuler.org> - 1.26.8-1
- Upgrade package to version 1.26.8 - Upgrade package to version 1.26.8