[Python-modules-commits] [python-socksipy] 02/10: add Debian files from 1.02-2

Wolfgang Borgert debacle at moszumanska.debian.org
Fri Jan 8 00:26:33 UTC 2016


This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-socksipy.

commit 7aea9024f84ba20c147c59767c2ddd424631996e
Author: W. Martin Borgert <debacle at debian.org>
Date:   Mon Dec 28 00:22:01 2015 +0100

    add Debian files from 1.02-2
---
 debian/changelog                | 62 +++++++++++++++++++++++++++++++++++++++++
 debian/compat                   |  1 +
 debian/control                  | 31 +++++++++++++++++++++
 debian/copyright                | 31 +++++++++++++++++++++
 debian/patches/series           |  1 +
 debian/patches/unicode_domain   | 27 ++++++++++++++++++
 debian/python-socksipy.docs     |  2 ++
 debian/python-socksipy.install  |  1 +
 debian/python3-socksipy.docs    |  2 ++
 debian/python3-socksipy.install |  1 +
 debian/rules                    | 21 ++++++++++++++
 debian/source/format            |  1 +
 debian/watch                    |  3 ++
 13 files changed, 184 insertions(+)

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e819f40
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,62 @@
+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 ]
+  * Remove deprecated dpatch and upgrade to packaging format "3.0
+    quilt". (Closes: #664379)
+
+  [ Dimitri John Ledkov ]
+  * QA upload.
+  * New upstream release. (Closes: #604836)
+  * Update upstream in watch file.
+  * Drop setup.py patch.
+  * New upstream release.
+  * Rebuild tarball, with corrected file permissions.
+
+ -- Dimitri John Ledkov <dimitri.j.ledkov at linux.intel.com>  Mon, 13 Oct 2014 12:26:15 +0100
+
+python-socksipy (1.0-2) unstable; urgency=low
+
+  * Orphan package (cf. #700554).
+
+  [ Sandro Tosi ]
+  * debian/control
+    - switch Vcs-Browser field to viewsvn
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Andrea Colangelo ]
+  * Convert to dh_python2 (Closes: #617030). Patch from Ubuntu, thanks to
+    Andrew Starr-Bochicchio for forwarding it.
+
+  [ Sebastian Ramacher ]
+  * debian/rules: Convert to dh(1).
+  * debian/control:
+    - Change Maintainer to Debian QA Group and remove Uploaders.
+    - Bump Standards-Version to 3.9.4.
+    - Bump dpatch in Build-Depends to >= 2.0.32 for dh integration.
+    - Bump debhelper in Build-Depends to >= 9.
+    - Add ${misc:Depends} to Depends.
+    - Remove Provides.
+    - Remove XS-Python-Version.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Wed, 26 Jun 2013 16:58:19 +0200
+
+python-socksipy (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #467222)
+
+ -- Thomas Bläsing <thomasbl at pool.math.tu-berlin.de>  Tue, 14 Oct 2008 00:07:51 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..5910a77
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,31 @@
+Source: python-socksipy
+Section: python
+Priority: optional
+Maintainer: Debian QA Group <packages at qa.debian.org>
+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/
+
+Package: python-socksipy
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+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.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..232f371
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+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/
+
+Files:*
+Copyright: 2006-2008 Dan Haim <negativeiq at users.sourceforge.net>
+           2007-2010 Mario Vilas
+License: BSD-2-clause
+
+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.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c9a663a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+unicode_domain
diff --git a/debian/patches/unicode_domain b/debian/patches/unicode_domain
new file mode 100644
index 0000000..32a3422
--- /dev/null
+++ b/debian/patches/unicode_domain
@@ -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))
diff --git a/debian/python-socksipy.docs b/debian/python-socksipy.docs
new file mode 100644
index 0000000..dc5a59f
--- /dev/null
+++ b/debian/python-socksipy.docs
@@ -0,0 +1,2 @@
+README
+BUGS
diff --git a/debian/python-socksipy.install b/debian/python-socksipy.install
new file mode 100644
index 0000000..48257a5
--- /dev/null
+++ b/debian/python-socksipy.install
@@ -0,0 +1 @@
+usr/lib/python2.*/*-packages/*
diff --git a/debian/python3-socksipy.docs b/debian/python3-socksipy.docs
new file mode 100644
index 0000000..dc5a59f
--- /dev/null
+++ b/debian/python3-socksipy.docs
@@ -0,0 +1,2 @@
+README
+BUGS
diff --git a/debian/python3-socksipy.install b/debian/python3-socksipy.install
new file mode 100644
index 0000000..87e0b0a
--- /dev/null
+++ b/debian/python3-socksipy.install
@@ -0,0 +1 @@
+usr/lib/python3/*-packages/*
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..b1c6e00
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+%:
+	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/
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..13d5848
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=2
+http://code.google.com/p/socksipy-branch/downloads/list?can=1 .*/SocksiPy-branch-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-socksipy.git



More information about the Python-modules-commits mailing list