Remove obsolete patches for eventlet and requests
We are currently carrying patches for python-eventlet and python-requests that are over three years old and were created to "fix" a nova issue. Now that nova is in a container, it no longer uses our eventlet or requests so these patches do not have any effect. The patches need to be removed to allow eventlet to be upversioned, which is being done in another commit. Change-Id: I730ba86d8f6ec8b88b060ada324cfd268af24b35 Story: 2006781 Task: 37583 Depends-On: https://review.opendev.org/#/c/700071/ Depends-On: https://review.opendev.org/#/c/700054/ Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
This commit is contained in:
Bart Wensley
parent
435361662f
commit
bcfade61de
@ -49,8 +49,6 @@ config/puppet-modules/openstack/puppet-horizon-9.5.0
|
||||
config/puppet-modules/openstack/puppet-keystone-11.3.0
|
||||
config/puppet-modules/openstack/puppet-openstacklib-11.3.0
|
||||
config/puppet-modules/openstack/puppet-oslo-11.3.0
|
||||
python/python-eventlet
|
||||
python/python-requests
|
||||
base/systemd
|
||||
storage-drivers/python-3parclient
|
||||
storage-drivers/python-lefthandclient
|
||||
|
||||
@ -30,10 +30,8 @@ puppet-rabbitmq-5.6.0-4.5ac45degit.el7.src.rpm
|
||||
puppet-staging-1.0.4-1.b466d93git.el7.src.rpm
|
||||
puppet-stdlib-4.18.0-2.el7.src.rpm
|
||||
python-docker-3.3.0-1.el7.src.rpm
|
||||
python-eventlet-0.18.4-2.el7.src.rpm
|
||||
python-keyring-5.7.1-1.el7.src.rpm
|
||||
python-psycopg2-2.5.1-3.el7.src.rpm
|
||||
python-requests-2.21.0-2.el7.src.rpm
|
||||
python-voluptuous-0.8.9-1.el7.src.rpm
|
||||
# rdma-core-45mlnx1-1.45101.src.rpm
|
||||
resource-agents-4.1.1-12.el7_6.7.src.rpm
|
||||
|
||||
@ -1 +0,0 @@
|
||||
TIS_PATCH_VER=2
|
||||
@ -1,27 +0,0 @@
|
||||
From 2ae1604b483c4aeb97c96cba2b6fd2d7c7bb0fce Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Tue, 24 Jan 2017 12:31:27 -0500
|
||||
Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
||||
|
||||
Conflicts:
|
||||
SPECS/python-eventlet.spec
|
||||
---
|
||||
SPECS/python-eventlet.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/python-eventlet.spec b/SPECS/python-eventlet.spec
|
||||
index d85d6c1..151fa56 100644
|
||||
--- a/SPECS/python-eventlet.spec
|
||||
+++ b/SPECS/python-eventlet.spec
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 0.18.4
|
||||
-Release: 2%{?dist}
|
||||
+Release: 2.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Highly concurrent networking library
|
||||
License: MIT
|
||||
URL: http://eventlet.net
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
spec-include-TiS-paches.patch
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
||||
@ -1,34 +0,0 @@
|
||||
From 869679b3dc8fb689e52cf51f2577aceb52fb8538 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Tue, 24 Jan 2017 12:31:27 -0500
|
||||
Subject: [PATCH 1/2] WRS: spec-include-TiS-paches.patch
|
||||
|
||||
---
|
||||
SPECS/python-eventlet.spec | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/SPECS/python-eventlet.spec b/SPECS/python-eventlet.spec
|
||||
index b33e617..d85d6c1 100644
|
||||
--- a/SPECS/python-eventlet.spec
|
||||
+++ b/SPECS/python-eventlet.spec
|
||||
@@ -25,6 +25,9 @@ BuildRequires: python-setuptools
|
||||
|
||||
Requires: python-greenlet
|
||||
|
||||
+# WRS patches
|
||||
+Patch0: 0001-CGTS-2869-close-connection-on-HTTP-413-Request-Entit.patch
|
||||
+
|
||||
%description
|
||||
Eventlet is a networking library written in Python. It achieves high
|
||||
scalability by using non-blocking io while at the same time retaining
|
||||
@@ -94,6 +97,7 @@ Documentation for the python-eventlet package.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{pypi_name}-%{version}
|
||||
+%patch0 -p1
|
||||
rm -rf *.egg-info
|
||||
|
||||
# generate html docs
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From bdbcd8615e1720b4098296752a2f4273a0947a8d Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Badea <daniel.badea@windriver.com>
|
||||
Date: Tue, 6 Sep 2016 15:09:39 +0000
|
||||
Subject: [PATCH] CGTS-2869 close connection on HTTP 413 Request Entity Too
|
||||
Large
|
||||
|
||||
Discard request body in case it's too large: close connection
|
||||
wile request is in progress.
|
||||
---
|
||||
eventlet/wsgi.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py
|
||||
index 6af2b99..8eac966 100644
|
||||
--- a/eventlet/wsgi.py
|
||||
+++ b/eventlet/wsgi.py
|
||||
@@ -525,6 +525,8 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
|
||||
finally:
|
||||
if hasattr(result, 'close'):
|
||||
result.close()
|
||||
+ if str(status_code[0]) == '413':
|
||||
+ self.close_connection = 1
|
||||
request_input = self.environ['eventlet.input']
|
||||
if (request_input.chunked_input or
|
||||
request_input.position < (request_input.content_length or 0)):
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
mirror:Source/python-eventlet-0.18.4-2.el7.src.rpm
|
||||
@ -1 +0,0 @@
|
||||
TIS_PATCH_VER=2
|
||||
@ -1,25 +0,0 @@
|
||||
From 9e05fbda393fe0ed6cb581c33ba19a14ab07abb6 Mon Sep 17 00:00:00 2001
|
||||
From: jmckenna <jason.mckenna@windriver.com>
|
||||
Date: Wed, 13 Dec 2017 09:02:08 -0500
|
||||
Subject: [PATCH 1/2] Update package versioning for TIS format
|
||||
|
||||
---
|
||||
SPECS/python-requests.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/python-requests.spec b/SPECS/python-requests.spec
|
||||
index efe0966..111bab7 100644
|
||||
--- a/SPECS/python-requests.spec
|
||||
+++ b/SPECS/python-requests.spec
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
Name: python-requests
|
||||
Version: 2.21.0
|
||||
-Release: 2%{?dist}
|
||||
+Release: 2.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: HTTP library, written in Python, for human beings
|
||||
|
||||
License: ASL 2.0
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From b99292ef32fdde60d2ec4181ee5963b93a97cdf2 Mon Sep 17 00:00:00 2001
|
||||
From: jmckenna <jason.mckenna@windriver.com>
|
||||
Date: Wed, 13 Dec 2017 09:02:40 -0500
|
||||
Subject: [PATCH 2/2] include patch for error handling
|
||||
|
||||
---
|
||||
SPECS/python-requests.spec | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/SPECS/python-requests.spec b/SPECS/python-requests.spec
|
||||
index 111bab7..8aab964 100644
|
||||
--- a/SPECS/python-requests.spec
|
||||
+++ b/SPECS/python-requests.spec
|
||||
@@ -39,6 +39,8 @@ Patch2: python-requests-urllib3-at-%{urllib3_unbundled_version}.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1653223
|
||||
Patch5: requests-2.20.0-no-py2-httpbin.patch
|
||||
|
||||
+Patch6: 0001-close-connection-on-HTTP-413-Request-Entit.patch
|
||||
+
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
||||
0002-include-patch-for-error-handling.patch
|
||||
@ -1,45 +0,0 @@
|
||||
From 268a1f179e554027637bd2951b24ad44ecb4a1ee Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Badea <daniel.badea@windriver.com>
|
||||
Date: Wed, 7 Sep 2016 09:10:10 +0000
|
||||
Subject: [PATCH] close connection on HTTP 413 Request Entity Too
|
||||
Large
|
||||
|
||||
Allow low_conn to retrieve/handle unread response data buffers
|
||||
in case ProtocolError or socket.error are raised while sending
|
||||
request data.
|
||||
---
|
||||
requests/adapters.py | 18 ++++++++++++------
|
||||
1 file changed, 12 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/requests/adapters.py b/requests/adapters.py
|
||||
index fd46325..087258a 100644
|
||||
--- a/requests/adapters.py
|
||||
+++ b/requests/adapters.py
|
||||
@@ -466,12 +466,18 @@ class HTTPAdapter(BaseAdapter):
|
||||
|
||||
low_conn.endheaders()
|
||||
|
||||
- for i in request.body:
|
||||
- low_conn.send(hex(len(i))[2:].encode('utf-8'))
|
||||
- low_conn.send(b'\r\n')
|
||||
- low_conn.send(i)
|
||||
- low_conn.send(b'\r\n')
|
||||
- low_conn.send(b'0\r\n\r\n')
|
||||
+ try:
|
||||
+ for i in request.body:
|
||||
+ low_conn.send(hex(len(i))[2:].encode('utf-8'))
|
||||
+ low_conn.send(b'\r\n')
|
||||
+ low_conn.send(i)
|
||||
+ low_conn.send(b'\r\n')
|
||||
+ low_conn.send(b'0\r\n\r\n')
|
||||
+ except (ProtocolError, socket.error) as err:
|
||||
+ # allow low_conn to retrieve/handle unread response
|
||||
+ # data buffers in case ProtocolError or socket.error
|
||||
+ # are raised while sending request data
|
||||
+ pass
|
||||
|
||||
# Receive the response from the server
|
||||
try:
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
mirror:Source/python-requests-2.21.0-2.el7.src.rpm
|
||||
Loading…
Reference in New Issue
Block a user