Accepting request 38311 from server:mail

Copy from server:mail/msmtp based on submit request 38311 from user coolo

OBS-URL: https://build.opensuse.org/request/show/38311
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/msmtp?expand=0&rev=11

msmtp-fix-newopenssl.patch

@@ -0,0 +1,22 @@
+Index: msmtp-1.4.20/src/tls.c
+===================================================================
+--- msmtp-1.4.20.orig/src/tls.c
++++ msmtp-1.4.20/src/tls.c
+@@ -888,7 +888,7 @@ int tls_check_cert(tls_t *tls, const cha
+     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 @@ int tls_check_cert(tls_t *tls, const cha
+     /* 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++)

msmtp.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 19 16:13:36 CEST 2010 - meissner@suse.de
+
+- fix build with new openSSL
+
 -------------------------------------------------------------------
 Sun Mar 21 11:03:36 UTC 2010 - pascal.bleser@opensuse.org
 

msmtp.spec

@@ -20,7 +20,7 @@
 
 Name:           msmtp
 Version:        1.4.20
-Release:        1
+Release:        2
 #
 License:        GPLv3+
 Group:          Productivity/Networking/Email/Utilities
@@ -55,6 +55,7 @@ Requires(preun):/sbin/install-info
 #
 Url:            http://msmtp.sourceforge.net/
 Source:         http://prdownloads.sourceforge.net/msmtp/msmtp-%{version}.tar.bz2
+Patch0:         msmtp-fix-newopenssl.patch
 #
 Summary:        Lightweight SMTP Client
 
@@ -86,6 +87,7 @@ examples and sample configuration files.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if 0%{?suse_version} > 1000