On Wed, Jan 04, 2017 at 05:29:58PM -0500, Daniel Jakots wrote: > Hi, > > Here's a diff to update duplicity to its latest release. Sadly the diff > that was thought to be committed upstream wasn't exactly the one ending > in this new release. I already raised the issue with upstream. > works fine, ok giovanni@ Cheers Giovanni
> Cheers,
> Daniel
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile 3 Sep 2016 08:45:52 -0000 1.39
> +++ Makefile 4 Jan 2017 22:27:48 -0000
> @@ -5,7 +5,7 @@
>
> COMMENT = encrypted backup using rsync algorithm
>
> -MODPY_EGG_VERSION = 0.7.10
> +MODPY_EGG_VERSION = 0.7.11
> DISTNAME = duplicity-${MODPY_EGG_VERSION}
>
> CATEGORIES = sysutils
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/duplicity/distinfo,v
> retrieving revision 1.22
> diff -u -p -r1.22 distinfo
> --- distinfo 3 Sep 2016 08:45:52 -0000 1.22
> +++ distinfo 4 Jan 2017 22:27:48 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (duplicity-0.7.10.tar.gz) =
> SF/vFVJtFjwGHgDsCN4hbPfWUuZ9Qd5dw77Z+0IhSEI=
> -SIZE (duplicity-0.7.10.tar.gz) = 1543523
> +SHA256 (duplicity-0.7.11.tar.gz) =
> sEehWQofW7OXRkOtLMnf3TL2GtvywZiRkfsSy1nC7Ac=
> +SIZE (duplicity-0.7.11.tar.gz) = 1550197
> Index: patches/patch-bin_duplicity_1
> ===================================================================
> RCS file: /cvs/ports/sysutils/duplicity/patches/patch-bin_duplicity_1,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-bin_duplicity_1
> --- patches/patch-bin_duplicity_1 25 May 2016 17:41:36 -0000 1.5
> +++ patches/patch-bin_duplicity_1 4 Jan 2017 22:27:48 -0000
> @@ -1,8 +1,8 @@
> $OpenBSD: patch-bin_duplicity_1,v 1.5 2016/05/25 17:41:36 danj Exp $
> Document the ssh backend change from paramiko to pexpect.
> ---- bin/duplicity.1.orig Tue Apr 19 13:38:57 2016
> -+++ bin/duplicity.1 Mon Apr 25 17:23:16 2016
> -@@ -434,7 +434,7 @@ should be given relative to the root of the directory
> +--- bin/duplicity.1.orig Sat Dec 31 11:33:12 2016
> ++++ bin/duplicity.1 Mon Jan 2 19:46:22 2017
> +@@ -446,7 +446,7 @@ should be given relative to the root of the directory
>
>
> .TP
> @@ -11,7 +11,7 @@ Document the ssh backend change from par
> Adds a prefix to all files, manifest files, archive files, and/or signature
> files.
>
> The same set of prefixes must be passed in on backup and restore.
> -@@ -852,7 +852,6 @@ currently supports only the
> +@@ -864,7 +864,6 @@ currently supports only the
> or
> .B -oIdentityFile
> setting. If needed provide more host specific options via ssh_config file.
> Index: patches/patch-testing_functional_test_restart_py
> ===================================================================
> RCS file:
> /cvs/ports/sysutils/duplicity/patches/patch-testing_functional_test_restart_py,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-testing_functional_test_restart_py
> --- patches/patch-testing_functional_test_restart_py 16 Sep 2016 16:18:19
> -0000 1.2
> +++ patches/patch-testing_functional_test_restart_py 4 Jan 2017 22:27:48
> -0000
> @@ -1,16 +1,15 @@
> -$OpenBSD: patch-testing_functional_test_restart_py,v 1.2 2016/09/16 16:18:19
> danj Exp $
> +$OpenBSD$
>
> -Committed upstream
> -https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/revision/1149
> +upstream bug report https://bugs.launchpad.net/bugs/1623342
>
> ---- testing/functional/test_restart.py.orig Fri Sep 2 16:48:03 2016
> -+++ testing/functional/test_restart.py Fri Sep 2 16:47:14 2016
> -@@ -327,6 +327,8 @@ class RestartTestWithoutEncryption(RestartTest):
> +--- testing/functional/test_restart.py.orig Tue Jan 3 21:22:07 2017
> ++++ testing/functional/test_restart.py Tue Jan 3 21:21:23 2017
> +@@ -327,7 +327,7 @@ class RestartTestWithoutEncryption(RestartTest):
> tarcmd = "tar"
> elif platform.platform().startswith('Darwin'):
> tarcmd = "gtar"
> +- elif platform.platform().endswith('BSD'):
> + elif platform.system().endswith('BSD'):
> -+ tarcmd = "gtar"
> + tarcmd = "gtar"
> else:
> raise Exception("Platform %s not supported by tar/gtar." %
> platform.platform())
> -
>
signature.asc
Description: PGP signature
