summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-07-15 22:20:59 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-07-15 22:20:59 +0000
commit6c77527f31568b0c352bf7cef03d25104fec2cac (patch)
treebbea0c44d96241f07a29c1ac47b73578c15b3956 /mail-client/mutt
parentSet PYTHON_DEPEND. (diff)
downloadgentoo-2-6c77527f31568b0c352bf7cef03d25104fec2cac.tar.gz
gentoo-2-6c77527f31568b0c352bf7cef03d25104fec2cac.tar.bz2
gentoo-2-6c77527f31568b0c352bf7cef03d25104fec2cac.zip
Apply upstream patch to fix compilation with openssl-1.0.0. Bug #328487
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/mutt')
-rw-r--r--mail-client/mutt/ChangeLog6
-rw-r--r--mail-client/mutt/files/mutt-1.5.20_ssl.patch11
-rw-r--r--mail-client/mutt/mutt-1.5.20-r15.ebuild5
3 files changed, 20 insertions, 2 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 05d4a67cc1f6..5b1f98281193 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-client/mutt
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.187 2010/07/02 08:14:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.188 2010/07/15 22:20:58 hwoarang Exp $
+
+ 15 Jul 2010; Markos Chandras <hwoarang@gentoo.org> mutt-1.5.20-r15.ebuild,
+ +files/mutt-1.5.20_ssl.patch:
+ Apply upstream patch to fix compilation with openssl-1.0.0. Bug #328487
02 Jul 2010; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r15.ebuild:
Cleanup logic for USE=sidebar. Add big fat warnings that USE=sidebar
diff --git a/mail-client/mutt/files/mutt-1.5.20_ssl.patch b/mail-client/mutt/files/mutt-1.5.20_ssl.patch
new file mode 100644
index 000000000000..862464fb56f4
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20_ssl.patch
@@ -0,0 +1,11 @@
+--- a/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200
++++ b/mutt_ssl.c 2010-04-02 01:42:55.000000000 +0200
+@@ -652,7 +652,7 @@
+ char *buf = NULL;
+ int bufsize;
+ /* needed to get the DNS subjectAltNames: */
+- STACK *subj_alt_names;
++ STACK_OF(X509) *subj_alt_names;
+ int subj_alt_names_count;
+ GENERAL_NAME *subj_alt_name;
+ /* did we find a name matching hostname? */
diff --git a/mail-client/mutt/mutt-1.5.20-r15.ebuild b/mail-client/mutt/mutt-1.5.20-r15.ebuild
index 19263d0109c5..8c349bc1eee6 100644
--- a/mail-client/mutt/mutt-1.5.20-r15.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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-r15.ebuild,v 1.3 2010/07/02 08:14:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild,v 1.4 2010/07/15 22:20:58 hwoarang Exp $
EAPI="3"
@@ -82,6 +82,9 @@ src_prepare() {
built_with_use sys-libs/ncurses unicode && \
epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
+
+ #openssl-1.0.0 patch. bug #328487
+ epatch "${FILESDIR}"/${P}_ssl.patch
local pristine=$(use vanilla && echo yes)
if use sidebar && use !vanilla ; then