From 534164a3cda4af6ad440c58ab9ea4f7d2f0b5a27 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Jul 22 2011 21:44:38 +0000
Subject: Fixed SMTP AUTH over TLS in case of two AUTH lines

Resolves: rhbz#716628

---

diff --git a/sendmail.spec b/sendmail.spec
index e9886e6..72ebb0b 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -14,7 +14,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -67,7 +67,7 @@ Patch13: sendmail-8.14.4-aliases_dir.patch
 Patch14: sendmail-8.13.7-vacation.patch
 # remove version information from sendmail helpfile
 Patch15: sendmail-8.14.1-noversion.patch
-# do not accept localhost.localdomain as valid address from smtp
+# do not accept localhost.localdomain as valid address from SMTP
 Patch16: sendmail-8.13.1-localdomain.patch
 # build libmilter as DSO
 Patch17: sendmail-8.14.3-sharedmilter.patch
@@ -84,6 +84,8 @@ Patch23: sendmail-8.14.4-sasl2-in-etc.patch
 # add QoS support, patch from Philip Prindeville <philipp@fedoraproject.org>
 # upstream reserved option ID 0xe7 for testing of this new feature, #576643
 Patch25: sendmail-8.14.5-qos.patch
+# fix SMTP AUTH over TLS in case of two AUTH lines, #716628
+Patch26: sendmail-8.14.5-auth2.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libdb-devel
@@ -193,6 +195,7 @@ cp devtools/M4/UNIX/{,shared}library.m4
 %patch22 -p1 -b .libdb5
 %patch23 -p1 -b .sasl2-in-etc
 %patch25 -p1 -b .qos
+%patch26 -p1 -b .auth2
 
 for f in RELEASE_NOTES contrib/etrn.0; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -645,6 +648,10 @@ exit 0
 
 
 %changelog
+* Fri Jul 22 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-3
+- Fixed SMTP AUTH over TLS in case of two AUTH lines
+  Resolves: rhbz#716628
+
 * Fri Jul 22 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-2
 - Dropped reload action from initscripts
   Resolves: rhbz#719931