[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/cinder/, sys-cluster/cinder/files/

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/cinder/, sys-cluster/cinder/files/

[Alessandro Barbieri]

commit:     d00ac2f9d87896edf06a9eb791810a6382bddafb
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Apr 23 00:46:10 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat Apr 23 01:52:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d00ac2f9

sys-cluster/cinder: don't use vendored urllib3

Closes: https://bugs.gentoo.org/840026
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/cinder/cinder-20.0.0.ebuild                       |  2 ++
 .../cinder/files/cinder-20.0.0-no-vendored-urllib.patch       | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/sys-cluster/cinder/cinder-20.0.0.ebuild b/sys-cluster/cinder/cinder-20.0.0.ebuild
index 3d31df44a..6f95229e3 100644
--- a/sys-cluster/cinder/cinder-20.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-20.0.0.ebuild
@@ -87,6 +87,7 @@ RDEPEND="
 	>=dev-python/boto3-1.16.51[${PYTHON_USEDEP}]
 
 	>=dev-python/sqlalchemy-1.4.23[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
 
 	acct-user/cinder
 	acct-group/cinder
@@ -109,6 +110,7 @@ BDEPEND="
 "
 
 RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${P}-no-vendored-urllib.patch" )
 
 pkg_pretend() {
 	linux-info_pkg_setup

diff --git a/sys-cluster/cinder/files/cinder-20.0.0-no-vendored-urllib.patch b/sys-cluster/cinder/files/cinder-20.0.0-no-vendored-urllib.patch
new file mode 100644
index 000000000..8166e26e6
--- /dev/null
+++ b/sys-cluster/cinder/files/cinder-20.0.0-no-vendored-urllib.patch
@@ -0,0 +1,11 @@
+--- a/cinder/backup/drivers/s3.py
++++ b/cinder/backup/drivers/s3.py
+@@ -74,7 +74,7 @@
+ import boto3
+ from botocore.config import Config
+ from botocore import exceptions as boto_exc
+-from botocore.vendored.requests.packages.urllib3 import exceptions as \
++from urllib3 import exceptions as \
+     urrlib_exc
+ from oslo_config import cfg
+ from oslo_log import log as logging