Apply upstream patch to fix compilation with openssl-1.0.0. Bug #328487

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 23 insertions, 4 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/Manifest b/mail-client/mutt/Manifest
index c2e2a421592e..f0866cffe7bc 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -9,13 +9,14 @@ AUX mutt-1.5.20-crash-on-invalid-limit-pattern.patch 383 RMD160 93d8c722e7fae2de
 AUX mutt-1.5.20-dont-reveal-bbc.patch 4027 RMD160 0295eb2ed6ae7d3b39c5b101d519d13f45d64c80 SHA1 c7ac97ec879c070eb3a24184ce41b199eec89840 SHA256 88b313f8baea81eec814d03acbe9aa5cf4a249de120426608893c1c53a8a3596
 AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0c2da4 SHA1 230af7e00e06a41f0024b8c6e19bd9d5b208511c SHA256 9e69e53cb3013a379f85e6dcea0550c4ec8582ea1f36a83c6a0ad95828164551
 AUX mutt-1.5.20-realpath-slowness.patch 676 RMD160 7e658134eabeec3f67c4de161bd9996e0096f240 SHA1 e189eb03f2488ad158bdd8ec93fed0f7e6762746 SHA256 a8d15cb9e5fb130b6fc28d9b323afe62e2dbe33f1b86f707de20053f2b9a9a3a
+AUX mutt-1.5.20_ssl.patch 380 RMD160 7ce82085224bcdea020c33c32ffbe31f585b064b SHA1 65bc5ace38737ca4c3d372145dcd703a30d73ddf SHA256 a83a0d00bfcf113575a5d55bb8708fe461815b5745d0f8a669a82fe9bb028119
 DIST mutt-1.5.20-gentoo-patches-r5.1.tar.bz2 78129 RMD160 d34779d691295d85a55828fa51e64b06a6c92d1d SHA1 193ec7edb6cffde670086a262aff9615f07adea8 SHA256 4c855764daaf939777c8f23a217cf43d6246dbc89f99827030c1ad3d53820b2d
 DIST mutt-1.5.20-gentoo-patches-r7.tar.bz2 80979 RMD160 ec85bc92af02530f4b6ca972f299a9d93e93cd5c SHA1 4af9df1fe82afb20ea556e70ba0e9d5d2af964eb SHA256 e51e8edc77f3127dded9a23b5cfb8b7326cfb6e97f43aae378390c71ba54b6b6
 DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
 DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
 EBUILD mutt-1.5.20-r10.ebuild 7958 RMD160 c185ac0ab4fa7cafc2f1e645b5d445c133db59bb SHA1 a87fd09bac2321e30748439b2bbc717254076f54 SHA256 d93b2daf5926e01ba4906720fb86f7285cfa29b7877a32f1aeaababb00e35837
 EBUILD mutt-1.5.20-r13.ebuild 7710 RMD160 1a0685395beda44ab9954552a1cb12b670cb2184 SHA1 ad9e3c4643f3be5ad1bc3eaff7742bf68607a3fc SHA256 0171a87a7d880de9f276c97452655ddd87ba6ae5c81c2dbe61dc10ec1c2363cc
-EBUILD mutt-1.5.20-r15.ebuild 8625 RMD160 7cc7568084b416f67c35fcee0014d565dfbc1166 SHA1 0eb52ada39bbf8e72fe1f6e77e1e62e232f160fc SHA256 1cdf8f3494220ae27eb11391884aa1b0afc6fb640c5a2d6fc52fdc337db2e49d
+EBUILD mutt-1.5.20-r15.ebuild 8700 RMD160 55002cc32a174a2d1081b0da64a30ccf925f18d2 SHA1 29cd1e1d108860892e667b5fe07ded8bfa5ace29 SHA256 107b881accae858a12fbd81269623837a5537b6c7387c4ce885a04be91122874
 EBUILD mutt-1.5.20-r6.ebuild 7280 RMD160 db5a40d2e845def3f4819de2d8272049215da0f1 SHA1 86e2c567618d1e6753806790072efb2811515348 SHA256 4999238ee8c6d875179d49f1b2b32e82c50b6179b8b4f0f6f97948910f55de11
-MISC ChangeLog 43941 RMD160 c329145fc6530aa1f955c053baca6d37260f8615 SHA1 1786ae78718d5c190b01e9043303f46a80cf838a SHA256 85385a508769c14a0317bcc0938abb7d22c90eb6c10f47560d4813d3f664a272
+MISC ChangeLog 44126 RMD160 ac6d8dc65927d89c0e36e33e03e343a52ffef507 SHA1 043a6ffb8a678bcc7b0272c7b85066fa31b3aa65 SHA256 37cd1af20692dd4e2e0f1dff67ad372a56336e8cb125a289de50a17af2fbf31b
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
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