summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Sateler <fsateler@debian.org>2018-10-02 16:34:11 -0300
committerFelipe Sateler <fsateler@debian.org>2018-10-02 16:35:36 -0300
commit6889e0207e91a28938fae7f2618e809ecd13a2e8 (patch)
treea27945d48726ad9b34c0aa315964902682e3a633
parent66b8eb319e208e22952f81ad91908bc7c9e64d4a (diff)
Drop dependency on ssl-match-hostname backport
The debian package for python has the backport built in. See #86989. Closes: #909972
-rw-r--r--debian/control1
-rw-r--r--debian/patches/Drop-dependency-on-ssl-match-hostname-backport.patch24
-rw-r--r--debian/patches/series1
3 files changed, 25 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 0bb95d1..6136ec4 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,6 @@ X-Python3-Version: >= 3.5
Package: python-docker
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
- python-backports.ssl-match-hostname (>= 3.5),
python-ipaddress (>=1.0.16)
Breaks: python-magnum (<< 5.0.0),
python-senlin (<< 2.0.0),
diff --git a/debian/patches/Drop-dependency-on-ssl-match-hostname-backport.patch b/debian/patches/Drop-dependency-on-ssl-match-hostname-backport.patch
new file mode 100644
index 0000000..d8c8472
--- /dev/null
+++ b/debian/patches/Drop-dependency-on-ssl-match-hostname-backport.patch
@@ -0,0 +1,24 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Tue, 2 Oct 2018 16:33:29 -0300
+Subject: Drop dependency on ssl-match-hostname backport
+
+The debian package for python has the backport built in. See #86989.
+
+Closes: #909972
+Forwarded: not-needed
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 57b2b5a..553e7b2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,7 +17,6 @@ requirements = [
+ ]
+
+ extras_require = {
+- ':python_version < "3.5"': 'backports.ssl_match_hostname >= 3.5',
+ # While not imported explicitly, the ipaddress module is required for
+ # ssl_match_hostname to verify hosts match with certificates via
+ # ServerAltname: https://pypi.python.org/pypi/backports.ssl_match_hostname
diff --git a/debian/patches/series b/debian/patches/series
index f499a22..670547a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
requirements.patch
+Drop-dependency-on-ssl-match-hostname-backport.patch