fix-match-hostname.diff, control: Drop the patch and python-openssl deps, not needed anymore

This commit is contained in:
Timo Aaltonen
2015-10-03 09:01:03 +03:00
parent fddbb15428
commit bb5d3f702d
4 changed files with 2 additions and 14 deletions

2
debian/changelog vendored
View File

@@ -1,6 +1,8 @@
freeipa (4.2.1-1) UNRELEASED; urgency=medium
* New upstream release.
* fix-match-hostname.diff, control: Drop the patch and python-openssl
deps, not needed anymore
-- Timo Aaltonen <tjaalton@debian.org> Sat, 03 Oct 2015 08:56:31 +0300

2
debian/control vendored
View File

@@ -44,7 +44,6 @@ Build-Depends:
python-netaddr,
python-nose,
python-nss (>= 0.16.0),
python-openssl,
python-polib,
python-pyasn1,
python-qrcode (>= 5.0.0),
@@ -218,7 +217,6 @@ Depends:
python-memcache,
python-netaddr,
python-nss (>= 0.16.0),
python-openssl,
python-pyasn1,
python-qrcode (>= 5.0.0),
python-usb (>= 1.0.0~b2),

View File

@@ -1,11 +0,0 @@
--- a/ipalib/plugins/otptoken.py
+++ b/ipalib/plugins/otptoken.py
@@ -25,7 +25,7 @@ from ipalib.errors import PasswordMismat
from ipalib.request import context
from ipalib.frontend import Local
-from backports.ssl_match_hostname import match_hostname
+from ssl import match_hostname
import base64
import uuid
import urllib

View File

@@ -5,7 +5,6 @@ no-test-lang.diff
port-ipa-client-automount.diff
# send upstream
fix-match-hostname.diff
add-debian-platform.diff
fix-hyphen-used-as-minus-sign.patch
fix-manpage-has-errors-from-man.patch