diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-07-21 17:31:28 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-07-21 17:31:28 +0000 |
| commit | 447309f1957ca8f9f6d680c76e6b59b7313c1188 (patch) | |
| tree | a85e25bc27b95a381082da31b456b00349ad357a /mail-client | |
| parent | Touch access.log and error.log and chmod them to icecast:nogroup wrt #245727,... (diff) | |
| download | gentoo-2-447309f1957ca8f9f6d680c76e6b59b7313c1188.tar.gz gentoo-2-447309f1957ca8f9f6d680c76e6b59b7313c1188.tar.bz2 gentoo-2-447309f1957ca8f9f6d680c76e6b59b7313c1188.zip | |
Fix bug #278394, allow mutt to run correctly with gpgme-1.2.0
(Portage version: 2.2.00.13830-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/mutt/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/mutt/files/mutt-1.5.20-gpgme-1.2.0.patch | 29 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.5.20-r2.ebuild | 5 |
3 files changed, 37 insertions, 3 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index d7bf62d6dd15..ef55ecb0deed 100644 --- a/mail-client/mutt/ChangeLog +++ b/mail-client/mutt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/mutt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.140 2009/07/21 12:03:44 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.141 2009/07/21 17:31:28 grobian Exp $ + + 21 Jul 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r2.ebuild, + +files/mutt-1.5.20-gpgme-1.2.0.patch: + Fix bug #278394, allow mutt to run correctly with gpgme-1.2.0 21 Jul 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r2.ebuild: Patch in Gentoo version on mutt -v for (upstream) bug-reports diff --git a/mail-client/mutt/files/mutt-1.5.20-gpgme-1.2.0.patch b/mail-client/mutt/files/mutt-1.5.20-gpgme-1.2.0.patch new file mode 100644 index 000000000000..ff3ce9f80e0a --- /dev/null +++ b/mail-client/mutt/files/mutt-1.5.20-gpgme-1.2.0.patch @@ -0,0 +1,29 @@ +http://bugs.gentoo.org/show_bug.cgi?id=278394 +http://dev.mutt.org/trac/ticket/3300 + + +--- mutt-1.5.20/init.c ++++ mutt-1.5.20/init.c +@@ -50,6 +49,10 @@ + #include <errno.h> + #include <sys/wait.h> + ++#if defined(CRYPT_BACKEND_GPGME) ++#include <gpgme.h> ++#endif ++ + #define CHECK_PAGER \ + if ((CurrentMenu == MENU_PAGER) && (idx >= 0) && \ + (MuttVars[idx].flags & R_RESORT)) \ +@@ -3262,6 +3265,11 @@ + + mutt_read_histfile (); + ++#ifdef CRYPT_BACKEND_GPGME ++ /* needed since version 1.2.0, ticket #3300 */ ++ gpgme_check_version (NULL); ++#endif ++ + #if 0 + set_option (OPTWEED); /* turn weeding on by default */ + #endif diff --git a/mail-client/mutt/mutt-1.5.20-r2.ebuild b/mail-client/mutt/mutt-1.5.20-r2.ebuild index ddd991b27d5d..933358230736 100644 --- a/mail-client/mutt/mutt-1.5.20-r2.ebuild +++ b/mail-client/mutt/mutt-1.5.20-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r2.ebuild,v 1.3 2009/07/21 12:03:44 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r2.ebuild,v 1.4 2009/07/21 17:31:28 grobian Exp $ inherit eutils flag-o-matic autotools @@ -49,7 +49,7 @@ RDEPEND=">=sys-libs/ncurses-5.2 sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) - gpg? ( >=app-crypt/gpgme-0.9.0 <app-crypt/gpgme-1.2.0 ) + gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types" DEPEND="${RDEPEND} @@ -74,6 +74,7 @@ src_unpack() { epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection epatch "${FILESDIR}"/mutt-1.5.18-interix.patch epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch + epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch # post-release hot-fixes epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch |