On 01/05/17 15:18, Stuart Henderson wrote: > On 2017/01/05 14:47, Pablo Méndez Hernández wrote: >> Hi all, >> >> This also allows py-paramiko to be updated to 2.x (it moves the >> dependency from py-crypto to py-cryptography). > > Here's a diff for paramiko if anyone wants to try that with things that > depend on it. > > (Also fixes some whitespace issues in the Makefile so the diff is longer > than it looks like it should be :) > > A couple of the tests fail, but that isn't new, and most do pass.
ok benoit@ but not test with py-boto/aws. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/security/py-paramiko/Makefile,v > retrieving revision 1.42 > diff -u -p -r1.42 Makefile > --- Makefile 3 Jan 2017 19:26:14 -0000 1.42 > +++ Makefile 5 Jan 2017 14:15:55 -0000 > @@ -1,28 +1,27 @@ > # $OpenBSD: Makefile,v 1.42 2017/01/03 19:26:14 landry Exp $ > > -COMMENT = Python module that implements the SSH2 protocol > +COMMENT = Python module that implements the SSH2 protocol > > -MODPY_EGG_VERSION = 1.16.0 > -DISTNAME = paramiko-${MODPY_EGG_VERSION} > -PKGNAME = py-${DISTNAME} > -CATEGORIES = security > -REVISION = 0 > +MODPY_EGG_VERSION = 2.1.1 > +DISTNAME = paramiko-${MODPY_EGG_VERSION} > +PKGNAME = py-${DISTNAME} > +CATEGORIES = security > > -HOMEPAGE = https://github.com/paramiko/paramiko/ > +HOMEPAGE = https://github.com/paramiko/paramiko/ > > -MAINTAINER = Benoit Lecocq <ben...@openbsd.org> > +MAINTAINER = Benoit Lecocq <ben...@openbsd.org> > > # LGPL > PERMIT_PACKAGE_CDROM = Yes > > -MODPY_PI = Yes > +MODPY_PI = Yes > > -MODULES = lang/python > +MODULES = lang/python > > -MODPY_SETUPTOOLS = Yes > +MODPY_SETUPTOOLS = Yes > > -RUN_DEPENDS = security/py-crypto${MODPY_FLAVOR} \ > - security/py-ecdsa${MODPY_FLAVOR} > +RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \ > + security/py-cryptography${MODPY_FLAVOR} > TEST_DEPENDS = ${RUN_DEPENDS} > > FLAVORS = python3 > Index: distinfo > =================================================================== > RCS file: /cvs/ports/security/py-paramiko/distinfo,v > retrieving revision 1.28 > diff -u -p -r1.28 distinfo > --- distinfo 4 Jan 2016 12:25:50 -0000 1.28 > +++ distinfo 5 Jan 2017 14:15:55 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (paramiko-1.16.0.tar.gz) = > Mpfr080HL1c3cvfHQmk5pEPGLEWNVLtjL/MP1uz5aJI= > -SIZE (paramiko-1.16.0.tar.gz) = 1335094 > +SHA256 (paramiko-2.1.1.tar.gz) = 1R2tp60HNsEW+L/jJjYnkllH5KUOYUNqg9WL/nBVtXU= > +SIZE (paramiko-2.1.1.tar.gz) = 1196454 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/security/py-paramiko/pkg/PLIST,v > retrieving revision 1.24 > diff -u -p -r1.24 PLIST > --- pkg/PLIST 4 Jan 2016 12:25:50 -0000 1.24 > +++ pkg/PLIST 5 Jan 2017 14:15:55 -0000 > @@ -4,6 +4,7 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO > > lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt > > lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt > +lib/python${MODPY_VERSION}/site-packages/paramiko-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json > > 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 > @@ -120,6 +121,7 @@ share/doc/${MODPY_PY_PREFIX}paramiko/_st > share/doc/${MODPY_PY_PREFIX}paramiko/_static/comment-bright.png > share/doc/${MODPY_PY_PREFIX}paramiko/_static/comment-close.png > share/doc/${MODPY_PY_PREFIX}paramiko/_static/comment.png > +share/doc/${MODPY_PY_PREFIX}paramiko/_static/custom.css > 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 >