svn commit: r302587 - in head/sysutils/duplicity: . files

[Jase Thew]

Author: jase
Date: Wed Aug 15 16:47:35 2012
New Revision: 302587
URL: http://svn.freebsd.org/changeset/ports/302587

Log:
  - Add temporary patch to fix resuming encrypted backups.
  
  PR:		ports/170114
  Submitted by:	William Orr <will at worrbase.com>
  Obtained from:	https://answers.launchpad.net/duplicity/+question/183711
  Approved by:	flo (mentor)

Added:
  head/sysutils/duplicity/files/patch-bin-duplicity   (contents, props changed)
Modified:
  head/sysutils/duplicity/Makefile   (contents, props changed)

Modified: head/sysutils/duplicity/Makefile
==============================================================================
--- head/sysutils/duplicity/Makefile	Wed Aug 15 16:40:13 2012	(r302586)
+++ head/sysutils/duplicity/Makefile	Wed Aug 15 16:47:35 2012	(r302587)
@@ -7,7 +7,7 @@
 
 PORTNAME=	duplicity
 PORTVERSION=	0.6.19
-PORTREVISION=	1
+PORTREVISION=	2	
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
 

Added: head/sysutils/duplicity/files/patch-bin-duplicity
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/duplicity/files/patch-bin-duplicity	Wed Aug 15 16:47:35 2012	(r302587)
@@ -0,0 +1,11 @@
+--- bin/duplicity.orig	2012-05-22 15:58:53.000000000 +0100
++++ bin/duplicity	2012-08-12 14:32:01.920372871 +0100
+@@ -321,6 +321,8 @@
+ 
+         # Settings are same, let's check passphrase itself if we are encrypted
+         if globals.encryption:
++            if not globals.gpg_profile.passphrase:
++                globals.gpg_profile.passphrase = get_passphrase(1, "verify")
+             fileobj = restore_get_enc_fileobj(globals.backend, vol1_filename,
+                                               manifest.volume_info_dict[1])
+             fileobj.close()