fix negative ctx_id in milter debug output (#577558)

fix incomplete description of the -i option in man page (#676824)

sendmail-8.14.4-man-i-option-fix.patch

@@ -0,0 +1,14 @@
+--- sendmail-8.14.4/sendmail/sendmail.8.old	2011-03-03 11:13:10.000000000 +0100
++++ sendmail-8.14.4/sendmail/sendmail.8	2011-03-03 11:18:22.938108268 +0100
+@@ -224,8 +224,9 @@
+ ``Received:'' lines in the message are counted.
+ .TP
+ .B \-i
+-Ignore dots alone on lines by themselves in incoming messages.
+-This should be set if you are reading data from a file.
++Do not strip a leading dot from lines in incoming messages, and
++do not treat a dot on a line by itself as the end of an incoming
++message. This should be set if you are reading data from a file.
+ .TP
+ .BI "\-L " tag
+ Set the identifier used in syslog messages to the supplied

sendmail-8.14.4-milter-fix-negativeid.patch

@@ -0,0 +1,91 @@
+--- sendmail-8.14.4/libmilter/engine.c.old	2009-11-06 01:57:07.000000000 +0100
++++ sendmail-8.14.4/libmilter/engine.c	2011-02-22 18:40:52.405037566 +0100
+@@ -284,7 +284,7 @@
+ 		if (mi_stop() == MILTER_ABRT)
+ 		{
+ 			if (ctx->ctx_dbg > 3)
+-				sm_dprintf("[%ld] milter_abort\n",
++				sm_dprintf("[%lu] milter_abort\n",
+ 					(long) ctx->ctx_id);
+ 			ret = MI_FAILURE;
+ 			break;
+@@ -315,7 +315,7 @@
+ 		    cmd < SMFIC_VALIDCMD)
+ 		{
+ 			if (ctx->ctx_dbg > 5)
+-				sm_dprintf("[%ld] mi_engine: mi_rd_cmd error (%x)\n",
++				sm_dprintf("[%lu] mi_engine: mi_rd_cmd error (%x)\n",
+ 					(long) ctx->ctx_id, (int) cmd);
+ 
+ 			/*
+@@ -328,7 +328,7 @@
+ 			break;
+ 		}
+ 		if (ctx->ctx_dbg > 4)
+-			sm_dprintf("[%ld] got cmd '%c' len %d\n",
++			sm_dprintf("[%lu] got cmd '%c' len %d\n",
+ 				(long) ctx->ctx_id, cmd, (int) len);
+ 		for (i = 0; i < ncmds; i++)
+ 		{
+@@ -339,7 +339,7 @@
+ 		{
+ 			/* unknown command */
+ 			if (ctx->ctx_dbg > 1)
+-				sm_dprintf("[%ld] cmd '%c' unknown\n",
++				sm_dprintf("[%lu] cmd '%c' unknown\n",
+ 					(long) ctx->ctx_id, cmd);
+ 			ret = MI_FAILURE;
+ 			break;
+@@ -348,7 +348,7 @@
+ 		{
+ 			/* stop for now */
+ 			if (ctx->ctx_dbg > 1)
+-				sm_dprintf("[%ld] cmd '%c' not impl\n",
++				sm_dprintf("[%lu] cmd '%c' not impl\n",
+ 					(long) ctx->ctx_id, cmd);
+ 			ret = MI_FAILURE;
+ 			break;
+@@ -357,14 +357,14 @@
+ 		/* is new state ok? */
+ 		newstate = cmds[i].cm_next;
+ 		if (ctx->ctx_dbg > 5)
+-			sm_dprintf("[%ld] cur %x new %x nextmask %x\n",
++			sm_dprintf("[%lu] cur %x new %x nextmask %x\n",
+ 				(long) ctx->ctx_id,
+ 				curstate, newstate, next_states[curstate]);
+ 
+ 		if (newstate != ST_NONE && !trans_ok(curstate, newstate))
+ 		{
+ 			if (ctx->ctx_dbg > 1)
+-				sm_dprintf("[%ld] abort: cur %d (%x) new %d (%x) next %x\n",
++				sm_dprintf("[%lu] abort: cur %d (%x) new %d (%x) next %x\n",
+ 					(long) ctx->ctx_id,
+ 					curstate, MI_MASK(curstate),
+ 					newstate, MI_MASK(newstate),
+@@ -434,7 +434,7 @@
+ 		else if (r == _SMFIS_ABORT)
+ 		{
+ 			if (ctx->ctx_dbg > 5)
+-				sm_dprintf("[%ld] function returned abort\n",
++				sm_dprintf("[%lu] function returned abort\n",
+ 					(long) ctx->ctx_id);
+ 			ret = MI_FAILURE;
+ 			break;
+@@ -1122,7 +1122,7 @@
+ 	fix_stm(ctx);
+ 
+ 	if (ctx->ctx_dbg > 3)
+-		sm_dprintf("[%ld] milter_negotiate:"
++		sm_dprintf("[%lu] milter_negotiate:"
+ 			" mta_actions=0x%lx, mta_flags=0x%lx"
+ 			" actions=0x%lx, flags=0x%lx\n"
+ 			, (long) ctx->ctx_id
+@@ -1131,7 +1131,7 @@
+ 
+ #if _FFR_MILTER_CHECK
+ 	if (ctx->ctx_dbg > 3)
+-		sm_dprintf("[%ld] milter_negotiate:"
++		sm_dprintf("[%lu] milter_negotiate:"
+ 			" testmode=%d, pflags2mta=%X, internal_pflags=%X\n"
+ 			, (long) ctx->ctx_id, testmode
+ 			, ctx->ctx_pflags2mta, internal_pflags);

sendmail.spec

@@ -14,7 +14,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.4
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -86,6 +86,10 @@ Patch24: sendmail-8.14.4-m4-ldap-routing.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.4-qos.patch
+# fix negative ctx_id in milter debug output (#577558), accepted upstream
+Patch26: sendmail-8.14.4-milter-fix-negativeid.patch
+# fix incomplete description of the -i option in man page (#676824)
+Patch27: sendmail-8.14.4-man-i-option-fix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libdb-devel
@@ -196,6 +200,8 @@ cp devtools/M4/UNIX/{,shared}library.m4
 %patch23 -p1 -b .sasl2-in-etc
 %patch24 -p1 -b .m4-ldap-routing
 %patch25 -p1 -b .qos
+%patch26 -p1 -b .milter-fix-negativeid
+%patch27 -p1 -b .man-i-option-fix
 
 for f in RELEASE_NOTES contrib/etrn.0; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -648,6 +654,10 @@ exit 0
 
 
 %changelog
+* Thu Mar 03 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-21
+- fix negative ctx_id in milter debug output (#577558)
+- fix incomplete description of the -i option in man page (#676824)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.14.4-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild