update to 1.7.3

changes:
-direct-tcpip support
-bug fixes

pkgsrc change: disable use of Python setuptools
	(gives unpredictable results)

4 files changed, 35 insertions, 7 deletions

diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index ab225a49875..016b05680cd 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:12 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/15 18:27:43 drochner Exp $
 #
 
-DISTNAME=		paramiko-1.7.1
+DISTNAME=		paramiko-1.7.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		security
 MASTER_SITES=		http://www.lag.net/paramiko/download/
@@ -13,6 +13,9 @@ COMMENT=		SSH2 protocol library
 
 PYDISTUTILSPKG=		yes
 
+do-test:
+	(cd ${WRKSRC} && ${PYTHONBIN} test.py)
+
 .include "../../lang/python/extension.mk"
 .include "../../security/py-amkCrypto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-paramiko/PLIST b/security/py-paramiko/PLIST
index 76f1724f3ed..e6387e5d2d7 100644
--- a/security/py-paramiko/PLIST
+++ b/security/py-paramiko/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/12/14 13:35:04 bjs Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/05/15 18:27:43 drochner Exp $
 ${PYSITELIB}/paramiko/__init__.py
 ${PYSITELIB}/paramiko/__init__.pyc
 ${PYSITELIB}/paramiko/__init__.pyo
@@ -50,6 +50,9 @@ ${PYSITELIB}/paramiko/logging22.pyo
 ${PYSITELIB}/paramiko/message.py
 ${PYSITELIB}/paramiko/message.pyc
 ${PYSITELIB}/paramiko/message.pyo
+${PYSITELIB}/paramiko/osrandom.py
+${PYSITELIB}/paramiko/osrandom.pyc
+${PYSITELIB}/paramiko/osrandom.pyo
 ${PYSITELIB}/paramiko/packet.py
 ${PYSITELIB}/paramiko/packet.pyc
 ${PYSITELIB}/paramiko/packet.pyo
diff --git a/security/py-paramiko/distinfo b/security/py-paramiko/distinfo
index b4492142330..a5f5bcdf88f 100644
--- a/security/py-paramiko/distinfo
+++ b/security/py-paramiko/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/12/14 13:35:05 bjs Exp $
+$NetBSD: distinfo,v 1.3 2008/05/15 18:27:43 drochner Exp $
 
-SHA1 (paramiko-1.7.1.zip) = 5ccb94b48dc134dbaa9e95a95d65b223ae6ecfa2
-RMD160 (paramiko-1.7.1.zip) = d091c304a619c1258de3df697b092b980604a851
-Size (paramiko-1.7.1.zip) = 358992 bytes
+SHA1 (paramiko-1.7.3.zip) = e4d476008a8f5624d674e44a2ef0911cd6c1a57d
+RMD160 (paramiko-1.7.3.zip) = f0fe9bfc2f4e7b3fae1a4bc58c5a4ea3dd84743f
+Size (paramiko-1.7.3.zip) = 1078878 bytes
+SHA1 (patch-aa) = 0c31844f4a3c0d72a8c7cd72364316c30e118bb4
diff --git a/security/py-paramiko/patches/patch-aa b/security/py-paramiko/patches/patch-aa
new file mode 100644
index 00000000000..aed7a494891
--- /dev/null
+++ b/security/py-paramiko/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2008/05/15 18:27:43 drochner Exp $
+
+--- setup.py.orig	2008-05-15 18:03:12.000000000 +0200
++++ setup.py
+@@ -33,14 +33,8 @@ Required packages:
+ #ez_setup.use_setuptools()
+ 
+ import sys
+-try:
+-    from setuptools import setup
+-    kw = {
+-        'install_requires': 'pycrypto >= 1.9',
+-    }
+-except ImportError:
+-    from distutils.core import setup
+-    kw = {}
++from distutils.core import setup
++kw = {}
+     
+ if sys.platform == 'darwin':
+ 	import setup_helper