add missing patches to requests-2.26.0
This commit is contained in:
parent
560c630856
commit
06106473f8
|
@ -1,3 +1,5 @@
|
|||
AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb9fd7d09e151aef7da27fb105d5038ddc99c3d838c7a166d769223ff18ed0517e961ffa345459b4350ccdfa21b50d SHA512 89a4cf8d03f2bf8308cba1a6ed97b4f2340a2b9512636f2244f5f9cb6bae00300e73b58bbe53fad1d9c9e4e2e8e3298fa6741190869cfd4799e3be9bc56b0bc0
|
||||
AUX requests-2.26.0-trustme-dep.patch 1134 BLAKE2B c432d6edf75d37e62d529ce06ea5dc0ba88593f7c7b40900388bbfc2b8d8503870fe4226c256d36de9ca42f3b638ed5ea11176cb22ffe2e5d4828418e21619f6 SHA512 9f9383836d0bf5dd4f86ccf7e6f5d6d8f4601a68f42465958f431a8cc471d74584f616d1145fe21ae26c6b182a95758593a947b3dca7ad6fcd5f868421e182f2
|
||||
DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
|
||||
EBUILD requests-2.26.0.ebuild 1806 BLAKE2B 986e2e35b139c752321d3d3034c8fa474531abafa2d3855f9ab3be0e6f86fab99565b2e98fc17fe82252a65e892bdda986373ffc63043953ca3eaf0b29623eb2 SHA512 c64c06742ba604d261512b92082984b6b1ad6534cc4de96f71efdbb7407ff94fbe6b42c303d6450d6f402e52576e55d515d60e148b4d7ef2e9a358f7f7a31a66
|
||||
MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
|
||||
|
|
|
@ -0,0 +1,30 @@
|
|||
From 6552e5374c335d62ba960a74b5b978897c823376 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Wed, 28 Jul 2021 10:33:22 +0200
|
||||
Subject: [PATCH] Fix creating non-listening sockets in tests on some platforms
|
||||
|
||||
Fix the listen() invocation for the test server not to pass a backlog
|
||||
value of zero. The value of zero means no backlog which effectively
|
||||
means that the socket can not accept any connections. This does not
|
||||
matter for the majority of platforms since the value is only advisory
|
||||
and the platform tends to go with a bigger backlog anyway. However,
|
||||
a few platforms (e.g. alpha or riscv Linux) do take the value literally,
|
||||
and therefore the tests fail since they are unable to connect to
|
||||
the server. Let Python use a 'default reasonable value' instead.
|
||||
---
|
||||
tests/testserver/server.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/testserver/server.py b/tests/testserver/server.py
|
||||
index 132221f7c4..92dcb6cb1a 100644
|
||||
--- a/tests/testserver/server.py
|
||||
+++ b/tests/testserver/server.py
|
||||
@@ -78,7 +78,7 @@ def run(self):
|
||||
def _create_socket_and_bind(self):
|
||||
sock = socket.socket()
|
||||
sock.bind((self.host, self.port))
|
||||
- sock.listen(0)
|
||||
+ sock.listen()
|
||||
return sock
|
||||
|
||||
def _close_server_sock_ignore_errors(self):
|
|
@ -0,0 +1,35 @@
|
|||
From 55da533a87afe188282b7f8dfbadeb30c21743d8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Sat, 27 Nov 2021 10:33:35 +0100
|
||||
Subject: [PATCH] Defer the trustme import until inside the fixture
|
||||
|
||||
Move the trustme import from global scope into the nosan_server fixture
|
||||
in order to make it possible to deselect the test via command-line
|
||||
when trustme is not available.
|
||||
---
|
||||
tests/conftest.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/conftest.py b/tests/conftest.py
|
||||
index 099462cf52..4f9b2641b4 100644
|
||||
--- a/tests/conftest.py
|
||||
+++ b/tests/conftest.py
|
||||
@@ -13,7 +13,6 @@
|
||||
|
||||
import pytest
|
||||
from requests.compat import urljoin
|
||||
-import trustme
|
||||
|
||||
|
||||
def prepare_url(value):
|
||||
@@ -38,6 +37,10 @@ def httpbin_secure(httpbin_secure):
|
||||
|
||||
@pytest.fixture
|
||||
def nosan_server(tmp_path_factory):
|
||||
+ # delay importing until the fixture in order to make it possible
|
||||
+ # to deselect the test via command-line when trustme is not available
|
||||
+ import trustme
|
||||
+
|
||||
tmpdir = tmp_path_factory.mktemp("certs")
|
||||
ca = trustme.CA()
|
||||
# only commonName, no subjectAltName
|
Loading…
Reference in New Issue