>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.patch 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 = \ %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 © 2014, 2015 Eric Bavier ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016 Leo Famulari +;;; Copyright © 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/packages/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:52.146001614 -0500 -+++ duplicity-0.6.24/testing/functional/test_final.py 2014-09-28 13:13:20.333546342 -0500 -@@ -156,13 +156,6 @@ - self.run_duplicity(options=["remove-older-than", "50000", "--force", self.backend_url]) - self.assertEqual(self.get_backend_files(), second_chain) - -- 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=[self.sign_passphrase, self.sign_passphrase]) -- self.restore(passphrase_input=[self.sign_passphrase]) -- - - class OldFilenamesFinalTest(FinalTest): - diff --git a/gnu/packages/patches/duplicity-test_selection-tmp.patch b/gnu/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')]) - - self.root = Path("/") -- self.ParseTest([("--exclude", "/home/*"), -- ("--include", "/home"), -+ self.ParseTest([("--exclude", "/tmp/*"), -+ ("--include", "/tmp"), - ("--exclude", "/")], -- [(), ("home",)]) -+ [(), ("tmp",)]) - - if __name__ == "__main__": - unittest.main() -- 2.9.3