From 9f256f3bb0b40a9c84960aa0c3b4973d28d0d1af3c3442d6fc916303198b01b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 14 Jan 2011 16:01:21 +0000
Subject: [PATCH] Accepting request 57754 from home:gberh:branches:server:mail

OBS-URL: https://build.opensuse.org/request/show/57754
OBS-URL: https://build.opensuse.org/package/show/server:mail/msmtp?expand=0&rev=45
---
 msmtp-1.4.20.tar.bz2       |  3 ---
 msmtp-1.4.22.tar.bz2       |  3 +++
 msmtp-fix-newopenssl.patch | 22 ----------------------
 msmtp.changes              | 16 ++++++++++++++++
 msmtp.spec                 |  7 +++----
 5 files changed, 22 insertions(+), 29 deletions(-)
 delete mode 100644 msmtp-1.4.20.tar.bz2
 create mode 100644 msmtp-1.4.22.tar.bz2
 delete mode 100644 msmtp-fix-newopenssl.patch

diff --git a/msmtp-1.4.20.tar.bz2 b/msmtp-1.4.20.tar.bz2
deleted file mode 100644
index df52acb..0000000
--- a/msmtp-1.4.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:328abd95370c6a5a9ea2fd38b55fc50d6fb3b03d96b3da40de2441650d53ebdb
-size 845014
diff --git a/msmtp-1.4.22.tar.bz2 b/msmtp-1.4.22.tar.bz2
new file mode 100644
index 0000000..ae37611
--- /dev/null
+++ b/msmtp-1.4.22.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aa6d8cddf7a0210eb8c69608bf3595dae28f82cabec4e03d309fe486531c74e
+size 942285
diff --git a/msmtp-fix-newopenssl.patch b/msmtp-fix-newopenssl.patch
deleted file mode 100644
index 1176b8b..0000000
--- a/msmtp-fix-newopenssl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 a64defe..499e03e 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Jan 10 14:24:09 UTC 2011 - gber@opensuse.org
+
+- update to version 1.4.22
+  - avoid different account selection behaviour in --pretend mode,
+    and print more informational messages about account selection
+    in --pretend and --debug mode
+  - add a new passwordeval command and --passwordeval option, to
+    set the password from the output of a command
+  - a few documentation improvements
+  - report platform in --version output
+  - fix building with newer OpenSSL versions
+  - updated find_alias_for_msmtp.sh script
+  - fixed building without TLS/SSL support
+- removed obsolete msmtp-fix-newopenssl.patch
+
 -------------------------------------------------------------------
 Mon Apr 19 16:13:36 CEST 2010 - meissner@suse.de
 
diff --git a/msmtp.spec b/msmtp.spec
index c42a369..7eadf96 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package msmtp (Version 1.4.20)
+# spec file for package msmtp (Version 1.4.22)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           msmtp
-Version:        1.4.20
+Version:        1.4.22
 Release:        2
 #
 License:        GPLv3+
@@ -55,7 +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
+#Patch0:         msmtp-fix-newopenssl.patch
 #
 Summary:        Lightweight SMTP Client
 
@@ -87,7 +87,6 @@ examples and sample configuration files.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %if 0%{?suse_version} > 1000