From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brendan Tildesley Subject: Re: [PATCH 3/3] gnu: Duplicity: Update to 0.7.10 Date: Thu, 22 Sep 2016 16:31:37 +1000 Message-ID: <60549c85-5c34-98a4-79cb-c0095f208ff9@openmailbox.org> References: <595814a0-d4cb-1359-a520-11412ce90fe6@openmailbox.org> <20160920142544.23887d55@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------82EBA7D78009532D76F3745E" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmxY2-0002G0-4c for guix-devel@gnu.org; Thu, 22 Sep 2016 02:31:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmxXx-00048E-Hh for guix-devel@gnu.org; Thu, 22 Sep 2016 02:31:53 -0400 Received: from smtp9.openmailbox.org ([62.4.1.43]:35415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmxXx-00047m-54 for guix-devel@gnu.org; Thu, 22 Sep 2016 02:31:49 -0400 In-Reply-To: <20160920142544.23887d55@openmailbox.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------82EBA7D78009532D76F3745E Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Eric Bavier =E6=96=BC 2016-09-21 05:25 =E5=AF=AB=E9=81=93: > [...] > Let's leave out the nnecessary whitespace changes. > > Could you send an updated patch? > Thanks, > `~Eric Ok, I remade it all to look like I didn't just rewrite everything from scratch, and added the incorrect indentation back in. Seems odd to prefer keeping the patch small over fixing indentation. --------------82EBA7D78009532D76F3745E Content-Type: text/x-patch; name="0001-gnu-duplicity-Update-to-0.7.10.patch" Content-Disposition: attachment; filename="0001-gnu-duplicity-Update-to-0.7.10.patch" Content-Transfer-Encoding: quoted-printable >From 15721c677f20156071fe0efb150b3af63f64648c Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Tue, 20 Sep 2016 20:41:30 +1000 Subject: [PATCH 1/3] gnu: duplicity: Update to 0.7.10. * gnu/packages/backup.scm (duplicity): Update to 0.7.10. [source]: Remove duplicity-piped-password.patch. [source]: Remove duplicity-test_selection-tmp.patch. * gnu/local.mk (dist_patch_DATA): Removed above patch file entries. --- gnu/local.mk | 2 -- gnu/packages/backup.scm | 15 +++++++-------= - gnu/packages/patches/duplicity-piped-password.patch | 20 --------------= ------ .../patches/duplicity-test_selection-tmp.patch | 18 --------------= ---- 4 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/duplicity-piped-password.patch delete mode 100644 gnu/packages/patches/duplicity-test_selection-tmp.pat= ch diff --git a/gnu/local.mk b/gnu/local.mk index a756638..2445172 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -488,8 +488,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/doxygen-test.patch \ - %D%/packages/patches/duplicity-piped-password.patch \ - %D%/packages/patches/duplicity-test_selection-tmp.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \ %D%/packages/patches/einstein-build.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index e77c4f2..0082676 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2014, 2015 Eric Bavier ;;; Copyright =C2=A9 2014 Ian Denhardt ;;; Copyright =C2=A9 2015, 2016 Leo Famulari +;;; Copyright =C2=A9 2016 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,7 +52,7 @@ (define-public duplicity (package (name "duplicity") - (version "0.6.26") + (version "0.7.10") (source (origin (method url-fetch) @@ -61,20 +62,17 @@ version ".tar.gz")) (sha256 (base32 - "0jh79syhr8n3l81jxlwsmwm1pklb4d923m2lgqbswyavh1fqmvwb")) - (patches (search-patches "duplicity-piped-password.patch" - "duplicity-test_selection-tmp.patch")))) + "0hj8451gpndyqdfxwhbxwr9ddxvc47g0iv003q33q5kda8ayyps8")))) (build-system python-build-system) (native-inputs `(("python2-setuptools" ,python2-setuptools) + ("python2-mock" ,python2-mock) ("util-linux" ,util-linux))) ;setsid command, for the tests (inputs `(("python" ,python-2) ("librsync" ,librsync) - ("mock" ,python2-mock) ;for testing ("lockfile" ,python2-lockfile) - ("gnupg" ,gnupg-1) ;gpg executable needed - ("util-linux" ,util-linux) ;for setsid + ("gnupg" ,gnupg-1) ("tzdata" ,tzdata))) (arguments `(#:python ,python-2 ;setup assumes Python 2 @@ -82,7 +80,8 @@ #:phases (alist-cons-before 'check 'check-setup (lambda* (#:key inputs #:allow-other-keys) - (substitute* "testing/functional/__init__.py" + (substitute* '("testing/functional/__init__.py" + "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))) (setenv "HOME" (getcwd)) ;gpg needs to write to $HOME (setenv "TZDIR" ;some timestamp checks need = TZDIR diff --git a/gnu/packages/patches/duplicity-piped-password.patch b/gnu/pa= ckages/patches/duplicity-piped-password.patch deleted file mode 100644 index db50f5d..0000000 --- a/gnu/packages/patches/duplicity-piped-password.patch +++ /dev/null @@ -1,20 +0,0 @@ -This test, on three occasions, is failing with the error: - - EOF: End Of File (EOF) in read_nonblocking(). Braindead platform. - ---- duplicity-0.6.24/testing/functional/test_final.py 2014-09-28 13:14:5= 2.146001614 -0500 -+++ duplicity-0.6.24/testing/functional/test_final.py 2014-09-28 13:13:2= 0.333546342 -0500 -@@ -156,13 +156,6 @@ - self.run_duplicity(options=3D["remove-older-than", "50000", "--= force", self.backend_url]) - self.assertEqual(self.get_backend_files(), second_chain) -=20 -- def test_piped_password(self): -- """Make sure that prompting for a password works""" -- self.set_environ("PASSPHRASE", None) -- self.backup("full", "testfiles/empty_dir", -- passphrase_input=3D[self.sign_passphrase, self.sign= _passphrase]) -- self.restore(passphrase_input=3D[self.sign_passphrase]) -- -=20 - class OldFilenamesFinalTest(FinalTest): -=20 diff --git a/gnu/packages/patches/duplicity-test_selection-tmp.patch b/gn= u/packages/patches/duplicity-test_selection-tmp.patch deleted file mode 100644 index 8f66be4..0000000 --- a/gnu/packages/patches/duplicity-test_selection-tmp.patch +++ /dev/null @@ -1,18 +0,0 @@ -Reported upstream at https://bugs.launchpad.net/duplicity/+bug/1375019 - ---- duplicity-0.6.24/testing/unit/test_selection.py 2014-05-09 08:27:40.= 000000000 -0500 -+++ duplicity-0.6.24/testing/unit/test_selection.py 2014-09-28 12:28:53.= 932324380 -0500 -@@ -431,10 +431,10 @@ - [(), ('1',), ('1', '1'), ('1', '2'), ('1', '3')]= ) -=20 - self.root =3D Path("/") -- self.ParseTest([("--exclude", "/home/*"), -- ("--include", "/home"), -+ self.ParseTest([("--exclude", "/tmp/*"), -+ ("--include", "/tmp"), - ("--exclude", "/")], -- [(), ("home",)]) -+ [(), ("tmp",)]) -=20 - if __name__ =3D=3D "__main__": - unittest.main() --=20 2.9.3 --------------82EBA7D78009532D76F3745E Content-Type: text/x-patch; name="0002-gnu-duplicity-Use-modify-phases.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-gnu-duplicity-Use-modify-phases.patch" >From aa2ed1cc2e6863f26e675f77ff210b346b8bfd93 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 22 Sep 2016 01:45:19 +1000 Subject: [PATCH 2/3] gnu: duplicity: Use modify-phases. * gnu/packages/backup.scm (duplicity): Use modify-phases instead of alist-cons-before. --- gnu/packages/backup.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0082676..665e0d6 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -77,17 +77,17 @@ (arguments `(#:python ,python-2 ;setup assumes Python 2 #:test-target "test" - #:phases (alist-cons-before - 'check 'check-setup - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("testing/functional/__init__.py" - "testing/overrides/bin/lftp") - (("/bin/sh") (which "sh"))) - (setenv "HOME" (getcwd)) ;gpg needs to write to $HOME - (setenv "TZDIR" ;some timestamp checks need TZDIR - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo"))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("testing/functional/__init__.py" + "testing/overrides/bin/lftp") + (("/bin/sh") (which "sh"))) + (setenv "HOME" (getcwd)) ;gpg needs to write to $HOME + (setenv "TZDIR" ;some timestamp checks need TZDIR + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo"))))))) (home-page "http://duplicity.nongnu.org/index.html") (synopsis "Encrypted backup using rsync algorithm") (description -- 2.9.3 --------------82EBA7D78009532D76F3745E Content-Type: text/x-patch; name="0003-gnu-duplicity-Add-various-backends.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0003-gnu-duplicity-Add-various-backends.patch" >From 95a4a505cf48627205cfd734b73c74913d88c36c Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 22 Sep 2016 01:03:32 +1000 Subject: [PATCH 3/3] gnu: duplicity: Add various backends * gnu/packages/backup.scm (duplicity): Add various backends. --- gnu/packages/backup.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 665e0d6..fea3a57 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) + #:use-module (gnu packages ftp) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) @@ -71,7 +72,15 @@ (inputs `(("python" ,python-2) ("librsync" ,librsync) - ("lockfile" ,python2-lockfile) + ("python2-lockfile" ,python2-lockfile) + ("python2-pexpect" ,python2-pexpect) + ("python2-paramiko" ,python2-paramiko) + ("python2-pycrypto" ,python2-pycrypto) + ("python2-botocore" ,python2-botocore) + ("python2-dropbox" ,python2-dropbox) + ("lftp" ,lftp) + ("ncftp" ,ncftp) + ("par2cmdline" ,par2cmdline) ("gnupg" ,gnupg-1) ("tzdata" ,tzdata))) (arguments -- 2.9.3 --------------82EBA7D78009532D76F3745E--