Imported Debian patch 8.14.2-4debian/8.14.2-4

9 files changed, 50 insertions, 26 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index 24fdeac..68e2219 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.2 2008-02-10 13:47:11 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.2 2008-04-09 21:05:31 cowboy Exp $
 #
 # Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
 #
@@ -16,7 +16,7 @@
 #		on Debian slink, potato, woody, testing, sid, ...
 #		but the generated file is customized to the version noted above.
 #
-# Richard Nelson <cowboy@debian.org> 2008-02-10 13:47:11 (-0800)
+# Richard Nelson <cowboy@debian.org> 2008-04-09 21:05:31 (-0700)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
diff --git a/debian/build/debian/sendmail-bin.postinst.in b/debian/build/debian/sendmail-bin.postinst.in
index 13ce727..484c83e 100644
--- a/debian/build/debian/sendmail-bin.postinst.in
+++ b/debian/build/debian/sendmail-bin.postinst.in
@@ -86,7 +86,8 @@ configure_mta () {
 			;;
 
 		[Nn]*)
-			echo -e "\nTo configure sendmail later, type" \
+			echo '';
+			echo "To configure sendmail later, type" \
 				"sendmailconfig";
 			echo "After configuring sendmail, you can" \
 				"start it via @sysconfdir@/init.d/sendmail start";
diff --git a/debian/build/debian/sendmail.init.d.in b/debian/build/debian/sendmail.init.d.in
index f5126b2..3837c7b 100644
--- a/debian/build/debian/sendmail.init.d.in
+++ b/debian/build/debian/sendmail.init.d.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          sendmail
-# Required-Start:    $local_fs $network
-# Required-Stop:     $local_fs $network
+# Required-Start:    $remote_fs $network
+# Required-Stop:     $remote_fs $network
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: powerful, efficient, and scalable Mail Transport Agent
diff --git a/debian/changelog b/debian/changelog
index 543b962..be8a1cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+sendmail (8.14.2-4) unstable; urgency=low
+
+  * remove bad brackets from example access IPv6  Closes: #471086
+  * remove echo -e                                Closes: #472240
+  * adjust for cdbs patch target change           Closes: #474917
+  * Fix LSB init header. Use $remote_fs instead of $local_fs as the
+    daemon requires /usr to be mounted.
+  * Actually skip work in dynamic if the mode is 'Static'
+  * Don't purgestat on ifdown (just slows things down needlessly),
+    and is only relevant on ifup
+  * background sendmail restart on ifup/ifdown to not hang interactivity
+  * remove --linda from debuild options
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 03 Dec 2008 15:55:00 -0000
+
 sendmail (8.14.2-3) unstable; urgency=low
 
   * Correct the setup of Submission (587) and local injection
diff --git a/debian/examples/db/access b/debian/examples/db/access
index af43fef..de466df 100644
--- a/debian/examples/db/access
+++ b/debian/examples/db/access
@@ -77,10 +77,10 @@ Connect:127				RELAY
 GreetPause:127			0
 ClientRate:127			0
 ClientConn:127			0
-Connect:[IPv6:::1]		RELAY
-GreetPause:[IPv6:::1]	0
-ClientRate:[IPv6:::1]	0
-ClientConn:[IPv6:::1]	0
+Connect:IPv6:::1		RELAY
+GreetPause:IPv6:::1		0
+ClientRate:IPv6:::1		0
+ClientConn:IPv6:::1		0
 #Connect:172.16			RELAY
 #Connect:172.17			RELAY
 #Connect:172.18			RELAY
diff --git a/debian/local/Parse_conf.pm.in b/debian/local/Parse_conf.pm.in
index 917eae2..8b8bc3e 100644
--- a/debian/local/Parse_conf.pm.in
+++ b/debian/local/Parse_conf.pm.in
@@ -803,6 +803,7 @@ LOG_CMDS="$parameter{'LOG_CMDS'}";
 #	Don't do it! [laughs] I treat the .cf file as a binary
 #	file - you should too."
 #		--  Eric Allman 1999/10/18
+#		http://www.dotcomeon.com/allman_sendmail_qa.html
 #
 HANDS_OFF="$parameter{'HANDS_OFF'}";
 #	
diff --git a/debian/local/dynamic.in b/debian/local/dynamic.in
index 82b6d7c..ccc7ba5 100644
--- a/debian/local/dynamic.in
+++ b/debian/local/dynamic.in
@@ -114,13 +114,14 @@ update_interface() {
 		esac;
 
 	# Mark what we're doing...
-	local msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
+	local msg;
+	msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
 	if [ "$LOG_CMDS" != 'No' ]; then
 		/usr/bin/logger -i -p mail.debug -- "$0 (dynamic) update_interface: $msg";
 		fi;
 
 	# Do absolutely nothing if they say so...
-	if [ "$HANDS_OFF" != 'No' ]; then
+	if [ "$HANDS_OFF" != 'No' -o "$DAEMON_NETMODE" = 'Static' ]; then
 		SM_ignore=1;
 		fi;
 	if [ -z "$SM_interface" ]; then
@@ -148,13 +149,14 @@ update_provider() {
 	SM_provider="$1";
 
 	# Mark what we're doing...
-	local msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
+	local msg;
+	msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
 	if [ "$LOG_CMDS" != 'No' ]; then
 		/usr/bin/logger -i -p mail.debug -- "$0 (dynamic) update_provider: $msg";
 		fi;
 
 	# Do absolutely nothing if they say so...
-	if [ "$HANDS_OFF" != 'No' ]; then
+	if [ "$HANDS_OFF" != 'No' -o "$DAEMON_NETMODE" = 'Static' ]; then
 		SM_ignore=1;
 		fi;
 	if [ $SM_ignore -ne 0 ]; then
@@ -199,13 +201,14 @@ update_host() {
 	SM_ip="$1";
 
 	# Mark what we're doing...
-	local msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
+	local msg;
+	msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
 	if [ "$LOG_CMDS" != 'No' ]; then
 		/usr/bin/logger -i -p mail.debug -- "$0 (dynamic) update_host: $msg";
 		fi;
 
 	# Do absolutely nothing if they say so...
-	if [ "$HANDS_OFF" != 'No' ]; then
+	if [ "$HANDS_OFF" != 'No' -o "$DAEMON_NETMODE" = 'Static' ]; then
 		SM_ignore=1;
 		fi;
 	if [ $SM_ignore -ne 0 ]; then
@@ -268,13 +271,14 @@ update_host() {
 update_resolv() {
 
 	# Mark what we're doing...
-	local msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
+	local msg;
+	msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
 	if [ "$LOG_CMDS" != 'No' ]; then
 		/usr/bin/logger -i -p mail.debug -- "$0 (dynamic) update_resolv: $msg";
 		fi;
 
 	# Do absolutely nothing if they say so...
-	if [ "$HANDS_OFF" != 'No' ]; then
+	if [ "$HANDS_OFF" != 'No' -o "$DAEMON_NETMODE" = 'Static' ]; then
 		SM_ignore=1;
 		fi;
 	if [ $SM_ignore -ne 0 ]; then
@@ -295,7 +299,9 @@ update_resolv() {
 
 	# Purge any latent host status that might cause us to *NOT* send mail
 	if [ -x @sysconfdir@/init.d/sendmail ]; then
-		@sysconfdir@/init.d/sendmail purgestat now 
+		if [ "$SM_state" = 'up' ]; then
+			@sysconfdir@/init.d/sendmail purgestat now;
+			fi;
 		fi;
 
 	# resolvconf is called as a DHCP pre-exit, so we'll defer any changes
@@ -364,13 +370,14 @@ update_sendmail() {
 	SM_opts="$2";
 
 	# Mark what we're doing...
-	local msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
+	local msg;
+	msg="$SM_interface $SM_state $SM_provider $SM_ip $SM_host";
 	if [ "$LOG_CMDS" != 'No' ]; then
 		/usr/bin/logger -i -p mail.debug -- "$0 (dynamic) update_sendmail: $msg";
 		fi;
 
 	# Do absolutely nothing if they say so...
-	if [ "$HANDS_OFF" != 'No' ]; then
+	if [ "$HANDS_OFF" != 'No' -o "$DAEMON_NETMODE" = 'Static' ]; then
 		SM_ignore=1;
 		fi;
 	if [ $SM_ignore -ne 0 ]; then	  
@@ -422,8 +429,10 @@ update_sendmail() {
 		# Purge any latent host status that might cause us to *NOT* send mail
 		# Reload sendmail, IFF already running
 		if [ -x @sysconfdir@/init.d/sendmail ]; then
-			@sysconfdir@/init.d/sendmail purgestat now
-			@sysconfdir@/init.d/sendmail reload-if-running;  # up, or down
+			if [ "$SM_state" = 'up' ]; then
+				@sysconfdir@/init.d/sendmail purgestat now;
+				fi;
+			@sysconfdir@/init.d/sendmail reload-if-running &  # up, or down
 			fi;
 		fi;
 
diff --git a/debian/local/update_sys.in b/debian/local/update_sys.in
index fac690b..e086a6c 100644
--- a/debian/local/update_sys.in
+++ b/debian/local/update_sys.in
@@ -227,7 +227,7 @@ chown smmta:smmsp @localstatedir@/spool/mqueue;
 chmod 02750 @localstatedir@/spool/mqueue;
 #
 # With the MSP/MTA split, we *DO* need g=r, gid=smmsp queue directories and
-# files mailq to work...
+# files for mailq to work...
 find @localstatedir@/spool/mqueue -print \
 	| xargs -r chown smmta:smmsp;
 find @localstatedir@/spool/mqueue -type d -print \
diff --git a/debian/rules b/debian/rules
index c93b505..0270321 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,7 +92,7 @@ SM_SUBDIRS := editmap libmilter mail.local mailstats \
 ifeq (y, $(shell test -x /usr/bin/debuild && echo 'y'))
 	DEB_BUILD = \
 		DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS}" \
-		debuild --linda
+		debuild
 else
 	DEB_BUILD = \
 		DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS}" \
@@ -131,8 +131,6 @@ all::
 # Normalize CDBS rules
 .PHONY: unpack
 unpack:: pre-build
-.PHONY: patch
-patch:: apply-patches
 .PHONY: configure
 configure:: common-configure-arch common-configure-indep