Imported Debian patch 8.13.3-9debian/8.13.3-9

7 files changed, 56 insertions, 5 deletions

diff --git a/debian/cf/debian/sendmail.mc.in b/debian/cf/debian/sendmail.mc.in
index 0e48387..90da565 100644
--- a/debian/cf/debian/sendmail.mc.in
+++ b/debian/cf/debian/sendmail.mc.in
@@ -84,6 +84,10 @@ dnl # Stop connections that overflow our concurrent and time connection rates
 FEATURE(`conncontrol', `nodelay', `terminate')dnl
 FEATURE(`ratecontrol', `nodelay', `terminate')dnl
 dnl #
+dnl # If you're on a dialup link, you should enable this - so sendmail
+dnl # will not bring up the link (it will queue mail for later)
+dnl define(`confCON_EXPENSIVE',`True')dnl
+dnl #
 dnl # Default Mailer setup
 MAILER_DEFINITIONS
 MAILER(`local')dnl
diff --git a/debian/cf/domain/debian-msp.m4.in b/debian/cf/domain/debian-msp.m4.in
index 16bdf30..c237c29 100644
--- a/debian/cf/domain/debian-msp.m4.in
+++ b/debian/cf/domain/debian-msp.m4.in
@@ -41,7 +41,6 @@ define(`confCONTROL_SOCKET_NAME',
 dnl #
 dnl # flags
 define(`confPROCESS_TITLE_PREFIX',	`MSP')dnl
-define(`confCON_EXPENSIVE',			`True')dnl
 define(`confNO_RCPT_ACTION',		`add-to-undisclosed')dnl
 define(`confRRT_IMPLIES_DSN',		`True')dnl
 define(`confSAFE_FILE_ENV',			`/')dnl
diff --git a/debian/cf/domain/debian-mta.m4.in b/debian/cf/domain/debian-mta.m4.in
index 5169ef2..06700de 100644
--- a/debian/cf/domain/debian-mta.m4.in
+++ b/debian/cf/domain/debian-mta.m4.in
@@ -38,7 +38,6 @@ define(`confCONTROL_SOCKET_NAME',
 dnl #
 dnl # flags
 define(`confPROCESS_TITLE_PREFIX',	`MTA')dnl
-define(`confCON_EXPENSIVE',			`True')dnl
 define(`confMAX_DAEMON_CHILDREN',	`0')dnl
 define(`confNO_RCPT_ACTION',		`add-to-undisclosed')dnl
 define(`confRRT_IMPLIES_DSN',		`True')dnl
diff --git a/debian/changelog b/debian/changelog
index 1f11598..b4fcc68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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
+    only dialups should be setting that flag
+  * update_mk now respects HANDS_OFF                     closes: #299071
+    and doesn't delete the makefile improperly
+    thanks to Thomas Aeby for the guidance
+  * Pull patch from upstream alpha to fix high CPU usage closes: #263445
+    Thanks to Martin Lathoud and Gael Roualland
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 08 Mar 2005 01:50:00 -0000
+
 sendmail (8.13.3-8) unstable; urgency=high
   * Correct two migration issues noted during the exploration of #297621
     thanks to Jeremy Brown
diff --git a/debian/local/Parse_conf.pm.in b/debian/local/Parse_conf.pm.in
index ec1da84..caf801e 100644
--- a/debian/local/Parse_conf.pm.in
+++ b/debian/local/Parse_conf.pm.in
@@ -148,7 +148,8 @@ my %parm_hidden = (
 # Read /etc/mail/sendmail.conf
 #------------------------------------------------------------------------------
 sub read_conf {
-	my ($input_file) = @_ || $Parse_conf::Conffile;
+	my ($input_file) = @_;
+	$input_file ||= $Parse_conf::Conffile;
 
 	$debug = $main::debug || $Parse_conf::debug;
 
diff --git a/debian/local/update_mk.in b/debian/local/update_mk.in
index 2ac8907..5c64cc3 100644
--- a/debian/local/update_mk.in
+++ b/debian/local/update_mk.in
@@ -96,8 +96,6 @@ $main::debug = $main::opt_debug || $main::debug;
 &Parse_conf::read_conf("$Conffile");
 my ($ok, $value) = &Parse_conf::get_value('HANDS_OFF');
 if ($value ne '0') {
-	unlink "${Makefile}";
-	unlink "@sysconfdir@/mail/databases";
 	exit;
 	};
 
diff --git a/debian/patches/8.13/8.13.3/cpu_hog.patch b/debian/patches/8.13/8.13.3/cpu_hog.patch
new file mode 100644
index 0000000..bcde4c2
--- /dev/null
+++ b/debian/patches/8.13/8.13.3/cpu_hog.patch
@@ -0,0 +1,38 @@
+# 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 ####
+