Update fabric to 0.9.3

Pkgsrc changes:
- add depends to py-crypto

Upstream changes:

0.9.3
=====

Feature additions

* #255: Added stderr and succeeded attributes to local.
* #254: Backported the .stderr and .succeeded attributes on run/sudo return
values, from the Git master/pre-1.0 branch. Please see those functions? API
docs for details.

Bugfixes

* #228: We discovered that the pip + PyCrypto installation problem was limited
to Python 2.5 only, and have updated our setup.py accordingly.
* #230: Arbitrary or remainder commands (fab <opts> -- <run command here>) will
no longer blow up when invoked with no fabfile present. Thanks to IRC user
orkaa for the report.
* #242: Empty string values in task CLI args now parse correctly. Thanks to
Aaron Levy for the catch + patch.

Documentation updates

* #239: Fixed typo in execution usage docs. Thanks to Pradeep Gowda and Turicas
for the catch.


0.9.2
=====

Feature additions

* The reboot operation has been added, providing a way for Fabric to issue a
reboot command and then reconnect after the system has restarted.
* python setup.py test now runs Fabric?s test suite (provided you have all the
prerequisites from the requirements.txt installed). Thanks to Eric Holscher for
 the patch.
* Added functionality for loading fabfiles which are Python packages
 (directories) instead of just modules (single files.) See Fabfile discovery.
* Added output lines informing the user of which tasks are being executed (e.g.
[myserver] Executing task 'foo'.)
* Added support for lazy (callable) role definition values in env.roledefs.
* Added contrib.django module with basic Django integration.
* env.local_user was added, providing easy and permanent access to the local
 system username, even if an alternate remote username has been specified.
* #29: Added support for arbitrary command-line-driven anonymous tasks via
fab [options] -- [shell command]. See Arbitrary remote shell commands.
* #52: Full tracebacks during aborts are now displayed if the user has opted to
 see debug-level output.
* #101: Added colors module with basic color output support. (#101 is still
 open: we plan to leverage the new module in Fabric?s own output in the future.)
* #137: Commas used to separate per-task arguments may now be escaped with a
 backslash. Thanks to Erich Heine for the patch.
* #144: hosts (and roles) will now expand a single, iterable argument instead of
 requiring one to use e.g. @hosts(*iterable).
* #151: Added a puts utility function, which allows greater control over
fabfile-generated (as opposed to Fabric-generated) output. Also added fastprint,
an alias to puts allowing for convenient unbuffered, non-newline-terminated
printing.
* #208: Users rolling their own shell completion or who otherwise find
themselves performing text manipulation on the output of --list may now use
--shortlist to get a plain, newline-separated list of task names.

Bugfixes
* The interactive ?what host to connect to?? prompt now correctly updates the
appropriate environment variables (hostname, username, port) based on user input.
* Fixed a bug where Fabric?s own internal fabfile would pre-empt the user?s
fabfile due to a PYTHONPATH order issue. User fabfiles are now always loaded at
 the front of the PYTHONPATH during import.
* Disabled some DeprecationWarnings thrown by Paramiko when that library is
imported into Fabric under Python 2.6.
* #44, #63: Modified rsync_project to honor the SSH port and identity file
 settings. Thanks to Mitch Matuson and Morgan Goose.
* #123: Removed Cygwin from the ?are we on Windows? test; now, only Python
 installs whose sys.platform says 'win32' will use Windows-only code paths
(e.g. importing of pywin32).

Documentation updates
* Added a few new items to the FAQ.
* #173: Simple but rather embarrassing typo fix in README. Thanks to Ted Nyman
 for the catch.
* #194: Added a note to the install docs about a possible edge case some
 Windows 64-bit Python users may encounter.
* #216: Overhauled the process backgrounding FAQ to include additional
techniques and be more holistic.

Packaging updates
* #86, #158: Removed the bundled Paramiko 1.7.4 and updated the setup.py to
require Paramiko >=1.7.6. This lets us skip the known-buggy Paramiko 1.7.5 while
 getting some much needed bugfixes in Paramiko 1.7.6.

4 files changed, 29 insertions, 19 deletions

diff --git a/sysutils/fabric/Makefile b/sysutils/fabric/Makefile
index ce287eb4073..17f8432e68b 100644
--- a/sysutils/fabric/Makefile
+++ b/sysutils/fabric/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2010/06/28 18:45:21 gls Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/06 23:12:34 gls Exp $
 #
 
-VERSION=		0.9.1
+VERSION=		0.9.3
 DISTNAME=		Fabric-${VERSION}
 PKGNAME=		${DISTNAME:S/F/f/}
 CATEGORIES=		sysutils net
-MASTER_SITES=		http://code.fabfile.org/projects/fabric/files/
+MASTER_SITES=	http://code.fabfile.org/projects/fabric/files/
 
 MAINTAINER=		gls@NetBSD.org
 HOMEPAGE=		http://fabfile.org/
@@ -15,6 +15,7 @@ LICENSE=		2-clause-bsd
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		${PYPKGPREFIX}-paramiko>=1.7:../../security/py-paramiko
+DEPENDS+=		${PYPKGPREFIX}-crypto>=2.1:../../security/py-crypto
 
 USE_TOOLS+=		pax
 
@@ -26,8 +27,8 @@ INSTALLATION_DIRS+=	share/doc/fabric/api/core
 INSTALLATION_DIRS+=	share/doc/fabric/changes
 INSTALLATION_DIRS+=	share/doc/fabric/usage
 
-post-extract:
-	${RM} -r ${WRKSRC}/paramiko
+#post-extract:
+#	${RM} -r ${WRKSRC}/paramiko
 
 post-install:
 	${INSTALL_MAN} files/fab.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
diff --git a/sysutils/fabric/PLIST b/sysutils/fabric/PLIST
index a115542f532..abb8a6f0e5d 100644
--- a/sysutils/fabric/PLIST
+++ b/sysutils/fabric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/06/28 18:45:21 gls Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/12/06 23:12:34 gls Exp $
 bin/fab
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -11,6 +11,9 @@ ${PYSITELIB}/fabric/__init__.pyo
 ${PYSITELIB}/fabric/api.py
 ${PYSITELIB}/fabric/api.pyc
 ${PYSITELIB}/fabric/api.pyo
+${PYSITELIB}/fabric/colors.py
+${PYSITELIB}/fabric/colors.pyc
+${PYSITELIB}/fabric/colors.pyo
 ${PYSITELIB}/fabric/context_managers.py
 ${PYSITELIB}/fabric/context_managers.pyc
 ${PYSITELIB}/fabric/context_managers.pyo
@@ -20,6 +23,9 @@ ${PYSITELIB}/fabric/contrib/__init__.pyo
 ${PYSITELIB}/fabric/contrib/console.py
 ${PYSITELIB}/fabric/contrib/console.pyc
 ${PYSITELIB}/fabric/contrib/console.pyo
+${PYSITELIB}/fabric/contrib/django.py
+${PYSITELIB}/fabric/contrib/django.pyc
+${PYSITELIB}/fabric/contrib/django.pyo
 ${PYSITELIB}/fabric/contrib/files.py
 ${PYSITELIB}/fabric/contrib/files.pyc
 ${PYSITELIB}/fabric/contrib/files.pyo
@@ -49,12 +55,16 @@ ${PYSITELIB}/fabric/version.pyc
 ${PYSITELIB}/fabric/version.pyo
 man/man1/fab.1
 share/doc/fabric/api/contrib/console.rst
+share/doc/fabric/api/contrib/django.rst
 share/doc/fabric/api/contrib/files.rst
 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/operations.rst
 share/doc/fabric/api/core/utils.rst
+share/doc/fabric/changes/0.9.1.rst
+share/doc/fabric/changes/0.9.2.rst
 share/doc/fabric/changes/${PKGVERSION}.rst
 share/doc/fabric/changes/0.9.rst
 share/doc/fabric/development.rst
diff --git a/sysutils/fabric/distinfo b/sysutils/fabric/distinfo
index d4956a7c9fb..8e827c1f61d 100644
--- a/sysutils/fabric/distinfo
+++ b/sysutils/fabric/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/06/28 18:45:21 gls Exp $
+$NetBSD: distinfo,v 1.3 2010/12/06 23:12:34 gls Exp $
 
-SHA1 (Fabric-0.9.1.tar.gz) = c7845346f742beafc01276a6ad25c2460e82c5cb
-RMD160 (Fabric-0.9.1.tar.gz) = afdec80ba52c7de7b0aac4d1db3f71bc017838df
-Size (Fabric-0.9.1.tar.gz) = 184256 bytes
-SHA1 (patch-aa) = f6927f0446418782629b4b347884561c72e76ea2
+SHA1 (Fabric-0.9.3.tar.gz) = 469820558a2cc67acd09ddeed7a5b79e0803bf4e
+RMD160 (Fabric-0.9.3.tar.gz) = 8739963f34a0e804b24c977e68375b1445474fbb
+Size (Fabric-0.9.3.tar.gz) = 89973 bytes
+SHA1 (patch-aa) = 2fe723c5213965a95befdc4ab1e01616d2032827
diff --git a/sysutils/fabric/patches/patch-aa b/sysutils/fabric/patches/patch-aa
index ac811539ac6..1e8ddff28a7 100644
--- a/sysutils/fabric/patches/patch-aa
+++ b/sysutils/fabric/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/05/26 18:26:20 gls Exp $
+$NetBSD: patch-aa,v 1.2 2010/12/06 23:12:34 gls Exp $
 
 Disable setuptools usage
 
---- setup.py.orig	2009-11-08 23:17:10.000000000 +0000
+--- setup.py.orig	2010-11-12 20:57:34.000000000 +0000
 +++ setup.py
-@@ -15,8 +15,8 @@ For more information, please see the Fab
-     author='Jeff Forcier',
-     author_email='jeff@bitprophet.org',
-     url='http://fabfile.org',
+@@ -38,7 +38,7 @@ setup(
      packages=find_packages(),
--    install_requires=['pycrypto >=1.9'],
-+#    install_requires=['pycrypto >=1.9'],
+     test_suite='nose.collector',
+     tests_require=['nose', 'fudge'],
+-    install_requires=['pycrypto %s' % PYCRYPTO, 'paramiko >=1.7.6'],
++#    install_requires=['pycrypto %s' % PYCRYPTO, 'paramiko >=1.7.6'],
      entry_points={
          'console_scripts': [
              'fab = fabric.main:main',