Fix building with OpenSSL >= 1.0.0 wrt #327955 by Alec M.

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

4 files changed, 38 insertions, 6 deletions

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index f15682e60f29..bb5f7c6d85f8 100644
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.83 2010/06/09 18:51:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.84 2010/07/12 17:33:09 ssuominen Exp $
+
+  12 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> msmtp-1.4.20.ebuild,
+  +files/msmtp-1.4.20-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #327955 by Alec M.
 
 *msmtp-1.4.20 (09 Jun 2010)
 
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index fa8f5bd5552d..eb816b6d7e81 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,8 +1,9 @@
 AUX mailer.conf 279 RMD160 1814eab17a6810a29a2b3c30ec3a69741fe40902 SHA1 90864ba7b1a44327abb47d54aadd4448b33e52d5 SHA256 f7be36c6d4957cdafcf5162dd5e766fbe269eed25135bc61af02883896b4c25f
+AUX msmtp-1.4.20-openssl-1.patch 771 RMD160 90b11b1fb0b69ac98455bac63b7bb7a826da6493 SHA1 41cec2164a639f1e0de1e6e08897b5b9e4210371 SHA256 6b458656931d7103dd9ef24c3424faded30a205ec6b387aa0d3703d20a6d8472
 DIST msmtp-1.4.19.tar.bz2 820041 RMD160 1fd6bdf71aed9b8e939203ef59e499feedd63d64 SHA1 4491891326e8accacc02b1d4e7176262222122d0 SHA256 d6bf3f6f796041fc7d6653c022cc696238fdf8b2d538c4b2cd6c0aae5f056c66
 DIST msmtp-1.4.20.tar.bz2 845014 RMD160 5594473abcf25d77157d2410ebb26abec5197c25 SHA1 6668ed503b6647365358b8dd821535b1ff9e2c15 SHA256 328abd95370c6a5a9ea2fd38b55fc50d6fb3b03d96b3da40de2441650d53ebdb
 EBUILD msmtp-1.4.19-r1.ebuild 2708 RMD160 7687da6036a9c2aa864733b60954abd020752c52 SHA1 2644ba0d8ad175e3f267b5ce356c96af5a77bfc5 SHA256 5e5da02c8207926d2c121e6fe8e2a2f8632a98205389c39da22348501dbcb320
 EBUILD msmtp-1.4.19.ebuild 1977 RMD160 f9f4ac94069bec8ce5b8b8345091f174cff24ec3 SHA1 189cd91ba8b94d9fe1bce1ee4cee2ad9de485738 SHA256 81f2edd77a98b6344b1b1beaffc13325336cd98d49c0dbe0f8f8a5e3f4f48b24
-EBUILD msmtp-1.4.20.ebuild 2703 RMD160 4053056c5d06ed3b7598d906a419d344e8a3aa6f SHA1 170b075f142da200d4e6b1fcede0533da4061bf1 SHA256 9617929c3ad548d32d9d2c756ba70492abc65562335fafbd1884961a4485723f
-MISC ChangeLog 11710 RMD160 e5c8c263c43953e1bc18c650e9f151a11bdf6af9 SHA1 7e5a7919e26ac63b637acb30ed5846e2398c954c SHA256 cc3ca154d0e9df2e50fe863781dfcf3fa16cd0e3920c302bccb282abd0d6ff4b
+EBUILD msmtp-1.4.20.ebuild 2780 RMD160 da4fe2b4e49142b2864644d4de99ce9d008b133b SHA1 922d9ba176b7a2f5bbed57eb898c7aa487478b7a SHA256 e0b034e0e98a46b313bf63a95cdd1aa9b49cc61c8aaf54e7df17c1e3a96c457c
+MISC ChangeLog 11887 RMD160 18ae35f0087fc845751fc6f8e9892f356ebbf526 SHA1 077cf9e92a0622cab37c2c65e7576879f91a522b SHA256 5495d0cf040fd7f747ee178ef946debf246b7da58d933cefb9cd0da52a7af12e
 MISC metadata.xml 241 RMD160 f3ecce2785b4dbd86fc2454197c5ea18bdceeb8e SHA1 0c8829739037990f3a2c342f959eb734eeabefc7 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889
diff --git a/mail-mta/msmtp/files/msmtp-1.4.20-openssl-1.patch b/mail-mta/msmtp/files/msmtp-1.4.20-openssl-1.patch
new file mode 100644
index 000000000000..5b7373fdd388
--- /dev/null
+++ b/mail-mta/msmtp/files/msmtp-1.4.20-openssl-1.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/327955
+
+--- src/tls.c
++++ src/tls.c
+@@ -888,7 +888,7 @@
+     char *buf;
+     int length;
+     /* 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;
+     /* did we find a name matching hostname? */
+@@ -988,7 +988,7 @@
+     /* Try the DNS subjectAltNames. */
+     match_found = 0;
+     if ((subj_alt_names =
+-                X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
++                (STACK_OF(GENERAL_NAME)*)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
+     {
+         subj_alt_names_count = sk_GENERAL_NAME_num(subj_alt_names);
+         for (i = 0; i < subj_alt_names_count; i++)
diff --git a/mail-mta/msmtp/msmtp-1.4.20.ebuild b/mail-mta/msmtp/msmtp-1.4.20.ebuild
index a740902b1d33..630bc778975e 100644
--- a/mail-mta/msmtp/msmtp-1.4.20.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.20.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.20.ebuild,v 1.1 2010/06/09 18:51:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.20.ebuild,v 1.2 2010/07/12 17:33:09 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="http://msmtp.sourceforge.net/"
@@ -32,7 +33,11 @@ DEPEND="${DEPEND}
 
 PROVIDE="mta? ( virtual/mta )"
 
-src_configure () {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-openssl-1.patch
+}
+
+src_configure() {
 	local myconf
 
 	if use gnutls ; then
@@ -51,7 +56,7 @@ src_configure () {
 		${myconf}
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 
 	if use mta; then