diff options
author | Felipe Sateler <fsateler@debian.org> | 2019-01-10 19:32:17 -0300 |
---|---|---|
committer | Felipe Sateler <fsateler@debian.org> | 2019-01-10 19:32:17 -0300 |
commit | e026824d602ad4945a3dac039177011d1462962b (patch) | |
tree | 1e68aa7bdb8a6076509b564dff5466770786d6b3 | |
parent | 408afe9a77e0d57e20bf0fa5b71109458cbad097 (diff) |
Revert "Drop dependency on ssl-match-hostname backport"
This reverts commit 6889e0207e91a28938fae7f2618e809ecd13a2e8.
-rw-r--r-- | debian/control | 1 | ||||
-rw-r--r-- | debian/patches/Drop-dependency-on-ssl-match-hostname-backport.patch | 24 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 25 deletions
diff --git a/debian/control b/debian/control index 971dee4..54d92ba 100644 --- a/debian/control +++ b/debian/control @@ -35,6 +35,7 @@ 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 deleted file mode 100644 index d8c8472..0000000 --- a/debian/patches/Drop-dependency-on-ssl-match-hostname-backport.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 670547a..f499a22 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ requirements.patch -Drop-dependency-on-ssl-match-hostname-backport.patch |