From 4b09aef673c27ba70f430135854f900c7202e2f9 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Thu, 18 Sep 2003 17:10:35 +0000
Subject: - Add patch from NetBSD 1.6 branch's changes for parseaddr.c
 1.8.2.1-1.8.2.3. - Also bump sendmail version information itself. - bump
 package revision.

BUGS
	Setting USE_WIDEPATCH=NO breaks the package.
---
 mail/sendmail811/Makefile         |  4 +--
 mail/sendmail811/distinfo         |  4 ++-
 mail/sendmail811/patches/patch-ah | 66 +++++++++++++++++++++++++++++++++++++++
 mail/sendmail811/patches/patch-ai |  9 ++++++
 4 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 mail/sendmail811/patches/patch-ah
 create mode 100644 mail/sendmail811/patches/patch-ai

(limited to 'mail')

diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index 8da8b0b5ab4..30f24944510 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/09/05 19:00:59 tron Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/18 17:10:35 taca Exp $
 
 DISTNAME=	sendmail.8.11.6
 PKGNAME=	sendmail-8.11.6
-PKGREVISION=	5
+PKGREVISION=	6
 WRKSRC=		${WRKDIR}/${PKGNAME:C/nb[0-9]+$//}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
diff --git a/mail/sendmail811/distinfo b/mail/sendmail811/distinfo
index 0bf22aa26fc..24f51652773 100644
--- a/mail/sendmail811/distinfo
+++ b/mail/sendmail811/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/03/04 00:26:50 seb Exp $
+$NetBSD: distinfo,v 1.4 2003/09/18 17:10:36 taca Exp $
 
 SHA1 (sendmail.8.11.6.tar.gz) = 8f24fc7824f6d99f1be08a9eec6fe18d56cab1be
 Size (sendmail.8.11.6.tar.gz) = 1374835 bytes
@@ -13,3 +13,5 @@ SHA1 (patch-ad) = 93408922c222d5fe6a14cdd8a00060230a9195b9
 SHA1 (patch-ae) = 5e3efecc7ac7ffed40278b3c29dd1152990f3b33
 SHA1 (patch-af) = db9e5d94b1b1f4cd7e5c9f25b36772e90e2987fe
 SHA1 (patch-ag) = 002f02fffce038bf9b7aeea8bce26f55c55f033f
+SHA1 (patch-ah) = 4ecee7aa515647fabfb3a7dcd4874f7f301a38e2
+SHA1 (patch-ai) = 62001829421cd80cb087543964f2fa7b939a20ab
diff --git a/mail/sendmail811/patches/patch-ah b/mail/sendmail811/patches/patch-ah
new file mode 100644
index 00000000000..3815b4e40c8
--- /dev/null
+++ b/mail/sendmail811/patches/patch-ah
@@ -0,0 +1,66 @@
+$NetBSD: patch-ah,v 1.1 2003/09/18 17:10:37 taca Exp $
+
+--- sendmail/parseaddr.c.orig	2003-09-19 00:49:40.000000000 +0900
++++ sendmail/parseaddr.c
+@@ -645,7 +645,7 @@ int masklen;
+ }
+ #endif
+ 
+-#define NOCHAR		-1	/* signal nothing in lookahead token */
++#define NOCHAR		(-1)	/* signal nothing in lookahead token */
+ 
+ char **
+ prescan(addr, delim, pvpbuf, pvpbsize, delimptr, toktab)
+@@ -731,22 +731,31 @@ prescan(addr, delim, pvpbuf, pvpbsize, d
+ 				/* see if there is room */
+ 				if (q >= &pvpbuf[pvpbsize - 5])
+ 				{
++	addrtoolong:
+ 					usrerr("553 5.1.1 Address too long");
+ 					if (strlen(addr) > (SIZE_T) MAXNAME)
+ 						addr[MAXNAME] = '\0';
+ 	returnnull:
+ 					if (delimptr != NULL)
++					{
++						if (p > addr)
++							--p;
+ 						*delimptr = p;
++					}
+ 					CurEnv->e_to = saveto;
+ 					return NULL;
+ 				}
+ 
+ 				/* squirrel it away */
++#if !ALLOW_255
++				if ((char) c == (char) -1 && !tTd(82, 101))
++					c &= 0x7f;
++#endif /* !ALLOW_255 */
+ 				*q++ = c;
+ 			}
+ 
+ 			/* read a new input character */
+-			c = *p++;
++			c = (*p++) & 0x00ff;
+ 			if (c == '\0')
+ 			{
+ 				/* diagnose and patch up bad syntax */
+@@ -801,6 +810,9 @@ prescan(addr, delim, pvpbuf, pvpbsize, d
+ 				}
+ 				else if (c != '!' || state == QST)
+ 				{
++					/* see if there is room */
++					if (q >= &pvpbuf[pvpbsize - 5])
++						goto addrtoolong;
+ 					*q++ = '\\';
+ 					continue;
+ 				}
+@@ -885,6 +897,9 @@ prescan(addr, delim, pvpbuf, pvpbsize, d
+ 		/* new token */
+ 		if (tok != q)
+ 		{
++			/* see if there is room */
++			if (q >= &pvpbuf[pvpbsize - 5])
++				goto addrtoolong;
+ 			*q++ = '\0';
+ 			if (tTd(22, 36))
+ 			{
diff --git a/mail/sendmail811/patches/patch-ai b/mail/sendmail811/patches/patch-ai
new file mode 100644
index 00000000000..3666b98a366
--- /dev/null
+++ b/mail/sendmail811/patches/patch-ai
@@ -0,0 +1,9 @@
+$NetBSD: patch-ai,v 1.1 2003/09/18 17:10:40 taca Exp $
+
+--- sendmail/version.c.orig	2003-09-19 00:49:40.000000000 +0900
++++ sendmail/version.c
+@@ -17,3 +17,3 @@ static char Wid[] = "@(#)$Id: version.c,
+ #endif /* ! lint */
+ 
+-char	Version[] = "8.11.6+3.4W";
++char	Version[] = "8.11.6p3+3.4W";
-- 
cgit v1.2.3