summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schiffbauer <mschiff@gentoo.org>2013-12-04 14:34:52 +0000
committerMarc Schiffbauer <mschiff@gentoo.org>2013-12-04 14:34:52 +0000
commit08cfdc319458a4ce5c5389821a268268534a705a (patch)
treea338a464de0d65bc6944294c1aabd5c08182e559 /app-backup/obnam/files
parentAdd workaround for bug 493278 (diff)
downloadgentoo-2-08cfdc319458a4ce5c5389821a268268534a705a.tar.gz
gentoo-2-08cfdc319458a4ce5c5389821a268268534a705a.tar.bz2
gentoo-2-08cfdc319458a4ce5c5389821a268268534a705a.zip
Added patch for >=gnupg-2.0.22. Revbumped 1.6.1. Fixes #488596. Thanks to Thomas Eschenbacher and Martin Dummer.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)
Diffstat (limited to 'app-backup/obnam/files')
-rw-r--r--app-backup/obnam/files/obnam-gnupg-ownertrust.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/app-backup/obnam/files/obnam-gnupg-ownertrust.patch b/app-backup/obnam/files/obnam-gnupg-ownertrust.patch
new file mode 100644
index 000000000000..c1c32d810503
--- /dev/null
+++ b/app-backup/obnam/files/obnam-gnupg-ownertrust.patch
@@ -0,0 +1,15 @@
+diff --git a/obnamlib/encryption.py b/obnamlib/encryption.py
+index 9fa849a..1d7643b 100644
+--- a/obnamlib/encryption.py
++++ b/obnamlib/encryption.py
+@@ -168,6 +168,10 @@ class Keyring(object):
+ f = open(self._keyring, 'wb')
+ f.write(self._encoded)
+ f.close()
++ _gpg(['--import-ownertrust'], stdin='''\
++# List of assigned trustvalues, created Sun 01 Dec 2013 19:13:26 GMT
++# (Use "gpg --import-ownertrust" to restore them)
++''', gpghome=self._gpghome)
+
+ def _cleanup(self):
+ shutil.rmtree(self._gpghome)