summaryrefslogtreecommitdiff
path: root/security/py-paramiko/files
diff options
context:
space:
mode:
authorSofian Brabez <sbz@FreeBSD.org>2012-10-03 11:07:31 +0000
committerSofian Brabez <sbz@FreeBSD.org>2012-10-03 11:07:31 +0000
commit8be1420b3fe6ce20e1a79f29d8088375a327d4d3 (patch)
tree571e8246eccc6d6e34468b7c97395d1f317ba342 /security/py-paramiko/files
parentKDE thumbnail generator for the CHM file format. (diff)
- Update to 1.8.0
Diffstat (limited to 'security/py-paramiko/files')
-rw-r--r--security/py-paramiko/files/patch-setup.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/security/py-paramiko/files/patch-setup.py b/security/py-paramiko/files/patch-setup.py
index e96eebc23bac..5ab4a79f3140 100644
--- a/security/py-paramiko/files/patch-setup.py
+++ b/security/py-paramiko/files/patch-setup.py
@@ -1,20 +1,19 @@
---- ./setup.py.orig 2011-05-31 12:57:26.000000000 +0200
-+++ ./setup.py 2011-05-31 13:01:30.000000000 +0200
-@@ -33,14 +33,9 @@
+--- ./setup.py.orig 2012-10-03 11:45:35.000000000 +0200
++++ ./setup.py 2012-10-03 11:46:32.000000000 +0200
+@@ -37,14 +37,8 @@
#ez_setup.use_setuptools()
import sys
-try:
- from setuptools import setup
- kw = {
-- 'install_requires': 'pycrypto >= 2.1',
+- 'install_requires': 'pycrypto >= 2.1, != 2.4',
- }
-except ImportError:
- from distutils.core import setup
- kw = {}
-+
+from distutils.core import setup
+kw = {}
if sys.platform == 'darwin':
- import setup_helper
+ import setup_helper