From ee3211db6b86a4e0944a53c66cd3a2326d600d089ec5b02ebc075c10d80faf8e Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 27 Jul 2010 02:53:11 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/msmtp?expand=0&rev=15

---
 msmtp-1.4.20.tar.bz2       |  3 +++
 msmtp-1.4.21.tar.bz2       |  3 ---
 msmtp-fix-newopenssl.patch | 22 ++++++++++++++++++++++
 msmtp.changes              | 10 ----------
 msmtp.spec                 |  6 ++++--
 5 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 msmtp-1.4.20.tar.bz2
 delete mode 100644 msmtp-1.4.21.tar.bz2
 create mode 100644 msmtp-fix-newopenssl.patch

diff --git a/msmtp-1.4.20.tar.bz2 b/msmtp-1.4.20.tar.bz2
new file mode 100644
index 0000000..df52acb
--- /dev/null
+++ b/msmtp-1.4.20.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:328abd95370c6a5a9ea2fd38b55fc50d6fb3b03d96b3da40de2441650d53ebdb
+size 845014
diff --git a/msmtp-1.4.21.tar.bz2 b/msmtp-1.4.21.tar.bz2
deleted file mode 100644
index f0cf3f3..0000000
--- a/msmtp-1.4.21.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fb39be54d793882081d38ec2b709f6dc1aa4c124f5f244e111a0b604df14ffa
-size 947451
diff --git a/msmtp-fix-newopenssl.patch b/msmtp-fix-newopenssl.patch
new file mode 100644
index 0000000..1176b8b
--- /dev/null
+++ b/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++)
diff --git a/msmtp.changes b/msmtp.changes
index 42708c8..a64defe 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Thu Jul 22 21:24:15 UTC 2010 - bphilips@novell.com
-
-- update to version 1.4.21
-  - Report platform in --version output
-  - Update gnulib to 2010-07-03
-  - Fix building with newer OpenSSL versions
-  - Updated find_alias_for_msmtp.sh script
-  - Fixed building without TLS/SSL support
-
 -------------------------------------------------------------------
 Mon Apr 19 16:13:36 CEST 2010 - meissner@suse.de
 
diff --git a/msmtp.spec b/msmtp.spec
index 264dcbe..c42a369 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -19,8 +19,8 @@
 
 
 Name:           msmtp
-Version:        1.4.21
-Release:        1
+Version:        1.4.20
+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