Imported Debian patch 8.14.1-3debian/8.14.1-3

4 files changed, 59 insertions, 45 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index dabc449..dbb2331 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,9 +2,9 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.1 2007-05-11 07:26:49 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.1 2007-05-21 16:46:55 cowboy Exp $
 #
-# Copyright (c) 1998-2005 Richard Nelson.  All Rights Reserved.
+# Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
 #
 # build/autoconf.mk.  Generated from autoconf.mk.in by configure.
 #
@@ -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> 2007-05-11 07:26:49 (-0700)
+# Richard Nelson <cowboy@debian.org> 2007-05-21 16:46:55 (-0700)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index 605c3e4..6fd5782 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -22,9 +22,9 @@ dnl #
 Priority: extra
 Section:  mail
 Maintainer: Richard A Nelson (Rick) <cowboy@debian.org>
-Standards-Version: 3.6.10.0
+Standards-Version: 3.7.2
 Build-Depends-Indep: groff, bsdmainutils
-Build-Depends: make (>> 3.79.1-14), m4, patch, debhelper (>= 4.1.68) @sm_badepends@
+Build-Depends: make (>> 3.79.1-14), m4, patch, debhelper (>= 4.1.68), linux-kernel-headers @sm_badepends@
 Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)]]dnl
 dnl #
 dnl # The arch=any package: sendmail-bin
@@ -37,7 +37,7 @@ Architecture: any
 Section: mail
 Replaces: mail-transport-agent
 Provides: mail-transport-agent
-Conflicts: mail-transport-agent, sendmail (<< 8.13.1-7)
+Conflicts: mail-transport-agent
 Depends: sendmail-base, sendmail-cf, ${shlibs:Depends}, ${perl:Depends} @sm_depends@
 Recommends: @sm_recommends@
 Suggests: sendmail-doc, @sm_suggests@, cyrus-common
@@ -87,7 +87,6 @@ dnl #
 Package: sensible-mda
 Architecture: any
 Section: mail
-Conflicts: sendmail (<< 8.13.1-7)
 Depends: sendmail-bin | mail-transport-agent, procmail | maildrop | deliver, ${shlibs:Depends}
 Description: Mail Delivery Agent wrapper
  Sensible-mda is a Debian addition in the sendmail package and has been
@@ -106,7 +105,6 @@ Package: libmilter@sm_libmilter_version@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libmilter-dev (<= 8.13.3-0)
 Description: Sendmail Mail Filter API (Milter)
  The Sendmail Mail Filter API (Milter) is designed to allow third-party
  programs access to mail messages as they are being processed in order
@@ -121,8 +119,7 @@ Description: Sendmail Mail Filter API (Milter)
 Package: libmilter@sm_libmilter_version@-dbg
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: libmilter-dev (<= 8.13.3-0)
+Depends: libmilter@sm_libmilter_version@ (= ${binary:Version}), ${shlibs:Depends}
 Description: Sendmail Mail Filter API (Milter)
  The Sendmail Mail Filter API (Milter) is designed to allow third-party
  programs access to mail messages as they are being processed in order
@@ -142,7 +139,7 @@ ifelse([[@sm_enable_dev@]], [[yes]], [[[[
 Package: libmilter-dev
 Architecture: any
 Section: libdevel
-Depends: libmilter@sm_libmilter_version@ (= ${Source-Version})
+Depends: libmilter@sm_libmilter_version@ (= ${binary:Version})
 Suggests: sendmail-doc
 Description: Sendmail Mail Filter API (Milter)
  The Sendmail Mail Filter API (Milter) is designed to allow third-party
@@ -192,8 +189,8 @@ Package: sendmail
 Architecture: all
 Section: mail
 Replaces: sendmail-tls
-Depends: sendmail-base (= ${Source-Version}), sendmail-bin (= ${Source-Version}), sendmail-cf (= ${Source-Version}), sensible-mda (= ${Source-Version}), rmail (= ${Source-Version})
-Suggests: sendmail-doc
+Depends: sendmail-base, sendmail-bin, sendmail-cf, sensible-mda
+Suggests: sendmail-doc, rmail
 Description: powerful, efficient, and scalable Mail Transport Agent
  Sendmail is an alternative Mail Transport Agent (MTA) for Debian.
  It is suitable for handling sophisticated mail configurations,
@@ -224,9 +221,7 @@ Package: sendmail-base
 Architecture: all
 Section: mail
 Depends: update-inetd, m4, make, adduser, netbase (>= 4.08), ${perl:Depends}
-Recommends: resolvconf
-Suggests: sendmail-doc, ca-certificates, logcheck, logrotate
-Conflicts: sendmail (<= 8.13.1-7)
+Suggests: sendmail-doc, ca-certificates, logcheck, logrotate, resolvconf
 Description: powerful, efficient, and scalable Mail Transport Agent
  Sendmail is an alternative Mail Transport Agent (MTA) for
  Debian. It is suitable for handling sophisticated mail
@@ -247,7 +242,6 @@ Package: sendmail-cf
 Architecture: all
 Section: mail
 Suggests: sendmail-doc, m4
-Conflicts: sendmail (<< 8.13.1-7)
 Description: powerful, efficient, and scalable Mail Transport Agent
  Sendmail is an alternative Mail Transport Agent (MTA) for
  Debian. It is suitable for handling sophisticated mail
diff --git a/debian/build/debian/sendmail-bin.postinst.in b/debian/build/debian/sendmail-bin.postinst.in
index 6305757..13ce727 100644
--- a/debian/build/debian/sendmail-bin.postinst.in
+++ b/debian/build/debian/sendmail-bin.postinst.in
@@ -30,7 +30,7 @@ PACKAGE=sendmail-bin;
 
 #-----------------------------------------------------------
 #stop(): stop sendmail
-stop () {
+stop_mta () {
 	# Account for varying PIDfile locations of older sendmail packages
 	if [ -f /var/run/sendmail/mta/sendmail.pid ]; then
 		start-stop-daemon --stop --oknodo --quiet \
@@ -62,7 +62,7 @@ stop () {
 
 #-----------------------------------------------------------
 #start(): start sendmail
-start () {
+start_mta () {
 	if [ -x /usr/sbin/invoke-rc.d ]; then
 		/usr/sbin/invoke-rc.d sendmail start;
 	else
@@ -72,7 +72,7 @@ start () {
 
 #-----------------------------------------------------------
 # configure(): save sendmail.cf, call sendmailconfig
-configure () {
+configure_mta () {
 	local enter;
 	echo -n "Configure now ? (y/N) ";
 	read yn;
@@ -80,9 +80,9 @@ configure () {
 	test -n "$yn" || yn="N";
 	case "$yn" in 
 		[Yy]*) 
-			stop;
+			stop_mta;
 			@sbindir@/sendmailconfig --no-reload;
-			start;
+			start_mta;
 			;;
 
 		[Nn]*)
@@ -210,10 +210,10 @@ if [ ! -f @sysconfdir@/mail/sendmail.mc ]; then
 	fi;
 
 if [ -x @datadir@/sendmail/update_sendmail ]; then
-	stop;
+	stop_mta;
 	echo "Updating sendmail environment ...";
 	@datadir@/sendmail/update_sendmail || true;
-	start;
+	start_mta;
 	fi;
 exit 0;
 
@@ -251,7 +251,7 @@ case "$yn" in
 			chmod 0644 @sysconfdir@/mail/submit.cf.old;
 			fi;
 		if [ -x @datadir@/sendmail/update_sendmail ]; then
-			stop;
+			stop_mta;
 			echo "Updating sendmail environment ...";
 			@datadir@/sendmail/update_sendmail || true;
 			fi;
@@ -286,7 +286,7 @@ case "$yn" in
 		EOT
 		echo "Do you wish to run sendmailconfig now, or later";
 		start_ask=0;
-		configure;
+		configure_mta;
 		case "$yn" in
 			[Yy]*)
 				cat <<-EOT
@@ -296,7 +296,7 @@ case "$yn" in
 				from your older sendmail.cf.old?
 				EOT
 				start_ask=1;
-				start;
+				start_mta;
 				;;
 		   esac;
 		exit 0;
@@ -307,7 +307,7 @@ case "$yn" in
 # Now, liberal application of smoke and mirrors
 if [ -f @sysconfdir@/mail/sendmail.mc ]; then
 	start_ask=1;
-	start;
+	start_mta;
 	fi;
 
 exit 0;
diff --git a/debian/build/debian/sendmail.init.d.in b/debian/build/debian/sendmail.init.d.in
index 060643f..f5126b2 100644
--- a/debian/build/debian/sendmail.init.d.in
+++ b/debian/build/debian/sendmail.init.d.in
@@ -1,19 +1,39 @@
-#!/bin/sh -e
-#
-# $Sendmail: init.d,v @sm_version@ @sm_date@ @sm_time@ cowboy Exp $
-#
-# Sendmail rc script for Debian (/etc/init.d/sendmail)
-# all the work is done by the imbedded copy of /usr/share/sendmail/sendmail
-#
-# Copyright (c) 2001-@SM_CPYRT@, Richard Nelson <cowboy@debian.org>.
-#
-# Notes (to all):
-#	* *** Do not edit this file *** Instead edit /etc/mail/sendmail.conf
-#
-# Notes (to self):
-#	*
-#
-set -e;
-PATH=/bin:/usr/bin:/sbin:/usr/sbin;
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          sendmail
+# Required-Start:    $local_fs $network
+# Required-Stop:     $local_fs $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: powerful, efficient, and scalable Mail Transport Agent
+# Description:       Sendmail is an alternative Mail Transport Agent (MTA)
+#                    for Debian. It is suitable for handling sophisticated
+#                    mail configurations, although this means that its
+#                    configuration can also be complex. Fortunately, simple
+#                    thing can be done easily, and complex thing are possible,
+#                    even if not easily understood ;)  Sendmail is the *ONLY*
+#                    MTA with a Turing complete language to control *ALL*
+#                    aspects of delivery!
+### END INIT INFO
 
+# Author: Marc-Christian Petersen <m.c.p@kernel.linux-systeme.com>
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DESC="Mail Transport Agent (MTA)"
+NAME=sendmail
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS=""
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/sendmail ] && . /etc/default/sendmail
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+. /lib/lsb/init-functions