- Update to 8.11.7

8 files changed, 4 insertions, 1224 deletions

diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile
index 543efedc6833..3dc2616e4959 100644
--- a/mail/sendmail-old/Makefile
+++ b/mail/sendmail-old/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sendmail
-PORTVERSION=	8.11.6
-PORTREVISION=	4
+PORTVERSION=	8.11.7
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
diff --git a/mail/sendmail-old/distinfo b/mail/sendmail-old/distinfo
index 4cd8af6d7915..b09cad9feb25 100644
--- a/mail/sendmail-old/distinfo
+++ b/mail/sendmail-old/distinfo
@@ -1 +1 @@
-MD5 (sendmail.8.11.6.tar.gz) = a57e7681d810d9d6400cbe6bbcf06aa0
+MD5 (sendmail.8.11.7.tar.gz) = 96437c0ffdc23b02a5d3757017c295ec
diff --git a/mail/sendmail-old/files/patch-prescan b/mail/sendmail-old/files/patch-prescan
deleted file mode 100644
index 29fc1bacb6d8..000000000000
--- a/mail/sendmail-old/files/patch-prescan
+++ /dev/null
@@ -1,125 +0,0 @@
-Index: conf.c
-===================================================================
-RCS file: /cvs/sendmail/conf.c,v
-retrieving revision 8.646.2.2.2.87
-retrieving revision 8.646.2.2.2.92
-diff -c -r8.646.2.2.2.87 -r8.646.2.2.2.92
-*** sendmail/conf.c	20 Jul 2001 23:56:52 -0000	8.646.2.2.2.87
---- sendmail/conf.c	28 Mar 2003 06:02:46 -0000	8.646.2.2.2.92
-***************
-*** 381,386 ****
---- 381,388 ----
-  	DontLockReadFiles = TRUE;
-  	DoubleBounceAddr = "postmaster";
-  	MaxHeadersLength = MAXHDRSLEN;
-+ 	MaxMimeHeaderLength = MAXLINE;
-+ 	MaxMimeFieldLength = MaxMimeHeaderLength / 2;
-  	MaxForwardEntries = 0;
-  #if SASL
-  	AuthMechanisms = newstr(AUTH_MECHANISMS);
-Index: parseaddr.c
-===================================================================
-RCS file: /cvs/sendmail/parseaddr.c,v
-retrieving revision 8.234.4.13
-retrieving revision 8.234.4.18
-diff -c -r8.234.4.13 -r8.234.4.18
-*** sendmail/parseaddr.c	14 Aug 2001 23:08:13 -0000	8.234.4.13
---- sendmail/parseaddr.c	27 Mar 2003 19:40:12 -0000	8.234.4.18
-***************
-*** 446,452 ****
-  };
-  
-  
-! #define NOCHAR		-1	/* signal nothing in lookahead token */
-  
-  char **
-  prescan(addr, delim, pvpbuf, pvpbsize, delimptr, toktab)
---- 446,452 ----
-  };
-  
-  
-! #define NOCHAR		(-1)	/* signal nothing in lookahead token */
-  
-  char **
-  prescan(addr, delim, pvpbuf, pvpbsize, delimptr, toktab)
-***************
-*** 532,537 ****
---- 532,538 ----
-  				/* 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';
-***************
-*** 543,553 ****
-  				}
-  
-  				/* squirrel it away */
-  				*q++ = c;
-  			}
-  
-  			/* read a new input character */
-! 			c = *p++;
-  			if (c == '\0')
-  			{
-  				/* diagnose and patch up bad syntax */
---- 544,558 ----
-  				}
-  
-  				/* 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++) & 0x00ff;
-  			if (c == '\0')
-  			{
-  				/* diagnose and patch up bad syntax */
-***************
-*** 602,607 ****
---- 607,615 ----
-  				}
-  				else if (c != '!' || state == QST)
-  				{
-+ 					/* see if there is room */
-+ 					if (q >= &pvpbuf[pvpbsize - 5])
-+ 						goto addrtoolong;
-  					*q++ = '\\';
-  					continue;
-  				}
-***************
-*** 686,691 ****
---- 694,702 ----
-  		/* new token */
-  		if (tok != q)
-  		{
-+ 			/* see if there is room */
-+ 			if (q >= &pvpbuf[pvpbsize - 5])
-+ 				goto addrtoolong;
-  			*q++ = '\0';
-  			if (tTd(22, 36))
-  			{
-Index: version.c
-===================================================================
-RCS file: /cvs/sendmail/version.c,v
-retrieving revision 8.43.4.39
-diff -c -r8.43.4.39 version.c
-*** sendmail/version.c	20 Aug 2001 14:45:34 -0000	8.43.4.39
---- sendmail/version.c	19 Mar 2003 21:29:32 -0000
-***************
-*** 15,18 ****
-  static char id[] = "@(#)$Id: version.c,v 8.43.4.39 2001/08/20 14:45:34 gshapiro Exp $";
-  #endif /* ! lint */
-  
-! char	Version[] = "8.11.6";
---- 15,18 ----
-  static char id[] = "@(#)$Id: version.c,v 8.43.4.39 2001/08/20 14:45:34 gshapiro Exp $";
-  #endif /* ! lint */
-  
-! char	Version[] = "8.11.6p2";
diff --git a/mail/sendmail-old/files/patch-security b/mail/sendmail-old/files/patch-security
deleted file mode 100644
index 18e802e58546..000000000000
--- a/mail/sendmail-old/files/patch-security
+++ /dev/null
@@ -1,484 +0,0 @@
-Index: headers.c
-===================================================================
-RCS file: /cvs/sendmail/headers.c,v
-retrieving revision 8.203.4.13
-retrieving revision 8.203.4.15
-diff -u -r8.203.4.13 -r8.203.4.15
---- sendmail/headers.c	3 May 2001 17:24:06 -0000	8.203.4.13
-+++ sendmail/headers.c	20 Jan 2003 18:30:42 -0000	8.203.4.15
-@@ -648,7 +648,8 @@
- 			if (buf[0] != '\0')
- 			{
- 				if (bitset(H_FROM, h->h_flags))
--					expand(crackaddr(buf), buf, sizeof buf, e);
-+					expand(crackaddr(buf, e),
-+					       buf, sizeof buf, e);
- 				h->h_value = newstr(buf);
- 				h->h_flags &= ~H_DEFAULT;
- 			}
-@@ -971,7 +972,11 @@
- **	it and replaces it with "$g".  The parse is totally ad hoc
- **	and isn't even guaranteed to leave something syntactically
- **	identical to what it started with.  However, it does leave
--**	something semantically identical.
-+**	something semantically identical if possible, else at least
-+**	syntactically correct.
-+**
-+**	For example, it changes "Real Name <real@example.com> (Comment)"
-+**	to "Real Name <$g> (Comment)".
- **
- **	This algorithm has been cleaned up to handle a wider range
- **	of cases -- notably quoted and backslash escaped strings.
-@@ -980,6 +985,7 @@
- **
- **	Parameters:
- **		addr -- the address to be cracked.
-+**		e -- the current envelope.
- **
- **	Returns:
- **		a pointer to the new version.
-@@ -992,28 +998,50 @@
- **		be copied if it is to be reused.
- */
- 
-+#define SM_HAVE_ROOM		((bp < buflim) && (buflim <= bufend))
-+
-+/*
-+**  Append a character to bp if we have room.
-+**  If not, punt and return $g.
-+*/
-+
-+#define SM_APPEND_CHAR(c)					\
-+	do							\
-+	{							\
-+		if (SM_HAVE_ROOM)				\
-+			*bp++ = (c);				\
-+		else						\
-+			goto returng;				\
-+	} while (0)
-+
-+#if MAXNAME < 10
-+ERROR MAXNAME must be at least 10
-+#endif /* MAXNAME < 10 */
-+
- char *
--crackaddr(addr)
-+crackaddr(addr, e)
- 	register char *addr;
-+	ENVELOPE *e;
- {
- 	register char *p;
- 	register char c;
--	int cmtlev;
--	int realcmtlev;
--	int anglelev, realanglelev;
--	int copylev;
--	int bracklev;
--	bool qmode;
--	bool realqmode;
--	bool skipping;
--	bool putgmac = FALSE;
--	bool quoteit = FALSE;
--	bool gotangle = FALSE;
--	bool gotcolon = FALSE;
-+	int cmtlev;			/* comment level in input string */
-+	int realcmtlev;			/* comment level in output string */
-+	int anglelev;			/* angle level in input string */
-+	int copylev;			/* 0 == in address, >0 copying */
-+	int bracklev;			/* bracket level for IPv6 addr check */
-+	bool addangle;			/* put closing angle in output */
-+	bool qmode;			/* quoting in original string? */
-+	bool realqmode;			/* quoting in output string? */
-+	bool putgmac = FALSE;		/* already wrote $g */
-+	bool quoteit = FALSE;		/* need to quote next character */
-+	bool gotangle = FALSE;		/* found first '<' */
-+	bool gotcolon = FALSE;		/* found a ':' */
- 	register char *bp;
- 	char *buflim;
- 	char *bufhead;
- 	char *addrhead;
-+	char *bufend;
- 	static char buf[MAXNAME + 1];
- 
- 	if (tTd(33, 1))
-@@ -1028,25 +1056,22 @@
- 	**  adjusted later if we find them.
- 	*/
- 
-+	buflim = bufend = &buf[sizeof(buf) - 1];
- 	bp = bufhead = buf;
--	buflim = &buf[sizeof buf - 7];
- 	p = addrhead = addr;
--	copylev = anglelev = realanglelev = cmtlev = realcmtlev = 0;
-+	copylev = anglelev = cmtlev = realcmtlev = 0;
- 	bracklev = 0;
--	qmode = realqmode = FALSE;
-+	qmode = realqmode = addangle = FALSE;
- 
- 	while ((c = *p++) != '\0')
- 	{
- 		/*
--		**  If the buffer is overful, go into a special "skipping"
--		**  mode that tries to keep legal syntax but doesn't actually
--		**  output things.
-+		**  Try to keep legal syntax using spare buffer space
-+		**  (maintained by buflim).
- 		*/
- 
--		skipping = bp >= buflim;
--
--		if (copylev > 0 && !skipping)
--			*bp++ = c;
-+		if (copylev > 0)
-+			SM_APPEND_CHAR(c);
- 
- 		/* check for backslash escapes */
- 		if (c == '\\')
-@@ -1061,8 +1086,8 @@
- 				p--;
- 				goto putg;
- 			}
--			if (copylev > 0 && !skipping)
--				*bp++ = c;
-+			if (copylev > 0)
-+				SM_APPEND_CHAR(c);
- 			goto putg;
- 		}
- 
-@@ -1070,8 +1095,14 @@
- 		if (c == '"' && cmtlev <= 0)
- 		{
- 			qmode = !qmode;
--			if (copylev > 0 && !skipping)
-+			if (copylev > 0 && SM_HAVE_ROOM)
-+			{
-+				if (realqmode)
-+					buflim--;
-+				else
-+					buflim++;
- 				realqmode = !realqmode;
-+			}
- 			continue;
- 		}
- 		if (qmode)
-@@ -1083,15 +1114,15 @@
- 			cmtlev++;
- 
- 			/* allow space for closing paren */
--			if (!skipping)
-+			if (SM_HAVE_ROOM)
- 			{
- 				buflim--;
- 				realcmtlev++;
- 				if (copylev++ <= 0)
- 				{
- 					if (bp != bufhead)
--						*bp++ = ' ';
--					*bp++ = c;
-+						SM_APPEND_CHAR(' ');
-+					SM_APPEND_CHAR(c);
- 				}
- 			}
- 		}
-@@ -1101,7 +1132,7 @@
- 			{
- 				cmtlev--;
- 				copylev--;
--				if (!skipping)
-+				if (SM_HAVE_ROOM)
- 				{
- 					realcmtlev--;
- 					buflim++;
-@@ -1112,7 +1143,7 @@
- 		else if (c == ')')
- 		{
- 			/* syntax error: unmatched ) */
--			if (copylev > 0 && !skipping)
-+			if (copylev > 0 && SM_HAVE_ROOM)
- 				bp--;
- 		}
- 
-@@ -1130,7 +1161,7 @@
- 
- 			/*
- 			**  Check for DECnet phase IV ``::'' (host::user)
--			**  or **  DECnet phase V ``:.'' syntaxes.  The latter
-+			**  or DECnet phase V ``:.'' syntaxes.  The latter
- 			**  covers ``user@DEC:.tay.myhost'' and
- 			**  ``DEC:.tay.myhost::user'' syntaxes (bletch).
- 			*/
-@@ -1139,10 +1170,10 @@
- 			{
- 				if (cmtlev <= 0 && !qmode)
- 					quoteit = TRUE;
--				if (copylev > 0 && !skipping)
-+				if (copylev > 0)
- 				{
--					*bp++ = c;
--					*bp++ = *p;
-+					SM_APPEND_CHAR(c);
-+					SM_APPEND_CHAR(*p);
- 				}
- 				p++;
- 				goto putg;
-@@ -1153,41 +1184,43 @@
- 			bp = bufhead;
- 			if (quoteit)
- 			{
--				*bp++ = '"';
-+				SM_APPEND_CHAR('"');
- 
- 				/* back up over the ':' and any spaces */
- 				--p;
--				while (isascii(*--p) && isspace(*p))
-+				while (p > addr &&
-+				       isascii(*--p) && isspace(*p))
- 					continue;
- 				p++;
- 			}
- 			for (q = addrhead; q < p; )
- 			{
- 				c = *q++;
--				if (bp < buflim)
-+				if (quoteit && c == '"')
- 				{
--					if (quoteit && c == '"')
--						*bp++ = '\\';
--					*bp++ = c;
-+					SM_APPEND_CHAR('\\');
-+					SM_APPEND_CHAR(c);
- 				}
-+				else
-+					SM_APPEND_CHAR(c);
- 			}
- 			if (quoteit)
- 			{
- 				if (bp == &bufhead[1])
- 					bp--;
- 				else
--					*bp++ = '"';
-+					SM_APPEND_CHAR('"');
- 				while ((c = *p++) != ':')
--				{
--					if (bp < buflim)
--						*bp++ = c;
--				}
--				*bp++ = c;
-+					SM_APPEND_CHAR(c);
-+				SM_APPEND_CHAR(c);
- 			}
- 
- 			/* any trailing white space is part of group: */
--			while (isascii(*p) && isspace(*p) && bp < buflim)
--				*bp++ = *p++;
-+			while (isascii(*p) && isspace(*p))
-+			{
-+				SM_APPEND_CHAR(*p);
-+				p++;
-+			}
- 			copylev = 0;
- 			putgmac = quoteit = FALSE;
- 			bufhead = bp;
-@@ -1196,10 +1229,7 @@
- 		}
- 
- 		if (c == ';' && copylev <= 0 && !ColonOkInAddr)
--		{
--			if (bp < buflim)
--				*bp++ = c;
--		}
-+			SM_APPEND_CHAR(c);
- 
- 		/* check for characters that may have to be quoted */
- 		if (strchr(MustQuoteChars, c) != NULL)
-@@ -1227,42 +1257,45 @@
- 
- 			/* oops -- have to change our mind */
- 			anglelev = 1;
--			if (!skipping)
--				realanglelev = 1;
-+			if (SM_HAVE_ROOM)
-+			{
-+				if (!addangle)
-+					buflim--;
-+				addangle = TRUE;
-+			}
- 
- 			bp = bufhead;
- 			if (quoteit)
- 			{
--				*bp++ = '"';
-+				SM_APPEND_CHAR('"');
- 
- 				/* back up over the '<' and any spaces */
- 				--p;
--				while (isascii(*--p) && isspace(*p))
-+				while (p > addr &&
-+				       isascii(*--p) && isspace(*p))
- 					continue;
- 				p++;
- 			}
- 			for (q = addrhead; q < p; )
- 			{
- 				c = *q++;
--				if (bp < buflim)
-+				if (quoteit && c == '"')
- 				{
--					if (quoteit && c == '"')
--						*bp++ = '\\';
--					*bp++ = c;
-+					SM_APPEND_CHAR('\\');
-+					SM_APPEND_CHAR(c);
- 				}
-+				else
-+					SM_APPEND_CHAR(c);
- 			}
- 			if (quoteit)
- 			{
- 				if (bp == &buf[1])
- 					bp--;
- 				else
--					*bp++ = '"';
-+					SM_APPEND_CHAR('"');
- 				while ((c = *p++) != '<')
--				{
--					if (bp < buflim)
--						*bp++ = c;
--				}
--				*bp++ = c;
-+					SM_APPEND_CHAR(c);
-+				SM_APPEND_CHAR(c);
- 			}
- 			copylev = 0;
- 			putgmac = quoteit = FALSE;
-@@ -1274,13 +1307,14 @@
- 			if (anglelev > 0)
- 			{
- 				anglelev--;
--				if (!skipping)
-+				if (SM_HAVE_ROOM)
- 				{
--					realanglelev--;
--					buflim++;
-+					if (addangle)
-+						buflim++;
-+					addangle = FALSE;
- 				}
- 			}
--			else if (!skipping)
-+			else if (SM_HAVE_ROOM)
- 			{
- 				/* syntax error: unmatched > */
- 				if (copylev > 0)
-@@ -1289,7 +1323,7 @@
- 				continue;
- 			}
- 			if (copylev++ <= 0)
--				*bp++ = c;
-+				SM_APPEND_CHAR(c);
- 			continue;
- 		}
- 
-@@ -1297,30 +1331,42 @@
- 	putg:
- 		if (copylev <= 0 && !putgmac)
- 		{
--			if (bp > bufhead && bp[-1] == ')')
--				*bp++ = ' ';
--			*bp++ = MACROEXPAND;
--			*bp++ = 'g';
-+			if (bp > buf && bp[-1] == ')')
-+				SM_APPEND_CHAR(' ');
-+			SM_APPEND_CHAR(MACROEXPAND);
-+			SM_APPEND_CHAR('g');
- 			putgmac = TRUE;
- 		}
- 	}
- 
- 	/* repair any syntactic damage */
--	if (realqmode)
-+	if (realqmode && bp < bufend)
- 		*bp++ = '"';
--	while (realcmtlev-- > 0)
-+	while (realcmtlev-- > 0 && bp < bufend)
- 		*bp++ = ')';
--	while (realanglelev-- > 0)
-+	if (addangle && bp < bufend)
- 		*bp++ = '>';
--	*bp++ = '\0';
-+	*bp = '\0';
-+	if (bp < bufend)
-+		goto success;
-+
-+ returng:
-+	/* String too long, punt */
-+	buf[0] = '<';
-+	buf[1] = MACROEXPAND;
-+	buf[2]= 'g';
-+	buf[3] = '>';
-+	buf[4]= '\0';
-+	sm_syslog(LOG_ALERT, e->e_id,
-+		  "Dropped invalid comments from header address");
- 
-+ success:
- 	if (tTd(33, 1))
- 	{
- 		dprintf("crackaddr=>`");
- 		xputs(buf);
- 		dprintf("'\n");
- 	}
--
- 	return buf;
- }
- /*
-Index: main.c
-===================================================================
-RCS file: /cvs/sendmail/main.c,v
-retrieving revision 8.485.4.68
-retrieving revision 8.485.4.70
-diff -u -r8.485.4.68 -r8.485.4.70
---- sendmail/main.c	1 May 2002 00:08:37 -0000	8.485.4.68
-+++ sendmail/main.c	20 Jan 2003 18:30:42 -0000	8.485.4.70
-@@ -3535,7 +3535,7 @@
- 				printf("Usage: /parse address\n");
- 				return;
- 			}
--			q = crackaddr(p);
-+			q = crackaddr(p, e);
- 			printf("Cracked address = ");
- 			xputs(q);
- 			printf("\nParsing %s %s address\n",
-Index: parseaddr.c
-===================================================================
-RCS file: /cvs/sendmail/parseaddr.c,v
-retrieving revision 8.234.4.14
-retrieving revision 8.234.4.16
-diff -u -r8.234.4.14 -r8.234.4.16
---- sendmail/parseaddr.c	28 Mar 2002 16:30:06 -0000	8.234.4.14
-+++ sendmail/parseaddr.c	20 Jan 2003 18:30:43 -0000	8.234.4.16
-@@ -2297,7 +2297,7 @@
- 	if (bitset(RF_CANONICAL, flags) || bitnset(M_NOCOMMENT, m->m_flags))
- 		fancy = "\201g";
- 	else
--		fancy = crackaddr(name);
-+		fancy = crackaddr(name, e);
- 
- 	/*
- 	**  Turn the name into canonical form.
-Index: sendmail.h
-===================================================================
-RCS file: /cvs/sendmail/sendmail.h,v
-retrieving revision 8.517.4.72
-retrieving revision 8.517.4.74
-diff -u -r8.517.4.72 -r8.517.4.74
---- sendmail/sendmail.h	27 Mar 2002 23:34:14 -0000	8.517.4.72
-+++ sendmail/sendmail.h	20 Jan 2003 18:30:43 -0000	8.517.4.74
-@@ -333,7 +333,7 @@
- 
- /* functions */
- extern void	cataddr __P((char **, char **, char *, int, int));
--extern char	*crackaddr __P((char *));
-+extern char	*crackaddr __P((char *, ENVELOPE *));
- extern bool	emptyaddr __P((ADDRESS *));
- extern ADDRESS	*getctladdr __P((ADDRESS *));
- extern int	include __P((char *, bool, ADDRESS *, ADDRESS **, int, ENVELOPE *));
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index 543efedc6833..3dc2616e4959 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sendmail
-PORTVERSION=	8.11.6
-PORTREVISION=	4
+PORTVERSION=	8.11.7
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
diff --git a/mail/sendmail811/distinfo b/mail/sendmail811/distinfo
index 4cd8af6d7915..b09cad9feb25 100644
--- a/mail/sendmail811/distinfo
+++ b/mail/sendmail811/distinfo
@@ -1 +1 @@
-MD5 (sendmail.8.11.6.tar.gz) = a57e7681d810d9d6400cbe6bbcf06aa0
+MD5 (sendmail.8.11.7.tar.gz) = 96437c0ffdc23b02a5d3757017c295ec
diff --git a/mail/sendmail811/files/patch-prescan b/mail/sendmail811/files/patch-prescan
deleted file mode 100644
index 29fc1bacb6d8..000000000000
--- a/mail/sendmail811/files/patch-prescan
+++ /dev/null
@@ -1,125 +0,0 @@
-Index: conf.c
-===================================================================
-RCS file: /cvs/sendmail/conf.c,v
-retrieving revision 8.646.2.2.2.87
-retrieving revision 8.646.2.2.2.92
-diff -c -r8.646.2.2.2.87 -r8.646.2.2.2.92
-*** sendmail/conf.c	20 Jul 2001 23:56:52 -0000	8.646.2.2.2.87
---- sendmail/conf.c	28 Mar 2003 06:02:46 -0000	8.646.2.2.2.92
-***************
-*** 381,386 ****
---- 381,388 ----
-  	DontLockReadFiles = TRUE;
-  	DoubleBounceAddr = "postmaster";
-  	MaxHeadersLength = MAXHDRSLEN;
-+ 	MaxMimeHeaderLength = MAXLINE;
-+ 	MaxMimeFieldLength = MaxMimeHeaderLength / 2;
-  	MaxForwardEntries = 0;
-  #if SASL
-  	AuthMechanisms = newstr(AUTH_MECHANISMS);
-Index: parseaddr.c
-===================================================================
-RCS file: /cvs/sendmail/parseaddr.c,v
-retrieving revision 8.234.4.13
-retrieving revision 8.234.4.18
-diff -c -r8.234.4.13 -r8.234.4.18
-*** sendmail/parseaddr.c	14 Aug 2001 23:08:13 -0000	8.234.4.13
---- sendmail/parseaddr.c	27 Mar 2003 19:40:12 -0000	8.234.4.18
-***************
-*** 446,452 ****
-  };
-  
-  
-! #define NOCHAR		-1	/* signal nothing in lookahead token */
-  
-  char **
-  prescan(addr, delim, pvpbuf, pvpbsize, delimptr, toktab)
---- 446,452 ----
-  };
-  
-  
-! #define NOCHAR		(-1)	/* signal nothing in lookahead token */
-  
-  char **
-  prescan(addr, delim, pvpbuf, pvpbsize, delimptr, toktab)
-***************
-*** 532,537 ****
---- 532,538 ----
-  				/* 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';
-***************
-*** 543,553 ****
-  				}
-  
-  				/* squirrel it away */
-  				*q++ = c;
-  			}
-  
-  			/* read a new input character */
-! 			c = *p++;
-  			if (c == '\0')
-  			{
-  				/* diagnose and patch up bad syntax */
---- 544,558 ----
-  				}
-  
-  				/* 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++) & 0x00ff;
-  			if (c == '\0')
-  			{
-  				/* diagnose and patch up bad syntax */
-***************
-*** 602,607 ****
---- 607,615 ----
-  				}
-  				else if (c != '!' || state == QST)
-  				{
-+ 					/* see if there is room */
-+ 					if (q >= &pvpbuf[pvpbsize - 5])
-+ 						goto addrtoolong;
-  					*q++ = '\\';
-  					continue;
-  				}
-***************
-*** 686,691 ****
---- 694,702 ----
-  		/* new token */
-  		if (tok != q)
-  		{
-+ 			/* see if there is room */
-+ 			if (q >= &pvpbuf[pvpbsize - 5])
-+ 				goto addrtoolong;
-  			*q++ = '\0';
-  			if (tTd(22, 36))
-  			{
-Index: version.c
-===================================================================
-RCS file: /cvs/sendmail/version.c,v
-retrieving revision 8.43.4.39
-diff -c -r8.43.4.39 version.c
-*** sendmail/version.c	20 Aug 2001 14:45:34 -0000	8.43.4.39
---- sendmail/version.c	19 Mar 2003 21:29:32 -0000
-***************
-*** 15,18 ****
-  static char id[] = "@(#)$Id: version.c,v 8.43.4.39 2001/08/20 14:45:34 gshapiro Exp $";
-  #endif /* ! lint */
-  
-! char	Version[] = "8.11.6";
---- 15,18 ----
-  static char id[] = "@(#)$Id: version.c,v 8.43.4.39 2001/08/20 14:45:34 gshapiro Exp $";
-  #endif /* ! lint */
-  
-! char	Version[] = "8.11.6p2";
diff --git a/mail/sendmail811/files/patch-security b/mail/sendmail811/files/patch-security
deleted file mode 100644
index 18e802e58546..000000000000
--- a/mail/sendmail811/files/patch-security
+++ /dev/null
@@ -1,484 +0,0 @@
-Index: headers.c
-===================================================================
-RCS file: /cvs/sendmail/headers.c,v
-retrieving revision 8.203.4.13
-retrieving revision 8.203.4.15
-diff -u -r8.203.4.13 -r8.203.4.15
---- sendmail/headers.c	3 May 2001 17:24:06 -0000	8.203.4.13
-+++ sendmail/headers.c	20 Jan 2003 18:30:42 -0000	8.203.4.15
-@@ -648,7 +648,8 @@
- 			if (buf[0] != '\0')
- 			{
- 				if (bitset(H_FROM, h->h_flags))
--					expand(crackaddr(buf), buf, sizeof buf, e);
-+					expand(crackaddr(buf, e),
-+					       buf, sizeof buf, e);
- 				h->h_value = newstr(buf);
- 				h->h_flags &= ~H_DEFAULT;
- 			}
-@@ -971,7 +972,11 @@
- **	it and replaces it with "$g".  The parse is totally ad hoc
- **	and isn't even guaranteed to leave something syntactically
- **	identical to what it started with.  However, it does leave
--**	something semantically identical.
-+**	something semantically identical if possible, else at least
-+**	syntactically correct.
-+**
-+**	For example, it changes "Real Name <real@example.com> (Comment)"
-+**	to "Real Name <$g> (Comment)".
- **
- **	This algorithm has been cleaned up to handle a wider range
- **	of cases -- notably quoted and backslash escaped strings.
-@@ -980,6 +985,7 @@
- **
- **	Parameters:
- **		addr -- the address to be cracked.
-+**		e -- the current envelope.
- **
- **	Returns:
- **		a pointer to the new version.
-@@ -992,28 +998,50 @@
- **		be copied if it is to be reused.
- */
- 
-+#define SM_HAVE_ROOM		((bp < buflim) && (buflim <= bufend))
-+
-+/*
-+**  Append a character to bp if we have room.
-+**  If not, punt and return $g.
-+*/
-+
-+#define SM_APPEND_CHAR(c)					\
-+	do							\
-+	{							\
-+		if (SM_HAVE_ROOM)				\
-+			*bp++ = (c);				\
-+		else						\
-+			goto returng;				\
-+	} while (0)
-+
-+#if MAXNAME < 10
-+ERROR MAXNAME must be at least 10
-+#endif /* MAXNAME < 10 */
-+
- char *
--crackaddr(addr)
-+crackaddr(addr, e)
- 	register char *addr;
-+	ENVELOPE *e;
- {
- 	register char *p;
- 	register char c;
--	int cmtlev;
--	int realcmtlev;
--	int anglelev, realanglelev;
--	int copylev;
--	int bracklev;
--	bool qmode;
--	bool realqmode;
--	bool skipping;
--	bool putgmac = FALSE;
--	bool quoteit = FALSE;
--	bool gotangle = FALSE;
--	bool gotcolon = FALSE;
-+	int cmtlev;			/* comment level in input string */
-+	int realcmtlev;			/* comment level in output string */
-+	int anglelev;			/* angle level in input string */
-+	int copylev;			/* 0 == in address, >0 copying */
-+	int bracklev;			/* bracket level for IPv6 addr check */
-+	bool addangle;			/* put closing angle in output */
-+	bool qmode;			/* quoting in original string? */
-+	bool realqmode;			/* quoting in output string? */
-+	bool putgmac = FALSE;		/* already wrote $g */
-+	bool quoteit = FALSE;		/* need to quote next character */
-+	bool gotangle = FALSE;		/* found first '<' */
-+	bool gotcolon = FALSE;		/* found a ':' */
- 	register char *bp;
- 	char *buflim;
- 	char *bufhead;
- 	char *addrhead;
-+	char *bufend;
- 	static char buf[MAXNAME + 1];
- 
- 	if (tTd(33, 1))
-@@ -1028,25 +1056,22 @@
- 	**  adjusted later if we find them.
- 	*/
- 
-+	buflim = bufend = &buf[sizeof(buf) - 1];
- 	bp = bufhead = buf;
--	buflim = &buf[sizeof buf - 7];
- 	p = addrhead = addr;
--	copylev = anglelev = realanglelev = cmtlev = realcmtlev = 0;
-+	copylev = anglelev = cmtlev = realcmtlev = 0;
- 	bracklev = 0;
--	qmode = realqmode = FALSE;
-+	qmode = realqmode = addangle = FALSE;
- 
- 	while ((c = *p++) != '\0')
- 	{
- 		/*
--		**  If the buffer is overful, go into a special "skipping"
--		**  mode that tries to keep legal syntax but doesn't actually
--		**  output things.
-+		**  Try to keep legal syntax using spare buffer space
-+		**  (maintained by buflim).
- 		*/
- 
--		skipping = bp >= buflim;
--
--		if (copylev > 0 && !skipping)
--			*bp++ = c;
-+		if (copylev > 0)
-+			SM_APPEND_CHAR(c);
- 
- 		/* check for backslash escapes */
- 		if (c == '\\')
-@@ -1061,8 +1086,8 @@
- 				p--;
- 				goto putg;
- 			}
--			if (copylev > 0 && !skipping)
--				*bp++ = c;
-+			if (copylev > 0)
-+				SM_APPEND_CHAR(c);
- 			goto putg;
- 		}
- 
-@@ -1070,8 +1095,14 @@
- 		if (c == '"' && cmtlev <= 0)
- 		{
- 			qmode = !qmode;
--			if (copylev > 0 && !skipping)
-+			if (copylev > 0 && SM_HAVE_ROOM)
-+			{
-+				if (realqmode)
-+					buflim--;
-+				else
-+					buflim++;
- 				realqmode = !realqmode;
-+			}
- 			continue;
- 		}
- 		if (qmode)
-@@ -1083,15 +1114,15 @@
- 			cmtlev++;
- 
- 			/* allow space for closing paren */
--			if (!skipping)
-+			if (SM_HAVE_ROOM)
- 			{
- 				buflim--;
- 				realcmtlev++;
- 				if (copylev++ <= 0)
- 				{
- 					if (bp != bufhead)
--						*bp++ = ' ';
--					*bp++ = c;
-+						SM_APPEND_CHAR(' ');
-+					SM_APPEND_CHAR(c);
- 				}
- 			}
- 		}
-@@ -1101,7 +1132,7 @@
- 			{
- 				cmtlev--;
- 				copylev--;
--				if (!skipping)
-+				if (SM_HAVE_ROOM)
- 				{
- 					realcmtlev--;
- 					buflim++;
-@@ -1112,7 +1143,7 @@
- 		else if (c == ')')
- 		{
- 			/* syntax error: unmatched ) */
--			if (copylev > 0 && !skipping)
-+			if (copylev > 0 && SM_HAVE_ROOM)
- 				bp--;
- 		}
- 
-@@ -1130,7 +1161,7 @@
- 
- 			/*
- 			**  Check for DECnet phase IV ``::'' (host::user)
--			**  or **  DECnet phase V ``:.'' syntaxes.  The latter
-+			**  or DECnet phase V ``:.'' syntaxes.  The latter
- 			**  covers ``user@DEC:.tay.myhost'' and
- 			**  ``DEC:.tay.myhost::user'' syntaxes (bletch).
- 			*/
-@@ -1139,10 +1170,10 @@
- 			{
- 				if (cmtlev <= 0 && !qmode)
- 					quoteit = TRUE;
--				if (copylev > 0 && !skipping)
-+				if (copylev > 0)
- 				{
--					*bp++ = c;
--					*bp++ = *p;
-+					SM_APPEND_CHAR(c);
-+					SM_APPEND_CHAR(*p);
- 				}
- 				p++;
- 				goto putg;
-@@ -1153,41 +1184,43 @@
- 			bp = bufhead;
- 			if (quoteit)
- 			{
--				*bp++ = '"';
-+				SM_APPEND_CHAR('"');
- 
- 				/* back up over the ':' and any spaces */
- 				--p;
--				while (isascii(*--p) && isspace(*p))
-+				while (p > addr &&
-+				       isascii(*--p) && isspace(*p))
- 					continue;
- 				p++;
- 			}
- 			for (q = addrhead; q < p; )
- 			{
- 				c = *q++;
--				if (bp < buflim)
-+				if (quoteit && c == '"')
- 				{
--					if (quoteit && c == '"')
--						*bp++ = '\\';
--					*bp++ = c;
-+					SM_APPEND_CHAR('\\');
-+					SM_APPEND_CHAR(c);
- 				}
-+				else
-+					SM_APPEND_CHAR(c);
- 			}
- 			if (quoteit)
- 			{
- 				if (bp == &bufhead[1])
- 					bp--;
- 				else
--					*bp++ = '"';
-+					SM_APPEND_CHAR('"');
- 				while ((c = *p++) != ':')
--				{
--					if (bp < buflim)
--						*bp++ = c;
--				}
--				*bp++ = c;
-+					SM_APPEND_CHAR(c);
-+				SM_APPEND_CHAR(c);
- 			}
- 
- 			/* any trailing white space is part of group: */
--			while (isascii(*p) && isspace(*p) && bp < buflim)
--				*bp++ = *p++;
-+			while (isascii(*p) && isspace(*p))
-+			{
-+				SM_APPEND_CHAR(*p);
-+				p++;
-+			}
- 			copylev = 0;
- 			putgmac = quoteit = FALSE;
- 			bufhead = bp;
-@@ -1196,10 +1229,7 @@
- 		}
- 
- 		if (c == ';' && copylev <= 0 && !ColonOkInAddr)
--		{
--			if (bp < buflim)
--				*bp++ = c;
--		}
-+			SM_APPEND_CHAR(c);
- 
- 		/* check for characters that may have to be quoted */
- 		if (strchr(MustQuoteChars, c) != NULL)
-@@ -1227,42 +1257,45 @@
- 
- 			/* oops -- have to change our mind */
- 			anglelev = 1;
--			if (!skipping)
--				realanglelev = 1;
-+			if (SM_HAVE_ROOM)
-+			{
-+				if (!addangle)
-+					buflim--;
-+				addangle = TRUE;
-+			}
- 
- 			bp = bufhead;
- 			if (quoteit)
- 			{
--				*bp++ = '"';
-+				SM_APPEND_CHAR('"');
- 
- 				/* back up over the '<' and any spaces */
- 				--p;
--				while (isascii(*--p) && isspace(*p))
-+				while (p > addr &&
-+				       isascii(*--p) && isspace(*p))
- 					continue;
- 				p++;
- 			}
- 			for (q = addrhead; q < p; )
- 			{
- 				c = *q++;
--				if (bp < buflim)
-+				if (quoteit && c == '"')
- 				{
--					if (quoteit && c == '"')
--						*bp++ = '\\';
--					*bp++ = c;
-+					SM_APPEND_CHAR('\\');
-+					SM_APPEND_CHAR(c);
- 				}
-+				else
-+					SM_APPEND_CHAR(c);
- 			}
- 			if (quoteit)
- 			{
- 				if (bp == &buf[1])
- 					bp--;
- 				else
--					*bp++ = '"';
-+					SM_APPEND_CHAR('"');
- 				while ((c = *p++) != '<')
--				{
--					if (bp < buflim)
--						*bp++ = c;
--				}
--				*bp++ = c;
-+					SM_APPEND_CHAR(c);
-+				SM_APPEND_CHAR(c);
- 			}
- 			copylev = 0;
- 			putgmac = quoteit = FALSE;
-@@ -1274,13 +1307,14 @@
- 			if (anglelev > 0)
- 			{
- 				anglelev--;
--				if (!skipping)
-+				if (SM_HAVE_ROOM)
- 				{
--					realanglelev--;
--					buflim++;
-+					if (addangle)
-+						buflim++;
-+					addangle = FALSE;
- 				}
- 			}
--			else if (!skipping)
-+			else if (SM_HAVE_ROOM)
- 			{
- 				/* syntax error: unmatched > */
- 				if (copylev > 0)
-@@ -1289,7 +1323,7 @@
- 				continue;
- 			}
- 			if (copylev++ <= 0)
--				*bp++ = c;
-+				SM_APPEND_CHAR(c);
- 			continue;
- 		}
- 
-@@ -1297,30 +1331,42 @@
- 	putg:
- 		if (copylev <= 0 && !putgmac)
- 		{
--			if (bp > bufhead && bp[-1] == ')')
--				*bp++ = ' ';
--			*bp++ = MACROEXPAND;
--			*bp++ = 'g';
-+			if (bp > buf && bp[-1] == ')')
-+				SM_APPEND_CHAR(' ');
-+			SM_APPEND_CHAR(MACROEXPAND);
-+			SM_APPEND_CHAR('g');
- 			putgmac = TRUE;
- 		}
- 	}
- 
- 	/* repair any syntactic damage */
--	if (realqmode)
-+	if (realqmode && bp < bufend)
- 		*bp++ = '"';
--	while (realcmtlev-- > 0)
-+	while (realcmtlev-- > 0 && bp < bufend)
- 		*bp++ = ')';
--	while (realanglelev-- > 0)
-+	if (addangle && bp < bufend)
- 		*bp++ = '>';
--	*bp++ = '\0';
-+	*bp = '\0';
-+	if (bp < bufend)
-+		goto success;
-+
-+ returng:
-+	/* String too long, punt */
-+	buf[0] = '<';
-+	buf[1] = MACROEXPAND;
-+	buf[2]= 'g';
-+	buf[3] = '>';
-+	buf[4]= '\0';
-+	sm_syslog(LOG_ALERT, e->e_id,
-+		  "Dropped invalid comments from header address");
- 
-+ success:
- 	if (tTd(33, 1))
- 	{
- 		dprintf("crackaddr=>`");
- 		xputs(buf);
- 		dprintf("'\n");
- 	}
--
- 	return buf;
- }
- /*
-Index: main.c
-===================================================================
-RCS file: /cvs/sendmail/main.c,v
-retrieving revision 8.485.4.68
-retrieving revision 8.485.4.70
-diff -u -r8.485.4.68 -r8.485.4.70
---- sendmail/main.c	1 May 2002 00:08:37 -0000	8.485.4.68
-+++ sendmail/main.c	20 Jan 2003 18:30:42 -0000	8.485.4.70
-@@ -3535,7 +3535,7 @@
- 				printf("Usage: /parse address\n");
- 				return;
- 			}
--			q = crackaddr(p);
-+			q = crackaddr(p, e);
- 			printf("Cracked address = ");
- 			xputs(q);
- 			printf("\nParsing %s %s address\n",
-Index: parseaddr.c
-===================================================================
-RCS file: /cvs/sendmail/parseaddr.c,v
-retrieving revision 8.234.4.14
-retrieving revision 8.234.4.16
-diff -u -r8.234.4.14 -r8.234.4.16
---- sendmail/parseaddr.c	28 Mar 2002 16:30:06 -0000	8.234.4.14
-+++ sendmail/parseaddr.c	20 Jan 2003 18:30:43 -0000	8.234.4.16
-@@ -2297,7 +2297,7 @@
- 	if (bitset(RF_CANONICAL, flags) || bitnset(M_NOCOMMENT, m->m_flags))
- 		fancy = "\201g";
- 	else
--		fancy = crackaddr(name);
-+		fancy = crackaddr(name, e);
- 
- 	/*
- 	**  Turn the name into canonical form.
-Index: sendmail.h
-===================================================================
-RCS file: /cvs/sendmail/sendmail.h,v
-retrieving revision 8.517.4.72
-retrieving revision 8.517.4.74
-diff -u -r8.517.4.72 -r8.517.4.74
---- sendmail/sendmail.h	27 Mar 2002 23:34:14 -0000	8.517.4.72
-+++ sendmail/sendmail.h	20 Jan 2003 18:30:43 -0000	8.517.4.74
-@@ -333,7 +333,7 @@
- 
- /* functions */
- extern void	cataddr __P((char **, char **, char *, int, int));
--extern char	*crackaddr __P((char *));
-+extern char	*crackaddr __P((char *, ENVELOPE *));
- extern bool	emptyaddr __P((ADDRESS *));
- extern ADDRESS	*getctladdr __P((ADDRESS *));
- extern int	include __P((char *, bool, ADDRESS *, ADDRESS **, int, ENVELOPE *));