diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-12-08 13:36:30 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-12-08 13:36:30 +0000 |
| commit | d5ac990c9c1b1164c248a17e6472130fd87bd937 (patch) | |
| tree | 2897e1677658fc2f0c0a79029e99be6589df5c9a /mail-client | |
| parent | Yet another brown paper bag bump, still bug 295998. (diff) | |
| download | gentoo-2-d5ac990c9c1b1164c248a17e6472130fd87bd937.tar.gz gentoo-2-d5ac990c9c1b1164c248a17e6472130fd87bd937.tar.bz2 gentoo-2-d5ac990c9c1b1164c248a17e6472130fd87bd937.zip | |
Add patch from upstream for compiling against newer OpenSSL
(Portage version: 2.2.00.14964-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/mutt/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/mutt/files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch | 17 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.5.20-r8.ebuild | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index 154e2ae5b494..3af7e5562e37 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.168 2009/11/30 19:45:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.169 2009/12/08 13:36:30 grobian Exp $ + + 08 Dec 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r8.ebuild, + +files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch: + Add patch from upstream for compiling against newer OpenSSL 30 Nov 2009; Raúl Porcel <armin76@gentoo.org> mutt-1.5.20-r8.ebuild: Re-add ~ia64/~sparc wrt #290154 diff --git a/mail-client/mutt/files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch b/mail-client/mutt/files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch new file mode 100644 index 000000000000..ae5c81feb3a9 --- /dev/null +++ b/mail-client/mutt/files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch @@ -0,0 +1,17 @@ +http://dev.mutt.org/trac/changeset/1cf34ea1f128 +http://dev.mutt.org/trac/ticket/3356 + +STACK* is not defined with newer SSL, use STACK_OF instead. +Closes #3356. + +Index: mutt_ssl.c +=================================================================== +--- mutt_ssl.c (revision 6016:dc09812e63a3) ++++ mutt_ssl.c (revision 6031:1cf34ea1f128) +@@ -653,5 +653,5 @@ + int bufsize; + /* needed to get the DNS subjectAltNames: */ +- STACK *subj_alt_names; ++ STACK_OF(GENERAL_NAME) *subj_alt_names; + int subj_alt_names_count; + GENERAL_NAME *subj_alt_name; diff --git a/mail-client/mutt/mutt-1.5.20-r8.ebuild b/mail-client/mutt/mutt-1.5.20-r8.ebuild index 6214193a5e02..38736b3a91bc 100644 --- a/mail-client/mutt/mutt-1.5.20-r8.ebuild +++ b/mail-client/mutt/mutt-1.5.20-r8.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-r8.ebuild,v 1.6 2009/11/30 19:45:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r8.ebuild,v 1.7 2009/12/08 13:36:30 grobian Exp $ inherit eutils flag-o-matic autotools @@ -101,6 +101,7 @@ src_unpack() { epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch epatch "${FILESDIR}"/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch + epatch "${FILESDIR}"/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch # patch version string for bug reports sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \ |