[pkgsrc/trunk]: pkgsrc/mail/sendmail nb1: Add patch at http://www.sendmail.or...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/93c8210b0ec1
branches:  trunk
changeset: 518278:93c8210b0ec1
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Sep 05 20:01:37 2006 +0000

description:
nb1: Add patch at http://www.sendmail.org/patches/client_name.assert.p0.
Non-critical, but could cause problems if "sendmail -bs" is used in
conjunction with milters.

diffstat:

 mail/sendmail/Makefile         |   3 ++-
 mail/sendmail/distinfo         |   3 ++-
 mail/sendmail/patches/patch-ak |  23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r f3ae593655b3 -r 93c8210b0ec1 mail/sendmail/Makefile
--- a/mail/sendmail/Makefile    Tue Sep 05 19:49:33 2006 +0000
+++ b/mail/sendmail/Makefile    Tue Sep 05 20:01:37 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.91 2006/07/07 18:06:27 tv Exp $
+# $NetBSD: Makefile,v 1.92 2006/09/05 20:01:37 tv Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
 PKGNAME=       sendmail-${DIST_VERS}
+PKGREVISION=   1
 COMMENT=       The well known Mail Transport Agent
 
 CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
diff -r f3ae593655b3 -r 93c8210b0ec1 mail/sendmail/distinfo
--- a/mail/sendmail/distinfo    Tue Sep 05 19:49:33 2006 +0000
+++ b/mail/sendmail/distinfo    Tue Sep 05 20:01:37 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2006/08/09 21:23:00 tv Exp $
+$NetBSD: distinfo,v 1.33 2006/09/05 20:01:37 tv Exp $
 
 SHA1 (sendmail.8.13.8.tar.gz) = 8e97c10f52efe5204c08f6cb3f90c08e077ac505
 RMD160 (sendmail.8.13.8.tar.gz) = a5d333b073d681f056421e836df4067f331a8ac8
@@ -13,3 +13,4 @@
 SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
 SHA1 (patch-ai) = 8ade5888074ad9a328f87d66836c04eacf7785d5
 SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
+SHA1 (patch-ak) = 43b26ff1c78d4360909455124a382f65394377b3
diff -r f3ae593655b3 -r 93c8210b0ec1 mail/sendmail/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/sendmail/patches/patch-ak    Tue Sep 05 20:01:37 2006 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ak,v 1.5 2006/09/05 20:01:37 tv Exp $
+
+From: http://www.sendmail.org/patches/client_name.assert.p0
+(file path fixed to be relative to source top)
+
+Index: srvrsmtp.c
+===================================================================
+RCS file: /cvs/sendmail/srvrsmtp.c,v
+retrieving revision 8.948
+diff -u -r8.948 srvrsmtp.c
+--- sendmail/srvrsmtp.c        15 Aug 2006 23:24:58 -0000      8.948
++++ sendmail/srvrsmtp.c        24 Aug 2006 16:47:19 -0000
+@@ -945,7 +945,9 @@
+               char *response;
+ 
+               q = macvalue(macid("{client_name}"), e);
+-              SM_ASSERT(q != NULL);
++              SM_ASSERT(q != NULL || OpMode == MD_SMTP);
++              if (q == NULL)
++                      q = "localhost";
+               response = milter_connect(q, RealHostAddr, e, &state);
+               switch (state)
+               {