- update to 8.13.4

3 files changed, 3 insertions, 113 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 8fb18d5124a9..bcbd41954205 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sendmail
-PORTVERSION=	8.13.3
-PORTREVISION=	1
+PORTVERSION=	8.13.4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 1637615c8f52..8191e4f30c92 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,2 +1,2 @@
-MD5 (sendmail.8.13.3.tar.gz) = 2809fbf9c8b067947b650d0128928d05
-SIZE (sendmail.8.13.3.tar.gz) = 1969226
+MD5 (sendmail.8.13.4.tar.gz) = 61e336750b48b01abaa69b4d7c9473b5
+SIZE (sendmail.8.13.4.tar.gz) = 1974606
diff --git a/mail/sendmail/files/patch-close_wait b/mail/sendmail/files/patch-close_wait
deleted file mode 100644
index d74c648328f3..000000000000
--- a/mail/sendmail/files/patch-close_wait
+++ /dev/null
@@ -1,109 +0,0 @@
---- sendmail/mci.c.orig	Wed Aug  4 14:11:31 2004
-+++ sendmail/mci.c	Mon Jan 17 10:29:28 2005
-@@ -398,6 +398,57 @@
- 
- 	return mci;
- }
-+
-+/*
-+**  MCI_CLOSE -- (forcefully) close files used for a connection.
-+**	Note: this is a last resort, usually smtpquit() or endmailer()
-+**		should be used to close a connection.
-+**
-+**	Parameters:
-+**		mci -- the connection to close.
-+**		where -- where has this been called?
-+**
-+**	Returns:
-+**		none.
-+*/
-+
-+void
-+mci_close(mci, where)
-+	MCI *mci;
-+	char *where;
-+{
-+	bool dumped;
-+
-+	if (mci == NULL)
-+		return;
-+	dumped = false;
-+	if (mci->mci_out != NULL)
-+	{
-+		if (tTd(56, 1))
-+		{
-+			sm_dprintf("mci_close: mci_out!=NULL, where=%s\n",
-+				where);
-+			mci_dump(sm_debug_file(), mci, false);
-+			dumped = true;
-+		}
-+		(void) sm_io_close(mci->mci_out, SM_TIME_DEFAULT);
-+		mci->mci_out = NULL;
-+	}
-+	if (mci->mci_in != NULL)
-+	{
-+		if (tTd(56, 1))
-+		{
-+			sm_dprintf("mci_close: mci_in!=NULL, where=%s\n",
-+				where);
-+			if (!dumped)
-+				mci_dump(sm_debug_file(), mci, false);
-+		}
-+		(void) sm_io_close(mci->mci_in, SM_TIME_DEFAULT);
-+		mci->mci_in = NULL;
-+	}
-+	mci->mci_state = MCIS_CLOSED;
-+}
-+
- /*
- **  MCI_NEW -- allocate new MCI structure
- **
---- sendmail/sendmail.h.orig	Tue Nov  9 11:45:46 2004
-+++ sendmail/sendmail.h	Mon Jan 17 09:39:56 2005
-@@ -728,6 +728,7 @@
- 
- /* functions */
- extern void	mci_cache __P((MCI *));
-+extern void	mci_close __P((MCI *, char *where));
- extern void	mci_dump __P((SM_FILE_T *, MCI *, bool));
- extern void	mci_dump_all __P((SM_FILE_T *, bool));
- extern void	mci_flush __P((bool, MCI *));
---- sendmail/usersmtp.c.orig	Fri Jan 14 07:34:00 2005
-+++ sendmail/usersmtp.c	Mon Jan 17 09:40:57 2005
-@@ -89,6 +89,7 @@
- 	*/
- 
- 	SmtpError[0] = '\0';
-+	SmtpMsgBuffer[0] = '\0';
- 	CurHostName = mci->mci_host;		/* XXX UGLY XXX */
- 	if (CurHostName == NULL)
- 		CurHostName = MyHostName;
-@@ -2899,7 +2900,10 @@
- 	char *oldcurhost;
- 
- 	if (mci->mci_state == MCIS_CLOSED)
-+	{
-+		mci_close(mci, "smtpquit:1");
- 		return;
-+	}
- 
- 	oldcurhost = CurHostName;
- 	CurHostName = mci->mci_host;		/* XXX UGLY XXX */
-@@ -3133,7 +3137,7 @@
- 			if (strncmp(SmtpMsgBuffer, "QUIT", 4) == 0)
- 			{
- 				errno = mci->mci_errno;
--				mci->mci_state = MCIS_CLOSED;
-+				mci_close(mci, "reply:1");
- 				return -1;
- 			}
- 			mci->mci_state = MCIS_ERROR;
-@@ -3158,7 +3162,7 @@
- 			/* errors on QUIT should be ignored */
- 			if (strncmp(SmtpMsgBuffer, "QUIT", 4) == 0)
- 			{
--				mci->mci_state = MCIS_CLOSED;
-+				mci_close(mci, "reply:2");
- 				return -1;
- 			}
-