[Python-modules-commits] r32911 - in packages/python-cryptography/trunk/debian (5 files)

[mithrandi at users.alioth.debian.org]

    Date: Monday, June 8, 2015 @ 12:51:07
  Author: mithrandi
Revision: 32911

Add ipaddr/idna junk.

Added:
  packages/python-cryptography/trunk/debian/patches/
  packages/python-cryptography/trunk/debian/patches/ipaddr-fallback
  packages/python-cryptography/trunk/debian/patches/series
Modified:
  packages/python-cryptography/trunk/debian/changelog
  packages/python-cryptography/trunk/debian/control

Modified: packages/python-cryptography/trunk/debian/changelog
===================================================================
--- packages/python-cryptography/trunk/debian/changelog	2015-06-08 08:08:19 UTC (rev 32910)
+++ packages/python-cryptography/trunk/debian/changelog	2015-06-08 12:51:07 UTC (rev 32911)
@@ -1,3 +1,9 @@
+python-cryptography (0.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Thu, 14 May 2015 05:00:11 +0200
+
 python-cryptography (0.8.2-3) unstable; urgency=medium
 
   * Add needs-root for autopkgtest (via patch from Matthias Klose in

Modified: packages/python-cryptography/trunk/debian/control
===================================================================
--- packages/python-cryptography/trunk/debian/control	2015-06-08 08:08:19 UTC (rev 32910)
+++ packages/python-cryptography/trunk/debian/control	2015-06-08 12:51:07 UTC (rev 32911)
@@ -14,10 +14,10 @@
  python-six (>= 1.4.1),
  python3-six (>= 1.4.1),
  libssl-dev,
- python-cryptography-vectors (>= 0.8.2~),
- python-cryptography-vectors (<< 0.8.3~),
- python3-cryptography-vectors (>= 0.8.2~),
- python3-cryptography-vectors (<< 0.8.3~),
+ python-cryptography-vectors (>= 0.9~),
+ python-cryptography-vectors (<< 0.9.1~),
+ python3-cryptography-vectors (>= 0.9~),
+ python3-cryptography-vectors (<< 0.9.1~),
  python-iso8601,
  python3-iso8601,
  python-pytest,
@@ -27,7 +27,10 @@
  python-pyasn1,
  python3-pyasn1,
  python-enum34,
- python3-enum34
+ python3-enum34,
+ python-ipaddr,
+ python-idna,
+ python3-idna,
 Standards-Version: 3.9.6
 Homepage: https://cryptography.io/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-cryptography/trunk/

Added: packages/python-cryptography/trunk/debian/patches/ipaddr-fallback
===================================================================
--- packages/python-cryptography/trunk/debian/patches/ipaddr-fallback	                        (rev 0)
+++ packages/python-cryptography/trunk/debian/patches/ipaddr-fallback	2015-06-08 12:51:07 UTC (rev 32911)
@@ -0,0 +1,87 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ python-cryptography (0.9-1) unstable; urgency=low
+ .
+   * New upstream release.
+Author: Tristan Seligmann <mithrandi at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- python-cryptography-0.9.orig/setup.py
++++ python-cryptography-0.9/setup.py
+@@ -32,7 +32,7 @@ with open(os.path.join(src_dir, "cryptog
+ VECTORS_DEPENDENCY = "cryptography_vectors=={0}".format(about['__version__'])
+ 
+ requirements = [
+-    "idna",
++    #"idna",
+     "pyasn1",
+     "six>=1.4.1",
+     "setuptools"
+@@ -42,7 +42,7 @@ if sys.version_info < (3, 4):
+     requirements.append("enum34")
+ 
+ if sys.version_info < (3, 3):
+-    requirements.append("ipaddress")
++    requirements.append("ipaddr")
+ 
+ if platform.python_implementation() != "PyPy":
+     requirements.append("cffi>=0.8")
+--- python-cryptography-0.9.orig/src/cryptography/hazmat/backends/openssl/x509.py
++++ python-cryptography-0.9/src/cryptography/hazmat/backends/openssl/x509.py
+@@ -14,7 +14,10 @@
+ from __future__ import absolute_import, division, print_function
+ 
+ import datetime
+-import ipaddress
++try:
++    import ipaddress
++except ImportError:
++    import ipaddr as ipaddress
+ from email.utils import parseaddr
+ 
+ import idna
+--- python-cryptography-0.9.orig/src/cryptography/x509.py
++++ python-cryptography-0.9/src/cryptography/x509.py
+@@ -5,7 +5,10 @@
+ from __future__ import absolute_import, division, print_function
+ 
+ import abc
+-import ipaddress
++try:
++    import ipaddress
++except ImportError:
++    import ipaddr as ipaddress
+ from enum import Enum
+ 
+ import six
+--- python-cryptography-0.9.orig/tests/test_x509_ext.py
++++ python-cryptography-0.9/tests/test_x509_ext.py
+@@ -5,7 +5,10 @@
+ from __future__ import absolute_import, division, print_function
+ 
+ import binascii
+-import ipaddress
++try:
++    import ipaddress
++except ImportError:
++    import ipaddr as ipaddress
+ import os
+ 
+ import pytest

Added: packages/python-cryptography/trunk/debian/patches/series
===================================================================
--- packages/python-cryptography/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-cryptography/trunk/debian/patches/series	2015-06-08 12:51:07 UTC (rev 32911)
@@ -0,0 +1 @@
+ipaddr-fallback