diff --git a/debian/changelog b/debian/changelog index 57a57af1cf4d2a6f8d443ea09153ee0844cae30b..67cc946132aa820223c7b4c47cbe7a073aad10ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-socksipy (1.5.0+dfsg-1) UNRELEASED; urgency=medium * adoption by DPMT (Closes: #700554) * switch to new upstream and upstream version (Closes: #808872) + * dropped unicode patch, fixed upstream -- W. Martin Borgert Sun, 27 Dec 2015 23:27:03 +0000 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index c9a663a6dce860487affbfcbcc3b6746eb88445b..0000000000000000000000000000000000000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -unicode_domain diff --git a/debian/patches/unicode_domain b/debian/patches/unicode_domain deleted file mode 100644 index 32a34226f1b3f715044303cef8f7f17de29bb163..0000000000000000000000000000000000000000 --- a/debian/patches/unicode_domain +++ /dev/null @@ -1,27 +0,0 @@ -Description: Allows destination address to be unicode - . - This allows the package to run using python3. -Author: Jean-Michel Nirgal Vourgère -Bug-Debian: https://bugs.debian.org/766752 -Forwarded: no -Reviewed-By: -Last-Update: 2014-10-25 - -Index: python-socksipy-1.02/socks.py -=================================================================== ---- python-socksipy-1.02.orig/socks.py -+++ python-socksipy-1.02/socks.py -@@ -212,7 +212,12 @@ class socksocket(socket.socket): - if self.__proxy[3]: - # Resolve remotely - ipaddr = None -- req = req + chr(0x03).encode() + chr(len(destaddr)).encode() + destaddr -+ if type(destaddr) != type(b''): # python3 -+ destaddr_bytes = destaddr.encode() -+ # TODO: support "xn--" prefixes as defined by RFC 3490 -+ else: -+ destaddr_bytes = destaddr -+ req = req + chr(0x03).encode() + chr(len(destaddr_bytes)).encode() + destaddr_bytes - else: - # Resolve locally - ipaddr = socket.inet_aton(socket.gethostbyname(destaddr))