[sendmail] Fixed milter_helo regression (milter-helo-fix patch)

[Jaroslav Škarvada]

commit bb93e952de6e0ad7e401aa2a2588a26dda07758f
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Jan 16 21:48:47 2013 +0100

    Fixed milter_helo regression (milter-helo-fix patch)
    
      Resolves: rhbz#895552

 sendmail-8.14.6-milter-helo-fix.patch |   12 ++++++++++++
 sendmail.spec                         |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/sendmail-8.14.6-milter-helo-fix.patch b/sendmail-8.14.6-milter-helo-fix.patch
new file mode 100644
index 0000000..03a6959
--- /dev/null
+++ b/sendmail-8.14.6-milter-helo-fix.patch
@@ -0,0 +1,12 @@
+diff -up ./sendmail/milter.c.orig ./sendmail/milter.c
+--- a/sendmail/milter.c	2013-01-02 10:15:08.000000000 +0100
++++ b/sendmail/milter.c	2013-01-16 18:58:19.440497919 +0100
+@@ -4067,7 +4067,7 @@ milter_helo(helo, e, state)
+ 	}
+ 
+ 	response = milter_command(SMFIC_HELO, helo, strlen(helo) + 1,
+-				  SMFIM_EOH, e, state, "helo", false);
++				  SMFIM_HELO, e, state, "helo", false);
+ 	milter_per_connection_check(e);
+ 	return response;
+ }
diff --git a/sendmail.spec b/sendmail.spec
index 0a59039..a6e81ce 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -23,7 +23,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -97,6 +97,8 @@ Patch23: sendmail-8.14.4-sasl2-in-etc.patch
 # add QoS support, patch from Philip Prindeville <philipp at fedoraproject.org>
 # upstream reserved option ID 0xe7 for testing of this new feature, #576643
 Patch25: sendmail-8.14.5-qos.patch
+# accepted upstream
+Patch26: sendmail-8.14.6-milter-helo-fix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libdb-devel
@@ -218,6 +220,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 .milter-helo-fix
 
 for f in RELEASE_NOTES contrib/etrn.0; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -716,6 +719,10 @@ fi
 %{_initrddir}/sendmail
 
 %changelog
+* Wed Jan 16 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.6-2
+- Fixed milter_helo regression (milter-helo-fix patch)
+  Resolves: rhbz#895552
+
 * Mon Dec 24 2012 Robert Scheck <robert at fedoraproject.org> - 8.14.6-1
 - Upgrade to 8.14.6