summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2018-07-21 12:35:10 +0100
committerChristopher Baines <mail@cbaines.net>2018-08-04 08:45:57 +0100
commite61f092c877da5a9dc5dcdd82690bd3c191769e1 (patch)
tree34797fbce7b8397fb5f48668fdceb879d3c1854c
parenta058b5cfeedf7b65adb6856a4dc9b0c55df05e03 (diff)
downloadguix-e61f092c877da5a9dc5dcdd82690bd3c191769e1.tar.gz
gnu: Patch duplicity with --ignore-mdc-error.
Modify the package to patch gnu.py with an unreleased upstream change to fix
duplicity working with recent releases of GnuPG. This change make the package
build again.

* gnu/packages/backup.scm (duplicity)[arguments]: Patch gnu.py within the
patch-source phase.
-rw-r--r--gnu/packages/backup.scm9
1 files changed, 9 insertions, 0 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 9884f58fc3..0733d9c345 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -105,6 +105,15 @@
              (substitute* "duplicity/gpginterface.py"
                (("self.call = 'gpg'")
                 (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'")))
+
+             ;; This matches up with an unreleased upstream fix, it should be
+             ;; removed when the package is updated
+             ;; https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/revision/1308
+             (substitute* "duplicity/gpg.py"
+               (("--no-secmem-warning'\\)")
+                "--no-secmem-warning')
+        gnupg.options.extra_args.append('--ignore-mdc-error')"))
+
              (substitute* '("testing/functional/__init__.py"
                             "testing/overrides/bin/lftp")
                (("/bin/sh") (which "sh")))