Update sysutils/fabric to 1.5.1.

pkgsrc changes:
---------------
Switch back to security/py-paramiko, now that security/py-ssh has been merged
back into paramiko.

upstream changes:
-----------------

2012-11-15: released Fabric 1.5.1

[Bug] #776: Fixed serious-but-non-obvious bug in direct-tcpip driven gatewaying
(e.g. that triggered by -g or env.gateway.) Should work correctly now.

[Bug] #771: Sphinx autodoc helper unwrap_tasks didn't play nice with
@task(name=xxx) in some situations. This has been fixed.

2012-11-06: released Fabric 1.5.0
2012-11-06: released Fabric 1.4.4

	[Feature] #38: (also #698) Implement both SSH-level and
	ProxyCommand-based gatewaying for SSH traffic. (This is distinct from
	tunneling non-SSH traffic over the SSH connection, which is #78 and not
	implemented yet.)

	Thanks in no particular order to Erwin Bolwidt, Oskari Saarenmaa,
	Steven Noonan, Vladimir Lazarenko, Lincoln de Sousa, Valentino
	Volonghi, Olle Lundberg and Github user @acrish for providing the
	original patches to both Fabric and Paramiko.

	[Feature] #684: (also #569) Update how task wraps task functions to
	preserve additional metadata; this allows decorated functions to play
	nice with Sphinx autodoc. Thanks to Jaka Hudoklin for catch & patch.

	[Support] #103: (via #748) Long standing Sphinx autodoc issue requiring
	error-prone duplication of function signatures in our API docs has been
	fixed. Thanks to Alex Morega for the patch.

	[Bug] #767: Fix (and add test for) regression re: having linewise
	output automatically activate when parallelism is in effect. Thanks to
	Alexander Fortin and Dustin McQuay for the bug reports.

	[Bug] #736: Ensure context managers that build env vars play nice with
	contextlib.nested by deferring env var reference to entry time, not
	call time. Thanks to Matthew Tretter for catch & patch.

	[Feature] #763: Add --initial-password-prompt to allow prefilling the
	password cache at the start of a run. Great for sudo-powered parallel
	runs.

	[Feature] #665: (and #629) Update upload_template to have a more useful
	return value, namely that of its internal put call. Thanks to Miquel
	Torres for the catch & Rodrigue Alcazar for the patch.

	[Feature] #578: Add name argument to task (docs) to allow overriding of
	the default "function name is task name" behavior. Thanks to Daniel
	Simmons for catch & patch.

	[Feature] #761: Allow advanced users to parameterize fabric.main.main()
	to force loading of specific fabfiles.

	[Bug] #749: Gracefully work around calls to fabric.version on systems
	lacking /bin/sh (which causes an OSError in subprocess.Popen calls.)

	[Feature] #723: Add the group= argument to sudo. Thanks to Antti
	Kaihola for the pull request.

	[Feature] #725: Updated local to allow override of which local shell is
	used. Thanks to Mustafa Khattab.

	[Bug] #704: Fix up a bunch of Python 2.x style print statements to be
	forwards compatible. Thanks to Francesco Del Degan for the patch.

	[Feature] #491: (also [Feature] #385:) IPv6 host string support. Thanks
	to Max Arnold for the patch.

	[Feature] #699: Allow name attribute on file-like objects for get/put.
	Thanks to Peter Lyons for the pull request.

	[Bug] #711: get would fail when filenames had % in their path. Thanks
	to John Begeman

	[Bug] #702: require failed to test for "empty" values in the env keys
	it checks (e.g. require('a-key-whose-value-is-an-empty-list') would
	register a successful result instead of alerting that the value was in
	fact empty. This has been fixed, thanks to Rich Schumacher.

	[Bug] #718: isinstance(foo, Bar) is used in main instead of type(foo)
	== Bar in order to fix some edge cases. Thanks to Mikhail Korobov.

	[Bug] #693: Fixed edge case where abort driven failures within parallel
	tasks could result in a top level exception (a KeyError) regarding
	error handling. Thanks to Marcin Ku#mi#ski for the report.

	[Support] #681: Fixed outdated docstring for runs_once which claimed it
	would get run multiple times in parallel mode. That behavior was fixed
	in an earlier release but the docs were not updated. Thanks to Jan
	Brauer for the catch.

3 files changed, 12 insertions, 8 deletions

diff --git a/sysutils/fabric/Makefile b/sysutils/fabric/Makefile
index 6f9dd8a71ce..128c964ba86 100644
--- a/sysutils/fabric/Makefile
+++ b/sysutils/fabric/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2012/10/23 19:51:01 asau Exp $
+# $NetBSD: Makefile,v 1.24 2012/11/28 17:48:45 gls Exp $
 #
 
-VERSION=		1.4.3
+VERSION=		1.5.1
 DISTNAME=		Fabric-${VERSION}
 PKGNAME=		${DISTNAME:S/F/f/}
 CATEGORIES=		sysutils net
@@ -12,7 +12,7 @@ HOMEPAGE=		http://fabfile.org/
 COMMENT=		Simple Pythonic remote deployment tool
 LICENSE=		2-clause-bsd
 
-DEPENDS+=		${PYPKGPREFIX}-ssh>=1.7.8:../../security/py-ssh
+DEPENDS+=		${PYPKGPREFIX}-paramiko>=1.9.0:../../security/py-paramiko
 
 USE_TOOLS+=		pax
 
diff --git a/sysutils/fabric/PLIST b/sysutils/fabric/PLIST
index 1a1bafb21a3..7139f72baca 100644
--- a/sysutils/fabric/PLIST
+++ b/sysutils/fabric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/04/14 09:29:18 gls Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/11/28 17:48:45 gls Exp $
 bin/fab
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -51,6 +51,9 @@ ${PYSITELIB}/fabric/contrib/project.pyo
 ${PYSITELIB}/fabric/decorators.py
 ${PYSITELIB}/fabric/decorators.pyc
 ${PYSITELIB}/fabric/decorators.pyo
+${PYSITELIB}/fabric/docs.py
+${PYSITELIB}/fabric/docs.pyc
+${PYSITELIB}/fabric/docs.pyo
 ${PYSITELIB}/fabric/exceptions.py
 ${PYSITELIB}/fabric/exceptions.pyc
 ${PYSITELIB}/fabric/exceptions.pyo
@@ -98,6 +101,7 @@ share/doc/fabric/api/contrib/project.rst
 share/doc/fabric/api/core/colors.rst
 share/doc/fabric/api/core/context_managers.rst
 share/doc/fabric/api/core/decorators.rst
+share/doc/fabric/api/core/docs.rst
 share/doc/fabric/api/core/network.rst
 share/doc/fabric/api/core/operations.rst
 share/doc/fabric/api/core/tasks.rst
diff --git a/sysutils/fabric/distinfo b/sysutils/fabric/distinfo
index fcaaf707d06..726a5d18156 100644
--- a/sysutils/fabric/distinfo
+++ b/sysutils/fabric/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2012/08/06 19:53:50 gls Exp $
+$NetBSD: distinfo,v 1.17 2012/11/28 17:48:45 gls Exp $
 
-SHA1 (Fabric-1.4.3.tar.gz) = fbc264390702ff194feaaec9e837374d1c001eea
-RMD160 (Fabric-1.4.3.tar.gz) = 7334dc0bae305deabd580bcd0fe503cc5f32cd2d
-Size (Fabric-1.4.3.tar.gz) = 221645 bytes
+SHA1 (Fabric-1.5.1.tar.gz) = 8207d36e75fd58a5dc78aa40fcd09045b6f2a8f9
+RMD160 (Fabric-1.5.1.tar.gz) = 664fddcab5c36fdc718e07925b4e7d98c29efa73
+Size (Fabric-1.5.1.tar.gz) = 209128 bytes