gentoo auto-resync : 03:10:2024 - 04:43:49

2 files changed, 0 insertions, 58 deletions

diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 163b27b3175c..7f8ca5a7fd4a 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,5 +1,4 @@
 AUX httpie-3.2.1-pytest-fixtures.patch 19140 BLAKE2B df54635098d0da8b9b8c37dd4a144caf330f6ca9ca657de90ea510f91498735700b84b6ce48d91ff1ed88eecfa0d80a0ac626d2d8384a8ac68d9a7303d048509 SHA512 b881cefb48079ffa5ee0450e591185e15bf9052ecd16ccce7a5faddc7cc4cc9cf3f73cfcdde8dca129969b182086a2c1d867669261f91196df4318aae466a7b0
-AUX httpie-urllib3-2-fixes.patch 1852 BLAKE2B 8298b18a64e0fc99f422d5c3260ca9b567de08f9cc7b0d2cb0c20ba675a717dd1e4cff03bc036beead71f58426153e2b040fea06e4383df768d004afdbd807e7 SHA512 c926450b4ef43274e0e70b51605ff020ccf82a0704d86814590cbe40db5ea1329ec357b7f630f860b09549f76a34211c3799956b67d8f2f0db51ad14c1ba53b9
 DIST httpie-3.2.2.gh.tar.gz 1279161 BLAKE2B aa5df73acbbe635fbfd3db458a2289042091a27d7b1791e9739874c1882e436814f74eec2b695f8acd76f9b9dd210f43dd9f8b7c0feea0cf4782b30f0e53b91a SHA512 5e95eba5a5ca8017dfd76ace525c57d2931d8918d51e84e8744eb9393cda5ae8e6cd6a1455c4aa82e50fa35edc35468a8b3582169c8f94858e61b09548cfa13d
 DIST httpie-3.2.3.gh.tar.gz 1279649 BLAKE2B 3404078512d9b61304560cf2226ed8837ab362f4627e73200d3379878f0ce52ca7c32160232f78544403cbe85d8ca6f5ad8f97d36fd04b1362d95d3e871581ab SHA512 0b44c15d42f73533a94f29e01c1465439cc937994deb8699135bcd56f77392ec0198c57d159f10295e3e0704dcdac486d6df4ce9f8478b914db300c92aaaf01d
 EBUILD httpie-3.2.2.ebuild 3084 BLAKE2B 8286a2241fd3976856f2ffc3a322cfebb256842149d6edf429fc790d321021669cecbe4d2a37b60156f3dbfe9a70398fe8920e35a0bffce904eb6d09d3419bc4 SHA512 ab79ad610ac752e8eccd3e6dbf400c0c7ce4531937826cea5f3dd64fe9206cfbc61767a00083d95572b5c676b7c82bfbf205dbed69dee268d2f80644caa8dac8
diff --git a/net-misc/httpie/files/httpie-urllib3-2-fixes.patch b/net-misc/httpie/files/httpie-urllib3-2-fixes.patch
deleted file mode 100644
index 2c6c5d348171..000000000000
--- a/net-misc/httpie/files/httpie-urllib3-2-fixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f8bb34ebf97bf6a103a7d021b16059522d76d52d Mon Sep 17 00:00:00 2001
-From: Brendon Smith <bws@bws.bio>
-Date: Sat, 6 May 2023 16:24:26 -0400
-Subject: [PATCH] Fix `urllib3.util.ssl_.DEFAULT_CIPHERS` import
-
----
- httpie/cli/definition.py |  4 ++--
- httpie/ssl_.py           | 15 ++++++++++-----
- 2 files changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/httpie/cli/definition.py b/httpie/cli/definition.py
-index 0e5f91edf7..5e54d1c896 100644
---- a/httpie/cli/definition.py
-+++ b/httpie/cli/definition.py
-@@ -831,8 +831,8 @@ def format_auth_help(auth_plugins_mapping, *, isolation_mode: bool = False):
-     short_help='A string in the OpenSSL cipher list format.',
-     help=f"""
- 
--    A string in the OpenSSL cipher list format. By default, the following
--    is used:
-+    A string in the OpenSSL cipher list format. By default, the available
-+    system ciphers will be used, which are:
- 
-     {DEFAULT_SSL_CIPHERS}
- 
-diff --git a/httpie/ssl_.py b/httpie/ssl_.py
-index b9438543eb..c8dba0ea8d 100644
---- a/httpie/ssl_.py
-+++ b/httpie/ssl_.py
-@@ -3,13 +3,9 @@
- 
- from httpie.adapters import HTTPAdapter
- # noinspection PyPackageRequirements
--from urllib3.util.ssl_ import (
--    DEFAULT_CIPHERS, create_urllib3_context,
--    resolve_ssl_version,
--)
-+from urllib3.util.ssl_ import create_urllib3_context, resolve_ssl_version
- 
- 
--DEFAULT_SSL_CIPHERS = DEFAULT_CIPHERS
- SSL_VERSION_ARG_MAPPING = {
-     'ssl2.3': 'PROTOCOL_SSLv23',
-     'ssl3': 'PROTOCOL_SSLv3',
-@@ -94,3 +90,12 @@ def _is_key_file_encrypted(key_file):
-                 return True
- 
-     return False
-+
-+
-+try:
-+    from urllib3.util.ssl_ import DEFAULT_CIPHERS
-+except ImportError:
-+    _context = HTTPieHTTPSAdapter._create_ssl_context(verify=False)
-+    DEFAULT_CIPHERS = ":".join([cipher["name"] for cipher in _context.get_ciphers()])
-+
-+DEFAULT_SSL_CIPHERS = DEFAULT_CIPHERS