Update to duplicity-0.5.10.

New in v0.5.10 (2009/03/01)
---------------------------
The default filename format has changed from W3 style to a long
numeric style, YYYYMMDDTHHMMSSZ, with no delimiters, thus is now
compatible with Windows/Samba filesystems.  The time is UTC, not
local, so there will be no timezone or daylight savings time issues.

Duplicity still recognizes the old long filename format, and will
continue incremental backup chains if found.  The old format is
still available via the --old-filenames option (pending deprecation).

Users of --short-filenames or --time-separator should stop using these
options on their next full backup.  The new filenames are compatible
with your system.

The following options are pending deprecation and will be removed in a
future release:
    --time-separator
    --short-filenames
    --old-filenames

bug #19988: Incompatibility to Samba/SMB share
bug #25097: Allow listing files from any time, not just current time
bug #25550: Error codes do not propagate from log to exit status
bug #25308: Signatures orphaned if from another time zone
Bug #229826: duplicity crashed with ValueError in port()

New in v0.5.09 (2009/02/17)
---------------------------
FTP is now driven with pexpect rather than NcFTP utilities.
This closes the following bugs (and solves other problems):
bug #24741: ncftpls -x '' causes failure on Yahoo FTP server
bug #23516: duplicity/ncftpget not closing unlinked files, ...
bug #25509: Logic error in imapbackend.py [IMAP_SERVER]
bug #25512: [Patch] Retry on Imap failure
bug #25530: commandline passwd not working

New in v0.5.08 (2009/02/02)
---------------------------
Turns out going backwards in the license is not as easy as
forwards.  Restoring GPLv3 license until consensus reached.

New in v0.5.07 (2009/01/31)
---------------------------
bug #25293: IOError: [Errno 22] Invalid argument
bug #25379: sys.exit() causes traceback and should not
bug #25403: 0.5.06 "manifests not equal, different volume numbers"
patch #6729: New imap backend. Replaces current gmail backend
patch #6730: Fix timing out for SSH backend
patch #6733: Improve error handling in imapbackend.py

Increase default volume size (--volsize) to 25M from 5M.  This
reduces the number of volumes to accomodate larger backups.

Reworked patch 6701 to list collection one at a time rather than
writing all as one huge list.  Was causing memeory problems when
the collections got large.

Fix backendtest.py so that empty URL's in config.py cause the
backend test to be skipped rather than erroring.  Added notes
in config.py.tmpl explaining the change.

Add/update copyright statements in all distribution source files
and revert duplicity to GPL version 2 license.

Original fix to disallow use of ncftpput 3.2.0 mistyped the ErrorCode
used and resulted in an error rather than an explanation.

New in v0.5.06 (2009/01/09)
---------------------------
Fix to deprecation warnings about sha and md5 modules.
Uses hashlib if available, otherwise original module.

Added loop to run-all-tests.sh to run all tests against all supported
versions of Python if available.  Looks for 2.3, 2.4, 2.5, 2.6.

Noah Spurrier has given us permission to distribute pexpect.py along
with duplicity, so this will no longer be an install requirement.

NcFTP version 3.2.0 will not work with duplicity since we require the
use of both -f and -C options on ncftpput.  3.1.9, 3.2.1+ work fine.
I put in error checks for this situation in the FTP backend code.

bug #25230: --include-globbing-filelist only including first entry.
bug #25239: Error during clean, wrong case in duplcicity
patch #6709: Report correct number of volumes when restoring
sr #106583: document the need to use the --force option

New in v0.5.05 (2008/12/30)
---------------------------
bug #25194: Duplicity 5.04 requires python-distutils-extra...

New in v0.5.04 (2008/12/27)
---------------------------
patch #6678: Add progress metering
patch #6686: Add error codes for all fatal errors
bug #25090: Typos and trailing whitespace in duplicity manpage
bug #24889: NCFTP cannot deal with some FTP servers
patch #6692: Print collection status in a machine-readable way
patch #6693: Some FatalError's don't have codes still
patch #6694: Log exceptions
patch #6695: Log filenames
patch #6696: Consolidate get_delta_iter and get_delta_iter_w_sig
patch #6697: Always log at least one progress during dry run
patch #6700: Make duplicity translatable
patch #6701: Make current-list command machine-readable
patch #6702: handle unknown errnos in robust.py

GPG was throwing "gpg: [don't know]: invalid packet (ctb=14)" and apparently
this is non-fatal.  There is a fix for this being rolled into GPG 2.x.
http://lists.gnupg.org/pipermail/gnupg-devel/2006-September/023180.html
Copied from collections.py.  Fix supplied by Simon Blandford <simon@onepointltd.com>

New in v0.5.03 (2008/11/17)
---------------------------
bug #24731: Documentation error: "if... if" in remove-older-than paragraph
bug #24775: Digest Auth for WebDAV backend
patch #6676: Raw delta stats aren't right for multivolumes
patch #6675: Add modelines
patch #6674: Add --log-* options to man page
patch #6673: Add --dry-run option
patch #6672: makedist doesn't ship util.py
patch #6670: Machine Readable Output
patch #6662: improve s3 backend error reporting
patch #6652: improve asynch scheduler (including the synchronous case)
patch #6642: make ParsedUrl() thread-safe with respect to itself
patch #6638: correct typo in reporting lack of sufficiently new boto backend
sr #106496: put install-from-cvs-notes in CVS-README
sr #106534: GMail backups aren't stored in the correct location

New in v0.5.02 (2008/09/21)
---------------------------
- Add -h option for help

- Change gpg logging so that logs are always collected.
The log is printed in the case of gpg IO errors.  Also,
verbosity level 5 or above (-v5) will print the logs.

patch #6297: Add IMAP/s/gmail support
bug #24260: backend.py missing re import
bug #24274: asyncscheduler.py missing sys import

New in v0.5.01 (2008/09/11)
---------------------------
bug #24234: Tabs Present In Source Files
bug #24223: WebDAV backend broken in 0.5.00
bug #24226: WebDAV Does Not Create Collection If Needed

New in v0.5.00 (2008/09/06)
---------------------------
Changes to unit tests:
  - resolve circular imports after backend reorg
  - resolve exception error import - now in errors.py
  - remove need for temp2.tar to be in CVS repository

bug #23988: scp destination fails if no username is specified
bug #23985: --no-encryption option does not work in 0.4.12
patch #6623: slightly augment tempdir cleanup logging
patch #6596: re-organize backend module structure
patch #6589: S3 european bucket support
patch #6353: Concurrency for volume encryption and upload.

4 files changed, 68 insertions, 32 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 8136d8bd790..85940530fb3 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2008/08/07 18:13:31 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2009/03/05 17:40:04 tnn Exp $
 
-DISTNAME=		duplicity-0.4.12
+DISTNAME=		duplicity-0.5.10
 CATEGORIES=		sysutils net
 MASTER_SITES=		http://savannah.nongnu.org/download/duplicity/
 
@@ -14,7 +14,12 @@ BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
 PYDISTUTILSPKG=		yes
 PYTHON_VERSIONS_ACCEPTED= 25 24
 
-.include "../../devel/py-pexpect/buildlink3.mk"
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	fixing mandir
+SUBST_FILES.fix-paths=		setup.py
+SUBST_SED.fix-paths=		-e 's,share/man/man1,${PKGMANDIR}/man1,'
+
 .include "../../devel/librsync/buildlink3.mk"
 .include "../../net/py-boto/buildlink3.mk"
 .include "../../security/py-gnupg/buildlink3.mk"
diff --git a/sysutils/duplicity/PLIST b/sysutils/duplicity/PLIST
index ac7690ed110..dedcf60b5ff 100644
--- a/sysutils/duplicity/PLIST
+++ b/sysutils/duplicity/PLIST
@@ -1,18 +1,43 @@
-@comment $NetBSD: PLIST,v 1.3 2008/02/06 07:17:00 bjs Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/03/05 17:40:04 tnn Exp $
 bin/duplicity
 bin/rdiffdir
-man/man1/duplicity.1
-man/man1/rdiffdir.1
-share/doc/${PKGNAME}/CHANGELOG
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/README
 ${PYSITELIB}/duplicity/__init__.py
 ${PYSITELIB}/duplicity/__init__.pyc
 ${PYSITELIB}/duplicity/__init__.pyo
 ${PYSITELIB}/duplicity/_librsync.so
-${PYSITELIB}/duplicity/backends.py
-${PYSITELIB}/duplicity/backends.pyc
-${PYSITELIB}/duplicity/backends.pyo
+${PYSITELIB}/duplicity/asyncscheduler.py
+${PYSITELIB}/duplicity/asyncscheduler.pyc
+${PYSITELIB}/duplicity/asyncscheduler.pyo
+${PYSITELIB}/duplicity/backend.py
+${PYSITELIB}/duplicity/backend.pyc
+${PYSITELIB}/duplicity/backend.pyo
+${PYSITELIB}/duplicity/backends/__init__.py
+${PYSITELIB}/duplicity/backends/__init__.pyc
+${PYSITELIB}/duplicity/backends/__init__.pyo
+${PYSITELIB}/duplicity/backends/botobackend.py
+${PYSITELIB}/duplicity/backends/botobackend.pyc
+${PYSITELIB}/duplicity/backends/botobackend.pyo
+${PYSITELIB}/duplicity/backends/ftpbackend.py
+${PYSITELIB}/duplicity/backends/ftpbackend.pyc
+${PYSITELIB}/duplicity/backends/ftpbackend.pyo
+${PYSITELIB}/duplicity/backends/hsibackend.py
+${PYSITELIB}/duplicity/backends/hsibackend.pyc
+${PYSITELIB}/duplicity/backends/hsibackend.pyo
+${PYSITELIB}/duplicity/backends/imapbackend.py
+${PYSITELIB}/duplicity/backends/imapbackend.pyc
+${PYSITELIB}/duplicity/backends/imapbackend.pyo
+${PYSITELIB}/duplicity/backends/localbackend.py
+${PYSITELIB}/duplicity/backends/localbackend.pyc
+${PYSITELIB}/duplicity/backends/localbackend.pyo
+${PYSITELIB}/duplicity/backends/rsyncbackend.py
+${PYSITELIB}/duplicity/backends/rsyncbackend.pyc
+${PYSITELIB}/duplicity/backends/rsyncbackend.pyo
+${PYSITELIB}/duplicity/backends/sshbackend.py
+${PYSITELIB}/duplicity/backends/sshbackend.pyc
+${PYSITELIB}/duplicity/backends/sshbackend.pyo
+${PYSITELIB}/duplicity/backends/webdavbackend.py
+${PYSITELIB}/duplicity/backends/webdavbackend.pyc
+${PYSITELIB}/duplicity/backends/webdavbackend.pyo
 ${PYSITELIB}/duplicity/collections.py
 ${PYSITELIB}/duplicity/collections.pyc
 ${PYSITELIB}/duplicity/collections.pyo
@@ -25,9 +50,15 @@ ${PYSITELIB}/duplicity/diffdir.pyo
 ${PYSITELIB}/duplicity/dup_temp.py
 ${PYSITELIB}/duplicity/dup_temp.pyc
 ${PYSITELIB}/duplicity/dup_temp.pyo
+${PYSITELIB}/duplicity/dup_threading.py
+${PYSITELIB}/duplicity/dup_threading.pyc
+${PYSITELIB}/duplicity/dup_threading.pyo
 ${PYSITELIB}/duplicity/dup_time.py
 ${PYSITELIB}/duplicity/dup_time.pyc
 ${PYSITELIB}/duplicity/dup_time.pyo
+${PYSITELIB}/duplicity/errors.py
+${PYSITELIB}/duplicity/errors.pyc
+${PYSITELIB}/duplicity/errors.pyo
 ${PYSITELIB}/duplicity/file_naming.py
 ${PYSITELIB}/duplicity/file_naming.pyc
 ${PYSITELIB}/duplicity/file_naming.pyo
@@ -58,6 +89,9 @@ ${PYSITELIB}/duplicity/patchdir.pyo
 ${PYSITELIB}/duplicity/path.py
 ${PYSITELIB}/duplicity/path.pyc
 ${PYSITELIB}/duplicity/path.pyo
+${PYSITELIB}/duplicity/pexpect.py
+${PYSITELIB}/duplicity/pexpect.pyc
+${PYSITELIB}/duplicity/pexpect.pyo
 ${PYSITELIB}/duplicity/robust.py
 ${PYSITELIB}/duplicity/robust.pyc
 ${PYSITELIB}/duplicity/robust.pyo
@@ -79,5 +113,18 @@ ${PYSITELIB}/duplicity/tempdir.pyo
 ${PYSITELIB}/duplicity/urlparse_2_5.py
 ${PYSITELIB}/duplicity/urlparse_2_5.pyc
 ${PYSITELIB}/duplicity/urlparse_2_5.pyo
+${PYSITELIB}/duplicity/util.py
+${PYSITELIB}/duplicity/util.pyc
+${PYSITELIB}/duplicity/util.pyo
+man/man1/duplicity.1
+man/man1/rdiffdir.1
+share/doc/${PKGNAME}/CHANGELOG
+share/doc/${PKGNAME}/COPYING
+share/doc/${PKGNAME}/CVS-README
+share/doc/${PKGNAME}/LOG-README
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/tarfile-LICENSE
+share/locale/io/LC_MESSAGES/duplicity.mo
 @dirrm share/doc/${PKGNAME}
+@dirrm ${PYSITELIB}/duplicity/backends
 @dirrm ${PYSITELIB}/duplicity
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index 51bdf725fc9..9bdb411c0cd 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2008/08/07 18:13:31 drochner Exp $
+$NetBSD: distinfo,v 1.9 2009/03/05 17:40:04 tnn Exp $
 
-SHA1 (duplicity-0.4.12.tar.gz) = bc2a486a152fac1ca767193ab8d02e1c76c1a558
-RMD160 (duplicity-0.4.12.tar.gz) = 5ad06716e57c252afba8e9cfafc6279382a08c77
-Size (duplicity-0.4.12.tar.gz) = 126345 bytes
-SHA1 (patch-aa) = 84415444fc6a66d4a01b9f110333e746f9b57491
+SHA1 (duplicity-0.5.10.tar.gz) = bbad002d2037870ff39b36cc35c15bf2feba589d
+RMD160 (duplicity-0.5.10.tar.gz) = e0afba572cee41679818c304d226e58c72d8c415
+Size (duplicity-0.5.10.tar.gz) = 183829 bytes
diff --git a/sysutils/duplicity/patches/patch-aa b/sysutils/duplicity/patches/patch-aa
deleted file mode 100644
index 0f5337cc696..00000000000
--- a/sysutils/duplicity/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/02/06 07:17:00 bjs Exp $
-
---- setup.py.orig	2008-01-04 13:11:39.000000000 -0500
-+++ setup.py
-@@ -48,8 +48,8 @@ setup(name="duplicity",
- 							   library_dirs=libdir_list,
- 							   libraries=["rsync"])],
- 	  scripts = ['rdiffdir', 'duplicity'],
--	  data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']),
--					('share/doc/duplicity-%s' % version_string,
-+	  data_files = [('man/man1', ['duplicity.1', 'rdiffdir.1']),
-+					('share/doc/duplicity-%s' % (version_string,),
- 					 ['COPYING', 'README', 'CHANGELOG'])])
- 
-