Update to py-paramiko 1.16.0. Add python3 flavor.

ok jca@, benoit@ (maintainer)

security/py-paramiko/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.40 2015/09/29 10:52:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.41 2016/01/04 12:25:50 shadchin Exp $
 
 COMMENT = 	Python module that implements the SSH2 protocol
 
-MODPY_EGG_VERSION = 	1.15.2
+MODPY_EGG_VERSION = 	1.16.0
 DISTNAME = 		paramiko-${MODPY_EGG_VERSION}
 PKGNAME = 		py-${DISTNAME}
 CATEGORIES = 		security
-REVISION =              0
 
 HOMEPAGE = 		https://github.com/paramiko/paramiko/
 
@@ -21,21 +20,22 @@ MODULES = 		lang/python
 
 MODPY_SETUPTOOLS = 	Yes
 
-RUN_DEPENDS = 		security/py-crypto \
+RUN_DEPENDS = 		security/py-crypto${MODPY_FLAVOR} \
-			security/py-ecdsa
+			security/py-ecdsa${MODPY_FLAVOR}
 TEST_DEPENDS =		${RUN_DEPENDS}
 
-pre-build:
+FLAVORS =		python3
-	@perl -pi -e "s,^\#\!/usr/bin/env python,#!${MODPY_BIN}," \
+FLAVOR ?=
-	  ${WRKSRC}/demos/*.py
+
+MODPY_ADJ_FILES =	demos/*.py
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-paramiko
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}paramiko
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-paramiko
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}paramiko
-	cp -R ${WRKSRC}/docs/* ${PREFIX}/share/doc/py-paramiko
+	cp -R ${WRKSRC}/docs/* ${PREFIX}/share/doc/${MODPY_PY_PREFIX}paramiko
-	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/py-paramiko
+	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}paramiko
 	${INSTALL_DATA} ${WRKSRC}/demos/* \
-	  ${PREFIX}/share/examples/py-paramiko
+	  ${PREFIX}/share/examples/${MODPY_PY_PREFIX}paramiko
 
 do-test:
 	cd ${WRKSRC} && ${MODPY_BIN} test.py --verbose

security/py-paramiko/distinfo

@@ -1,2 +1,2 @@
-SHA256 (paramiko-1.15.2.tar.gz) = T1amcaPuy7duYUPm5MoAfVA6Oap5qp4UreZn+lP9blU=
+SHA256 (paramiko-1.16.0.tar.gz) = Mpfr080HL1c3cvfHQmk5pEPGLEWNVLtjL/MP1uz5aJI=
-SIZE (paramiko-1.15.2.tar.gz) = 1220578
+SIZE (paramiko-1.16.0.tar.gz) = 1335094

security/py-paramiko/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.23 2014/10/15 17:15:37 rpe Exp $
+@comment $OpenBSD: PLIST,v 1.24 2016/01/04 12:25:50 shadchin Exp $
 lib/python${MODPY_VERSION}/site-packages/paramiko/
 lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -7,89 +7,90 @@ lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY
 lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/paramiko/__init__.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}_winapi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}agent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}auth_handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}ber.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}buffered_pipe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}channel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}compress.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}dsskey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}ecdsakey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}hostkeys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}kex_gex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}kex_group1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}kex_group14.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}kex_gss.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}packet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}pipe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}pkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}primes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}proxy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}py3compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}rsakey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}sftp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}sftp_attr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}sftp_client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}sftp_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}sftp_handle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}sftp_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}sftp_si.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}ssh_exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}ssh_gss.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}transport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/paramiko/${MODPY_PYCACHE}win_pageant.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/_version.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/_version.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/_winapi.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/_winapi.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/agent.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/agent.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/auth_handler.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/auth_handler.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/ber.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/ber.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/buffered_pipe.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/buffered_pipe.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/channel.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/channel.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/client.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/client.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/common.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/common.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/compress.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/compress.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/config.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/config.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/dsskey.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/dsskey.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/ecdsakey.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/ecdsakey.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/file.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/file.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/hostkeys.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/hostkeys.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/kex_gex.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/kex_gex.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/kex_group1.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/kex_group1.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/kex_group14.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/kex_group14.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/kex_gss.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/kex_gss.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/message.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/message.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/packet.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/packet.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/pipe.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/pipe.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/pkey.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/pkey.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/primes.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/primes.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/proxy.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/proxy.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/py3compat.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/py3compat.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/resource.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/resource.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/rsakey.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/rsakey.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/server.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/server.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/sftp.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/sftp.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_attr.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_attr.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_client.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_client.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_file.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_file.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_handle.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_handle.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_server.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_server.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_si.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/sftp_si.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/ssh_exception.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/ssh_exception.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/ssh_gss.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/ssh_gss.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/transport.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/transport.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/util.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/util.pyc
 lib/python${MODPY_VERSION}/site-packages/paramiko/win_pageant.py
-lib/python${MODPY_VERSION}/site-packages/paramiko/win_pageant.pyc
 share/doc/${MODPY_PY_PREFIX}paramiko/
 share/doc/${MODPY_PY_PREFIX}paramiko/_sources/
 share/doc/${MODPY_PY_PREFIX}paramiko/_sources/api/
@@ -123,11 +124,13 @@ share/doc/${MODPY_PY_PREFIX}paramiko/_static/doctools.js
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/down-pressed.png
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/down.png
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/file.png
+share/doc/${MODPY_PY_PREFIX}paramiko/_static/jquery-1.11.1.js
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/jquery.js
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/minus.png
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/plus.png
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/pygments.css
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/searchtools.js
+share/doc/${MODPY_PY_PREFIX}paramiko/_static/underscore-1.3.1.js
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/underscore.js
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/up-pressed.png
 share/doc/${MODPY_PY_PREFIX}paramiko/_static/up.png
@@ -154,7 +157,7 @@ share/doc/${MODPY_PY_PREFIX}paramiko/api/transport.html
 share/doc/${MODPY_PY_PREFIX}paramiko/genindex.html
 share/doc/${MODPY_PY_PREFIX}paramiko/index.html
 share/doc/${MODPY_PY_PREFIX}paramiko/objects.inv
-share/doc/${MODPY_PY_PREFIX}paramiko/${MODPY_PY_PREFIX}modindex.html
+share/doc/${MODPY_PY_PREFIX}paramiko/py-modindex.html
 share/doc/${MODPY_PY_PREFIX}paramiko/search.html
 share/doc/${MODPY_PY_PREFIX}paramiko/searchindex.js
 share/examples/${MODPY_PY_PREFIX}paramiko/