diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2013-12-04 14:34:52 +0000 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2013-12-04 14:34:52 +0000 |
| commit | 08cfdc319458a4ce5c5389821a268268534a705a (patch) | |
| tree | a338a464de0d65bc6944294c1aabd5c08182e559 /app-backup | |
| parent | Add workaround for bug 493278 (diff) | |
| download | gentoo-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')
| -rw-r--r-- | app-backup/obnam/ChangeLog | 10 | ||||
| -rw-r--r-- | app-backup/obnam/files/obnam-gnupg-ownertrust.patch | 15 | ||||
| -rw-r--r-- | app-backup/obnam/obnam-1.5.ebuild | 4 | ||||
| -rw-r--r-- | app-backup/obnam/obnam-1.6.1-r1.ebuild (renamed from app-backup/obnam/obnam-1.6.1.ebuild) | 4 |
4 files changed, 30 insertions, 3 deletions
diff --git a/app-backup/obnam/ChangeLog b/app-backup/obnam/ChangeLog index e272b66f77f8..91c36daf3783 100644 --- a/app-backup/obnam/ChangeLog +++ b/app-backup/obnam/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-backup/obnam # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.15 2013/12/02 00:16:51 mschiff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.16 2013/12/04 14:34:52 mschiff Exp $ + +*obnam-1.6.1-r1 (04 Dec 2013) + + 04 Dec 2013; Marc Schiffbauer <mschiff@gentoo.org> + +files/obnam-gnupg-ownertrust.patch, +obnam-1.6.1-r1.ebuild, + -obnam-1.6.1.ebuild, obnam-1.5.ebuild: + Added patch for >=gnupg-2.0.22. Revbumped 1.6.1. Fixes #488596. Thanks to + Thomas Eschenbacher and Martin Dummer. *obnam-1.6.1 (02 Dec 2013) 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) diff --git a/app-backup/obnam/obnam-1.5.ebuild b/app-backup/obnam/obnam-1.5.ebuild index 0b36f4522d51..9e7623adc4b0 100644 --- a/app-backup/obnam/obnam-1.5.ebuild +++ b/app-backup/obnam/obnam-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.5.ebuild,v 1.1 2013/08/09 15:40:34 mschiff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.5.ebuild,v 1.2 2013/12/04 14:34:52 mschiff Exp $ EAPI=5 @@ -29,6 +29,8 @@ DEPEND="${PYTHON_DEPS} " RDEPEND="${DEPEND}" +PATCHES=( ${FILESDIR}/${PN}-gnupg-ownertrust.patch ) + src_compile() { addwrite /proc/self/comm distutils-r1_src_compile diff --git a/app-backup/obnam/obnam-1.6.1.ebuild b/app-backup/obnam/obnam-1.6.1-r1.ebuild index 45ccad1a9471..ee6e2e1cf065 100644 --- a/app-backup/obnam/obnam-1.6.1.ebuild +++ b/app-backup/obnam/obnam-1.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.6.1.ebuild,v 1.1 2013/12/02 00:16:51 mschiff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.6.1-r1.ebuild,v 1.1 2013/12/04 14:34:52 mschiff Exp $ EAPI=5 @@ -29,6 +29,8 @@ DEPEND="${PYTHON_DEPS} " RDEPEND="${DEPEND}" +PATCHES=( ${FILESDIR}/${PN}-gnupg-ownertrust.patch ) + src_compile() { addwrite /proc/self/comm distutils-r1_src_compile |