Update to 0.6.19, based on patch by Steven Sartorius in PR 46903.

New in v0.6.19 (2012/05/22)
---------------------------
Enhancements:
- lots of work on the man page to clean up requirements, etc.
- use empty listbody for enhanced webdav compatibility
- initial folder creation on backend does not result in a ResponseNotReady anymore
- add ssh_config support (/etc/ssh/ssh_config + ~/.ssh/config) to paramiko sshbackend
- add missing_host_key prompt to new sshbackend similar to ssh procedure
- added --ssh-backend parameter to switch between paramiko,pexpect
- allow answering gio mount questions (albeit naively)
- if the gio backend wants to ask a question during its mount phase, it previously just aborted.
- a couple more warning error codes that Deja Dup is interested in noticing.
- ssh paramiko backend respects --num-retries now
- set retry delay for ssh backends to 10s
- ssh pexpect backend
 + sftp part does not claim 'Invalid SSH password' although it's only 'Permission denied' now
 + sftp errors are now more talkative
- gpg.py
 + commented assert which broke otherwise working verify run

Bugs closed in this release:
588541     Connection failed, please check your password: Login dialog cancelled

Merges:
lp:~ed.so/duplicity/0.6-manpage
lp:~ed.so/duplicity/0.6-webdav_fixes
lp:~carlos-abalde/duplicity/gdocs-backend-gdata-2.0.16.-upgrade.
lp:~ed.so/duplicity/0.6-ssh_add_missinghostkey
lp:~ed.so/duplicity/0.6-readd_sshpexpect


New in v0.6.18 (2012/02/29)
---------------------------
Enhancements:
- fix extraneous '.py' in botobackend.py include
- tests: add delay between backups to avoid assertion error
- tests: use backup source that is more likely to be larger than 1M compressed
- tests: make other-filesystem check more robust against certain directories being mounts or not
- resuming an incremental results in a 'Restarting backup, but current encryption settings do not match original settings' error because curtime is incorrectly set away from previous incremental value
- added option to not compress the backup, when no encryption is selected
- always delay a little bit when a backend gives us errors
- Don't cache TarInfo files. Tests still pass, so I don't believe we need the members cache (and in the old tarfile.py, we didn't cache either).
- Adding --file-prefix option so different sets of backups can be stored in the same bucket.  See blueprint at https://blueprints.launchpad.net/duplicity/+spec/file-prefix-option
- two changes that help the test suite pass
- raise log level on backend import failure so it will be visible under default conditions
- file /etc/motd may not exist in test environment.  Use __file__ instead to point to a known plaintext source file.
- some code/import changes to make the ssh and boto backends compatible with Python 2.4.
- some changes to make roottest.py compatible with the new dir structure.

Bugs closed in this release:
884638     Python 2.5 / boto error
908228     possible memory leak
909031     SSH-Backend: Creating dirs separately causes a permissons-problems
916689     multipart upload fails on python 2.7.2
929465     UnsupportedBackendScheme: scheme not supported in url: scp://u123@u123.example.com/foo/
930727     ftpsbackend should respect num_retries for ftp commands
931175     duplicity crashes when PYTHONOPTIMIZE is set

Merges:
lp:~mterry/duplicity/always-delay
lp:~mterry/duplicity/memleak
lp:~mterry/duplicity/nopexpect
lp:~mterry/duplicity/resume-inc
lp:~mterry/duplicity/testfixes
lp:~nguyenqmai/duplicity/file-prefix-option
lp:~tobias-genannt/duplicity/nocompress


New in v0.6.17 (2011/11/25)
---------------------------
Enhancements:
- Added --rsync-options flag to allow user to pass options to rsync at will
- Added --s3-use-multiprocessing to select the new s3 multiprocessing backend.
  Default is to use the single processing backend.  A helper, filechunkio.py,
  requires Python 2.6+, so this option is not usable in earlier versions.

Bugs closed in this release:
411145     Misleading error message: "Invalid SSH password"
871875     File ... was corrupted during upload.
878220	   UnsupportedBackendScheme: scheme not supported in url: s3+http
878964     Resuming a backup with a different password should throw an error
881070	   Bugfix for S3 multipart upload on 0.6.16
881727	   duplicity 0.6.16 lists all backup sets as incomplete
885670	   Duplicity fails to add incremental backups to chain...

Merges:
lp:~mterry/duplicity/check-passphrase-on-restart
lp:~moss-d/duplicity/rsync-options

3 files changed, 35 insertions, 11 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index ad38dc66f65..a3556e474ed 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2012/03/15 11:53:38 obache Exp $
+# $NetBSD: Makefile,v 1.22 2012/09/05 10:05:43 wiz Exp $
 
-DISTNAME=		duplicity-0.6.16
-PKGREVISION=		1
+DISTNAME=		duplicity-0.6.19
 CATEGORIES=		sysutils net
 MASTER_SITES=		http://code.launchpad.net/duplicity/0.6-series/${PKGVERSION_NOREV}/+download/
 
@@ -11,12 +10,16 @@ COMMENT=		Remote encrypting incremental backup utility
 LICENSE=		gnu-gpl-v2
 
 DEPENDS+=	gnupg>=1.0.0:../../security/gnupg
-DEPENDS+=	${PYPKGPREFIX}-boto>=0.9d:../../net/py-boto
+DEPENDS+=	${PYPKGPREFIX}-boto>=1.6a:../../net/py-boto
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 
+REPLACE_PYTHON+=	*.py
+REPLACE_PYTHON+=	bin/*
+REPLACE_PYTHON+=	duplicity/*.py
+
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	fixing hard coded dirs
diff --git a/sysutils/duplicity/PLIST b/sysutils/duplicity/PLIST
index d668a9f9e80..9e3ed5136a6 100644
--- a/sysutils/duplicity/PLIST
+++ b/sysutils/duplicity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/04/08 20:21:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/09/05 10:05:43 wiz Exp $
 bin/duplicity
 bin/rdiffdir
 ${PYSITELIB}/${EGG_FILE}
@@ -18,6 +18,18 @@ ${PYSITELIB}/duplicity/backend.pyo
 ${PYSITELIB}/duplicity/backends/__init__.py
 ${PYSITELIB}/duplicity/backends/__init__.pyc
 ${PYSITELIB}/duplicity/backends/__init__.pyo
+${PYSITELIB}/duplicity/backends/_boto_multi.py
+${PYSITELIB}/duplicity/backends/_boto_multi.pyc
+${PYSITELIB}/duplicity/backends/_boto_multi.pyo
+${PYSITELIB}/duplicity/backends/_boto_single.py
+${PYSITELIB}/duplicity/backends/_boto_single.pyc
+${PYSITELIB}/duplicity/backends/_boto_single.pyo
+${PYSITELIB}/duplicity/backends/_ssh_paramiko.py
+${PYSITELIB}/duplicity/backends/_ssh_paramiko.pyc
+${PYSITELIB}/duplicity/backends/_ssh_paramiko.pyo
+${PYSITELIB}/duplicity/backends/_ssh_pexpect.py
+${PYSITELIB}/duplicity/backends/_ssh_pexpect.pyc
+${PYSITELIB}/duplicity/backends/_ssh_pexpect.pyo
 ${PYSITELIB}/duplicity/backends/botobackend.py
 ${PYSITELIB}/duplicity/backends/botobackend.pyc
 ${PYSITELIB}/duplicity/backends/botobackend.pyo
@@ -66,6 +78,9 @@ ${PYSITELIB}/duplicity/collections.pyo
 ${PYSITELIB}/duplicity/commandline.py
 ${PYSITELIB}/duplicity/commandline.pyc
 ${PYSITELIB}/duplicity/commandline.pyo
+${PYSITELIB}/duplicity/compilec.py
+${PYSITELIB}/duplicity/compilec.pyc
+${PYSITELIB}/duplicity/compilec.pyo
 ${PYSITELIB}/duplicity/diffdir.py
 ${PYSITELIB}/duplicity/diffdir.pyc
 ${PYSITELIB}/duplicity/diffdir.pyo
@@ -84,6 +99,9 @@ ${PYSITELIB}/duplicity/errors.pyo
 ${PYSITELIB}/duplicity/file_naming.py
 ${PYSITELIB}/duplicity/file_naming.pyc
 ${PYSITELIB}/duplicity/file_naming.pyo
+${PYSITELIB}/duplicity/filechunkio.py
+${PYSITELIB}/duplicity/filechunkio.pyc
+${PYSITELIB}/duplicity/filechunkio.pyo
 ${PYSITELIB}/duplicity/globals.py
 ${PYSITELIB}/duplicity/globals.pyc
 ${PYSITELIB}/duplicity/globals.pyo
@@ -142,9 +160,10 @@ man/man1/duplicity.1
 man/man1/rdiffdir.1
 share/doc/${PKGNAME}/CHANGELOG
 share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/LOG-README
 share/doc/${PKGNAME}/README
-share/doc/${PKGNAME}/REPO-README
+share/doc/${PKGNAME}/README-LOG
+share/doc/${PKGNAME}/README-REPO
+share/doc/${PKGNAME}/tarfile-CHANGES
 share/doc/${PKGNAME}/tarfile-LICENSE
 share/locale/bg/LC_MESSAGES/duplicity.mo
 share/locale/de/LC_MESSAGES/duplicity.mo
@@ -155,6 +174,7 @@ share/locale/eo/LC_MESSAGES/duplicity.mo
 share/locale/es/LC_MESSAGES/duplicity.mo
 share/locale/fr/LC_MESSAGES/duplicity.mo
 share/locale/he/LC_MESSAGES/duplicity.mo
+share/locale/hu/LC_MESSAGES/duplicity.mo
 share/locale/id/LC_MESSAGES/duplicity.mo
 share/locale/io/LC_MESSAGES/duplicity.mo
 share/locale/it/LC_MESSAGES/duplicity.mo
@@ -165,6 +185,7 @@ share/locale/pt_BR/LC_MESSAGES/duplicity.mo
 share/locale/ru/LC_MESSAGES/duplicity.mo
 share/locale/sl/LC_MESSAGES/duplicity.mo
 share/locale/sq/LC_MESSAGES/duplicity.mo
+share/locale/sr/LC_MESSAGES/duplicity.mo
 share/locale/sv/LC_MESSAGES/duplicity.mo
 share/locale/tr/LC_MESSAGES/duplicity.mo
 share/locale/ug/LC_MESSAGES/duplicity.mo
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index 4e1376fc5a0..a650a131070 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2011/10/29 07:48:47 obache Exp $
+$NetBSD: distinfo,v 1.13 2012/09/05 10:05:43 wiz Exp $
 
-SHA1 (duplicity-0.6.16.tar.gz) = d134e56150969030ac391851cbe3d8b1a4ebfcee
-RMD160 (duplicity-0.6.16.tar.gz) = 1e8f4967113e55ad64d770cbe9f882dc0f2fddc0
-Size (duplicity-0.6.16.tar.gz) = 524358 bytes
+SHA1 (duplicity-0.6.19.tar.gz) = 07d72680d6b4850101a436f679793521a51f41ac
+RMD160 (duplicity-0.6.19.tar.gz) = 493336e8ac2c2f8a5dd15c441aa01d43aa426b06
+Size (duplicity-0.6.19.tar.gz) = 1131760 bytes