From 43f85394ba834267589a4e6478ef419d40e22503 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 17 May 2023 04:08:35 +0100
Subject: gentoo auto-resync : 17:05:2023 - 04:08:35

---
 net-misc/httpie/files/httpie-urllib3-2-fixes.patch | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 net-misc/httpie/files/httpie-urllib3-2-fixes.patch

(limited to 'net-misc/httpie/files')

diff --git a/net-misc/httpie/files/httpie-urllib3-2-fixes.patch b/net-misc/httpie/files/httpie-urllib3-2-fixes.patch
new file mode 100644
index 000000000000..2c6c5d348171
--- /dev/null
+++ b/net-misc/httpie/files/httpie-urllib3-2-fixes.patch
@@ -0,0 +1,57 @@
+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
-- 
cgit v1.2.3