Imported Debian patch 8.13.4-1debian/8.13.4-1

14 files changed, 53 insertions, 164 deletions

diff --git a/debian/changelog b/debian/changelog
index b4fcc68..fe95af9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+sendmail (8.13.4-1) unstable; urgency=low
+  * New upstream release
+  * Refit patches
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 28 Mar 2005 01:50:00 -0000
+
+sendmail (8.13.4-0) private; urgency=low
+  * New upstream release
+  * Refit patches
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 28 Mar 2005 01:50:00 -0000
+
+sendmail (8.13.3+8.13.4.Beta0-0) private; urgency=low
+  * New upstream alpha
+  * Refit patches
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Wed, 23 Mar 2005 16:37:00 -0000
+
+sendmail (8.13.3+8.13.4.Alpha2-0) private; urgency=low
+  * New upstream alpha
+  * Refit patches
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Thu, 17 Mar 2005 17:38:00 -0000
+
+sendmail (8.13.3+8.13.4.Alpha1-0) private; urgency=low
+  * New upstream alpha
+  * Refit patches
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Thu, 10 Mar 2005 17:50:00 -0000
+
+sendmail (8.13.3+8.13.4.Alpha0-0) private; urgency=low
+  * New upstream alpha
+  * Refit patches
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Wed, 16 Feb 2005 05:30:00 -0000
+
 sendmail (8.13.3-9) unstable; urgency=high
   * No longer set define(`confCON_EXPENSIVE',`True')dnl
     as this can slow delivery for most people needlessly
diff --git a/debian/patches/8.13/8.13.3/close_wait.p2 b/debian/patches/8.13/8.13.3/close_wait.p2
deleted file mode 100644
index 247fada..0000000
--- a/debian/patches/8.13/8.13.3/close_wait.p2
+++ /dev/null
@@ -1,109 +0,0 @@
---- mci.c.orig	Wed Aug  4 14:11:31 2004
-+++ ./sendmail-8.13.3/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.h.orig	Tue Nov  9 11:45:46 2004
-+++ ./sendmail-8.13.3/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 *));
---- usersmtp.c.orig	Fri Jan 14 07:34:00 2005
-+++ ./sendmail-8.13.3/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;
- 			}
- 
diff --git a/debian/patches/8.13/8.13.3/cpu_hog.patch b/debian/patches/8.13/8.13.3/cpu_hog.patch
deleted file mode 100644
index bcde4c2..0000000
--- a/debian/patches/8.13/8.13.3/cpu_hog.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# This is a patch for deliver.c to update it to deliver.8.13.4
-# 
-# To apply this patch:
-# STEP 1: Chdir to the source directory.
-# STEP 2: Run the 'applypatch' program with this patch file as input.
-#
-# If you do not have 'applypatch', it is part of the 'makepatch' package
-# that you can fetch from the Comprehensive Perl Archive Network:
-# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
-# In the above URL, 'x' should be 2 or higher.
-#
-# To apply this patch without the use of 'applypatch':
-# STEP 1: Chdir to the source directory.
-# STEP 2: Run the 'patch' program with this file as input.
-#
-#### End of Preamble ####
-
-#### Patch data follows ####
-diff -c 'deliver.orig' 'deliver.c'
-Index: ./deliver.orig
-Prereq:  8.983
-*** ./sendmail-8.13.3/sendmail/deliver.c	Mon Mar 14 20:50:56 2005
---- ./deliver.8.13.4	Mon Mar 14 20:51:12 2005
-***************
-*** 5684,5689 ****
---- 5684,5693 ----
-  	    !(m->m_argv[0] != NULL && strcmp(m->m_argv[0], "TCP") == 0))
-  		return "localhost";
-  
-+ 	/* an empty host does not have MX records */
-+ 	if (*host == '\0')
-+ 		return "_empty_";
-+ 
-  	/*
-  	**  Check to see if this uses IPC -- if not, it can't have MX records.
-  	*/
-#### End of Patch data ####
-
diff --git a/debian/patches/8.13/8.13.3/client_helo.patch b/debian/patches/8.13/8.13.4/client_helo.patch
index 5ee742a..7a12845 100644
--- a/debian/patches/8.13/8.13.3/client_helo.patch
+++ b/debian/patches/8.13/8.13.4/client_helo.patch
@@ -68,8 +68,8 @@
 #------------------------------------------------------------------------------
 diff -c 'deliver.orig' 'deliver.c'
 Index: ./deliver.orig
-Prereq:  8.983
-*** ./sendmail-8.13.3/sendmail/deliver.c	Tue Aug 10 17:50:11 2004
+Prereq:  8.986
+*** ./sendmail-8.13.4/sendmail/deliver.c	Tue Aug 10 17:50:11 2004
 --- ./deliver.c	Tue Aug 10 17:44:04 2004
 ***************
 *** 1363,1368 ****
@@ -83,8 +83,8 @@ Prereq:  8.983
   	SM_TRY
 diff -c 'srvrsmtp.orig' 'srvrsmtp.c'
 Index: ./srvrsmtp.orig
-Prereq:  8.902
-*** ./sendmail-8.13.3/sendmail/srvrsmtp.c	Tue Aug 10 17:50:23 2004
+Prereq:  8.906
+*** ./sendmail-8.13.4/sendmail/srvrsmtp.c	Tue Aug 10 17:50:23 2004
 --- ./srvrsmtp.c	Tue Aug 10 17:42:54 2004
 ***************
 *** 444,449 ****
diff --git a/debian/patches/8.13/8.13.3/cyrusv2.m4.debian-patch b/debian/patches/8.13/8.13.4/cyrusv2.m4.debian-patch
index 5e2c8c3..3cb478c 100644
--- a/debian/patches/8.13/8.13.3/cyrusv2.m4.debian-patch
+++ b/debian/patches/8.13/8.13.4/cyrusv2.m4.debian-patch
@@ -1,4 +1,4 @@
---- sendmail-8.13.3/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
+--- sendmail-8.13.4/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
 +++ cyrusv2.m4.new	Wed Jun  5 04:21:34 2002
 @@ -12,7 +12,7 @@
  
diff --git a/debian/patches/8.13/8.13.3/dpatch.001 b/debian/patches/8.13/8.13.4/dpatch.001
index fe7dcf9..6573d7c 100644
--- a/debian/patches/8.13/8.13.3/dpatch.001
+++ b/debian/patches/8.13/8.13.4/dpatch.001
@@ -19,7 +19,7 @@
 diff -c 'cf/feature/local_procmail.m4' 'debian/patches/local_procmail.m4'
 Index: ./cf/feature/local_procmail.m4
 Prereq:  8.22
-*** sendmail-8.13.3/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
+*** sendmail-8.13.4/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
 --- ./debian/patches/local_procmail.m4	Sat Nov 20 15:39:46 1999
 ***************
 *** 27,32 ****
diff --git a/debian/patches/8.13/8.13.3/dpatch.002 b/debian/patches/8.13/8.13.4/dpatch.002
index 8337978..f269f60 100644
--- a/debian/patches/8.13/8.13.3/dpatch.002
+++ b/debian/patches/8.13/8.13.4/dpatch.002
@@ -1,4 +1,4 @@
---- sendmail-8.13.3/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
+--- sendmail-8.13.4/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
 +++ ./debian/patches/cf/mailer/cyrus.m4	Tue May  2 14:41:21 2000
 @@ -36,12 +36,12 @@
  # 
diff --git a/debian/patches/8.13/8.13.3/dpatch.003 b/debian/patches/8.13/8.13.4/dpatch.003
index 3ebe7f5..1710ca8 100644
--- a/debian/patches/8.13/8.13.3/dpatch.003
+++ b/debian/patches/8.13/8.13.4/dpatch.003
@@ -19,7 +19,7 @@
 diff -c 'rmail/rmail.c' 'debian/patches/rmail.c'
 Index: ./rmail/rmail.c
 Prereq:  8.61
-*** sendmail-8.13.3/rmail/rmail.c	Sat Sep 16 18:20:25 2000
+*** sendmail-8.13.4/rmail/rmail.c	Sat Sep 16 18:20:25 2000
 --- ./debian/patches/rmail.c	Thu Sep 28 17:00:59 2000
 ***************
 *** 318,324 ****
diff --git a/debian/patches/8.13/8.13.3/dpatch.004 b/debian/patches/8.13/8.13.4/dpatch.004
index dff0134..cb824fc 100644
--- a/debian/patches/8.13/8.13.3/dpatch.004
+++ b/debian/patches/8.13/8.13.4/dpatch.004
@@ -19,7 +19,7 @@
 diff -c 'sendmail/control.c' 'debian/patches/control.c'
 Index: ./sendmail/control.c
 Prereq:  8.126
-*** sendmail-8.13.3/sendmail/control.c	Sat Nov 20 15:26:23 1999
+*** sendmail-8.13.4/sendmail/control.c	Sat Nov 20 15:26:23 1999
 --- ./debian/patches/control.c	Sat Nov 20 15:39:52 1999
 ***************
 *** 92,98 ****
diff --git a/debian/patches/8.13/8.13.3/dpatch.005 b/debian/patches/8.13/8.13.4/dpatch.005
index bdb930e..3015deb 100644
--- a/debian/patches/8.13/8.13.3/dpatch.005
+++ b/debian/patches/8.13/8.13.4/dpatch.005
@@ -19,7 +19,7 @@
 diff -c './cf/mailer/fax.m4' 'fax.m4'
 Index: ./cf/mailer/fax.m4
 Prereq:  8.16
-*** sendmail-8.13.3/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
+*** sendmail-8.13.4/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
 --- ./fax.m4	Wed Jan  3 14:26:13 2001
 ***************
 *** 19,26 ****
diff --git a/debian/patches/8.13/8.13.3/drac.patch b/debian/patches/8.13/8.13.4/drac.patch
index 4675b97..fa5706f 100644
--- a/debian/patches/8.13/8.13.3/drac.patch
+++ b/debian/patches/8.13/8.13.4/drac.patch
@@ -1,5 +1,5 @@
---- sendmail-8.13.3/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
-+++ sendmail-8.13.3/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
+--- sendmail-8.13.4/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
++++ sendmail-8.13.4/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
 @@ -2110,6 +2110,13 @@
  R127.0.0.1		$@ RELAY		originated locally
  RIPv6:::1		$@ RELAY		originated locally
@@ -15,7 +15,7 @@
  R$*			$: $>A <$1> <?> <+ Connect> <$1>
  R<RELAY> $* 		$@ RELAY		relayable IP address
 --- /dev/null   2002-01-01 00:00:00.000000000 +0900
-+++ sendmail-8.13.3/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
++++ sendmail-8.13.4/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
 @@ -0,0 +1,5 @@
 +define(`_DRAC_', `')
 +
diff --git a/debian/patches/8.13/8.13.3/ldap_url_search.p0 b/debian/patches/8.13/8.13.4/ldap_url_search.p0
index 9b8d70b..4f36eb2 100644
--- a/debian/patches/8.13/8.13.3/ldap_url_search.p0
+++ b/debian/patches/8.13/8.13.4/ldap_url_search.p0
@@ -4,7 +4,7 @@ RCS file: /cvs/libsm/ldap.c,v
 retrieving revision 1.51
 retrieving revision 1.53
 diff -u -r1.51 -r1.53
---- ./sendmail-8.13.3/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
+--- ./sendmail-8.13.4/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
 +++ ldap.c	30 Oct 2003 23:33:10 -0000	1.53
 @@ -1043,6 +1043,7 @@
  						   NULL : lmap->ldap_attr),
diff --git a/debian/patches/8.13/8.13.3/maxseq.patch b/debian/patches/8.13/8.13.4/maxseq.patch
index c5fe6c8..6cca01f 100644
--- a/debian/patches/8.13/8.13.3/maxseq.patch
+++ b/debian/patches/8.13/8.13.4/maxseq.patch
@@ -19,7 +19,7 @@
 diff -c 'conf.h' 'conf.h.new'
 Index: ./conf.h
 Prereq:  8.567
-*** ./sendmail-8.13.3/sendmail/conf.h	Fri Sep 21 19:01:46 2001
+*** ./sendmail-8.13.4/sendmail/conf.h	Fri Sep 21 19:01:46 2001
 --- ./conf.h.new	Wed Oct 10 09:24:41 2001
 ***************
 *** 71,76 ****
diff --git a/debian/patches/8.13/8.13.3/qtool.patch b/debian/patches/8.13/8.13.4/qtool.patch
index 5474c63..b3752b0 100644
--- a/debian/patches/8.13/8.13.3/qtool.patch
+++ b/debian/patches/8.13/8.13.4/qtool.patch
@@ -1,5 +1,5 @@
-*** ./sendmail-8.13.3/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
---- ./sendmail-8.13.3/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
+*** ./sendmail-8.13.4/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
+--- ./sendmail-8.13.4/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
 ***************
 *** 355,373 ****
   sub lock_file