diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-05-11 20:24:50 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-05-11 20:24:50 +0000 |
| commit | af5e0fcb16412cfd70901856dc4f14a0278b7dba (patch) | |
| tree | bfa92282e6ccb1f064af606820b1cadce6973f0c /app-crypt/gpgme | |
| parent | Drop old (diff) | |
| download | gentoo-2-af5e0fcb16412cfd70901856dc4f14a0278b7dba.tar.gz gentoo-2-af5e0fcb16412cfd70901856dc4f14a0278b7dba.tar.bz2 gentoo-2-af5e0fcb16412cfd70901856dc4f14a0278b7dba.zip | |
Fix tests with GnuPG 2.0.17 (bug #362645).
(Portage version: 2.2.0_alpha32_p18/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/gpgme')
| -rw-r--r-- | app-crypt/gpgme/ChangeLog | 8 | ||||
| -rw-r--r-- | app-crypt/gpgme/files/gpgme-1.3.0-gnupg-2.0.17.patch | 14 | ||||
| -rw-r--r-- | app-crypt/gpgme/gpgme-1.3.0.ebuild | 5 |
3 files changed, 23 insertions, 4 deletions
diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog index e5351acebe76..edce183a17e8 100644 --- a/app-crypt/gpgme/ChangeLog +++ b/app-crypt/gpgme/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gpgme -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.182 2010/09/13 15:22:37 arfrever Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.183 2011/05/11 20:24:50 arfrever Exp $ + + 11 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + gpgme-1.3.0.ebuild, +files/gpgme-1.3.0-gnupg-2.0.17.patch: + Fix tests with GnuPG 2.0.17 (bug #362645). 13 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> -gpgme-1.1.8-r1.ebuild, -gpgme-1.2.0.ebuild, diff --git a/app-crypt/gpgme/files/gpgme-1.3.0-gnupg-2.0.17.patch b/app-crypt/gpgme/files/gpgme-1.3.0-gnupg-2.0.17.patch new file mode 100644 index 000000000000..02dc05e8bb5a --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.3.0-gnupg-2.0.17.patch @@ -0,0 +1,14 @@ +http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff;h=43f38db1afe9830b888076adeec1eec21f32335c + +--- tests/gpg/t-encrypt-sign.c ++++ tests/gpg/t-encrypt-sign.c +@@ -60,7 +60,8 @@ + result->signatures->pubkey_algo); + exit (1); + } +- if (result->signatures->hash_algo != GPGME_MD_SHA1) ++ if (result->signatures->hash_algo != GPGME_MD_SHA1 ++ && result->signatures->hash_algo != GPGME_MD_RMD160) + { + fprintf (stderr, "Wrong hash algorithm reported: %i\n", + result->signatures->hash_algo); diff --git a/app-crypt/gpgme/gpgme-1.3.0.ebuild b/app-crypt/gpgme/gpgme-1.3.0.ebuild index da4236755a7b..01e53a070467 100644 --- a/app-crypt/gpgme/gpgme-1.3.0.ebuild +++ b/app-crypt/gpgme/gpgme-1.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.0.ebuild,v 1.8 2010/08/30 14:02:21 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.0.ebuild,v 1.9 2011/05/11 20:24:50 arfrever Exp $ EAPI="3" @@ -23,6 +23,7 @@ RDEPEND="${DEPEND}" src_prepare() { epatch "${FILESDIR}/${PN}-1.1.8-et_EE.patch" + epatch "${FILESDIR}/${P}-gnupg-2.0.17.patch" # Call elibtoolize to get sane .so versioning on FreeBSD. elibtoolize |