[Python-modules-commits] r31271 - in packages/python-socksipy/trunk/debian (11 files)
nirgal-guest at users.alioth.debian.org
nirgal-guest at users.alioth.debian.org
Sat Oct 25 17:24:58 UTC 2014
Date: Saturday, October 25, 2014 @ 17:24:58
Author: nirgal-guest
Revision: 31271
Add python3 support
Added:
packages/python-socksipy/trunk/debian/patches/unicode_domain
packages/python-socksipy/trunk/debian/python-socksipy.docs
packages/python-socksipy/trunk/debian/python-socksipy.install
packages/python-socksipy/trunk/debian/python3-socksipy.docs
packages/python-socksipy/trunk/debian/python3-socksipy.install
Modified:
packages/python-socksipy/trunk/debian/changelog
packages/python-socksipy/trunk/debian/control
packages/python-socksipy/trunk/debian/copyright
packages/python-socksipy/trunk/debian/patches/series
packages/python-socksipy/trunk/debian/rules
Deleted:
packages/python-socksipy/trunk/debian/docs
Modified: packages/python-socksipy/trunk/debian/changelog
===================================================================
--- packages/python-socksipy/trunk/debian/changelog 2014-10-25 15:38:05 UTC (rev 31270)
+++ packages/python-socksipy/trunk/debian/changelog 2014-10-25 17:24:58 UTC (rev 31271)
@@ -1,3 +1,16 @@
+python-socksipy (1.02-2) unstable; urgency=low
+
+ * QA upload.
+ * Add support for python3: (Closes: #766752)
+ - New patch unicode_domain for unicode destination address, which is python3
+ default.
+ - New python3-socksipy binary package in control
+ - Updated debian/rules for python2 + python3 packages.
+ * Bump standards-version to 3.9.6: No change required.
+ * Updated copyright file to DEP5 format.
+
+ -- Jean-Michel Nirgal Vourgère <jmv_deb at nirgal.com> Sat, 25 Oct 2014 18:22:12 +0200
+
python-socksipy (1.02-1) unstable; urgency=medium
[ Jari Aalto ]
Modified: packages/python-socksipy/trunk/debian/control
===================================================================
--- packages/python-socksipy/trunk/debian/control 2014-10-25 15:38:05 UTC (rev 31270)
+++ packages/python-socksipy/trunk/debian/control 2014-10-25 17:24:58 UTC (rev 31271)
@@ -2,8 +2,8 @@
Section: python
Priority: optional
Maintainer: Debian QA Group <packages at qa.debian.org>
-Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), dh-python
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python3-all, dh-python
Homepage: http://socksipy.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-socksipy/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-socksipy/trunk/
@@ -11,8 +11,21 @@
Package: python-socksipy
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
-Description: Python SOCKS client module
+Description: Python 2 SOCKS client module
This module was designed to allow developers of Python
software that uses the Internet or another TCP/IP-based
network to add support for connection through a SOCKS proxy
server with as much ease as possible.
+ .
+ This is the Python 2 version.
+
+Package: python3-socksipy
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Python 3 SOCKS client module
+ This module was designed to allow developers of Python
+ software that uses the Internet or another TCP/IP-based
+ network to add support for connection through a SOCKS proxy
+ server with as much ease as possible.
+ .
+ This is the Python 3 version.
Modified: packages/python-socksipy/trunk/debian/copyright
===================================================================
--- packages/python-socksipy/trunk/debian/copyright 2014-10-25 15:38:05 UTC (rev 31270)
+++ packages/python-socksipy/trunk/debian/copyright 2014-10-25 17:24:58 UTC (rev 31271)
@@ -1,32 +1,31 @@
-This package was debianized by Thomas Bläsing <thomasbl at pool.math.tu-berlin.de> on
-Tue, 14 Oct 2008 00:07:51 +0200
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SocksiPy
+Upstream-Contact: motoma at gmail.com
+Source: https://code.google.com/p/socksipy-branch/
-It was downloaded from http://socksipy.sourceforge.net/
+Files:*
+Copyright: 2006-2008 Dan Haim <negativeiq at users.sourceforge.net>
+ 2007-2010 Mario Vilas
+License: BSD-2-clause
-Upstream Author:
- Dan Haim <negativeiq at users.sourceforge.net>
-
-Copyright:
- Copyright (c) 2006-2008 Dan Haim <negativeiq at users.sourceforge.net>
-
-License:
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- 3. Neither the name of Dan Haim nor the names of his contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL DAN HAIM OR HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA
- OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMANGE.
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ 3. Neither the name of Dan Haim nor the names of his contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL DAN HAIM OR HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA
+ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMANGE.
Deleted: packages/python-socksipy/trunk/debian/docs
===================================================================
--- packages/python-socksipy/trunk/debian/docs 2014-10-25 15:38:05 UTC (rev 31270)
+++ packages/python-socksipy/trunk/debian/docs 2014-10-25 17:24:58 UTC (rev 31271)
@@ -1,2 +0,0 @@
-README
-BUGS
Modified: packages/python-socksipy/trunk/debian/patches/series
===================================================================
--- packages/python-socksipy/trunk/debian/patches/series 2014-10-25 15:38:05 UTC (rev 31270)
+++ packages/python-socksipy/trunk/debian/patches/series 2014-10-25 17:24:58 UTC (rev 31271)
@@ -1 +1 @@
-setup.py.patch
+unicode_domain
Added: packages/python-socksipy/trunk/debian/patches/unicode_domain
===================================================================
--- packages/python-socksipy/trunk/debian/patches/unicode_domain (rev 0)
+++ packages/python-socksipy/trunk/debian/patches/unicode_domain 2014-10-25 17:24:58 UTC (rev 31271)
@@ -0,0 +1,27 @@
+Description: Allows destination address to be unicode
+ .
+ This allows the package to run using python3.
+Author: Jean-Michel Nirgal Vourgère <jmv_deb at nirgal.com>
+Bug-Debian: https://bugs.debian.org/766752
+Forwarded: no
+Reviewed-By: <name and email of someone who approved the patch>
+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))
Added: packages/python-socksipy/trunk/debian/python-socksipy.docs
===================================================================
--- packages/python-socksipy/trunk/debian/python-socksipy.docs (rev 0)
+++ packages/python-socksipy/trunk/debian/python-socksipy.docs 2014-10-25 17:24:58 UTC (rev 31271)
@@ -0,0 +1,2 @@
+README
+BUGS
Added: packages/python-socksipy/trunk/debian/python-socksipy.install
===================================================================
--- packages/python-socksipy/trunk/debian/python-socksipy.install (rev 0)
+++ packages/python-socksipy/trunk/debian/python-socksipy.install 2014-10-25 17:24:58 UTC (rev 31271)
@@ -0,0 +1 @@
+usr/lib/python2.*/*-packages/*
Added: packages/python-socksipy/trunk/debian/python3-socksipy.docs
===================================================================
--- packages/python-socksipy/trunk/debian/python3-socksipy.docs (rev 0)
+++ packages/python-socksipy/trunk/debian/python3-socksipy.docs 2014-10-25 17:24:58 UTC (rev 31271)
@@ -0,0 +1,2 @@
+README
+BUGS
Added: packages/python-socksipy/trunk/debian/python3-socksipy.install
===================================================================
--- packages/python-socksipy/trunk/debian/python3-socksipy.install (rev 0)
+++ packages/python-socksipy/trunk/debian/python3-socksipy.install 2014-10-25 17:24:58 UTC (rev 31271)
@@ -0,0 +1 @@
+usr/lib/python3/*-packages/*
Modified: packages/python-socksipy/trunk/debian/rules
===================================================================
--- packages/python-socksipy/trunk/debian/rules 2014-10-25 15:38:05 UTC (rev 31270)
+++ packages/python-socksipy/trunk/debian/rules 2014-10-25 17:24:58 UTC (rev 31271)
@@ -1,4 +1,21 @@
#!/usr/bin/make -f
%:
- dh $@ --with python2
+ dh $@ --with python2,python3
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build
+
+override_dh_auto_build:
+ dh_auto_build
+ set -ex; for python in $(shell py3versions -r); do \
+ $$python setup.py build --build-lib=$(CURDIR)/debian/tmp; \
+ done;
+
+override_dh_auto_install:
+ dh_auto_install
+ set -ex; for python in $(shell py3versions -r); do \
+ $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+ done;
+ cp socks.py $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/
More information about the Python-modules-commits
mailing list