Imported Debian patch 8.14.2-2debian/8.14.2-2

9 files changed, 8 insertions, 1187 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index f4c97b7..03da1e2 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,13 +2,13 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.2 2007-11-02 22:20:56 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.2 2007-11-30 09:13:59 cowboy Exp $
 #
 # Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
 #
 # build/autoconf.mk.  Generated from autoconf.mk.in by configure.
 #
-# Rules file for Sendmail 8.14.2-1(527874)
+# Rules file for Sendmail 8.14.2(527874)
 #			 on  Debian lenny/sid
 #			 via Debhelper V4.1
 #
@@ -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-11-02 22:20:56 (+0000)
+# Richard Nelson <cowboy@debian.org> 2007-11-30 09:13:59 (-0800)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
@@ -54,7 +54,7 @@ buildtree = build-tree/sendmail-8.14.2
 sm_custom   = 
 sm_custom_s = 
 sm_version  = 8.14.2
-sm_revision = -1
+sm_revision = 
 
 # I like to preserve timestamps...
 INSTALL := /usr/bin/install -c -p
@@ -69,9 +69,9 @@ INSTALL_SCRIPT := ${INSTALL} -m 0755
 
 # AutoConfig generated
 #AC_CC	:= cc
-#AC_CFLAGS := -g -Wall -O2 -fPIC -fstack-protector-all
-#AC_DEFS :=  -DPACKAGE_NAME=\"Sendmail\" -DPACKAGE_TARNAME=\"sendmail\" -DPACKAGE_VERSION=\"8.14.1\" -DPACKAGE_STRING=\"Sendmail\ 8.14.1\" -DPACKAGE_BUGREPORT=\"bug/reportbug\ or\ sendmail@packages.debian.org\" -DPACKAGE=\"sendmail\" -DVERSION=\"8.14.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_REGEX_H=1 -DHAVE_DB_H=1 -DHAVE_DB_185_H=1 -DHAVE_RPCSVC_YPCLNT_H=1 -DHAVE_RPCSVC_NIS_H=1 -DHAVE_LDAP_H=1 -DHAVE_RESOLV_H=1 -DHAVE_TCPD_H=1 -DHAVE_NETINET_IP6_H=1 -DHAVE_GETADDRINFO=1 -DHAVE_MAILLOCK_H=1 -DHAVE_SASL_SASL_H=1 -DHAVE_OPENSSL_SSL_H=1
-#AC_LDFLAGS := -pie -Wl,-z,noexecstack,-z,relro,-z,now -Wl,--warn-shared-textrel
+#AC_CFLAGS := -g -Wall -O2 -fPIC -fstack-protector-all -g -Wall -O2 -fPIC -fstack-protector-all
+#AC_DEFS :=  -DPACKAGE_NAME=\"Sendmail\" -DPACKAGE_TARNAME=\"sendmail\" -DPACKAGE_VERSION=\"8.14.2\" -DPACKAGE_STRING=\"Sendmail\ 8.14.2\" -DPACKAGE_BUGREPORT=\"bug/reportbug\ or\ sendmail@packages.debian.org\" -DPACKAGE=\"sendmail\" -DVERSION=\"8.14.2\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_REGEX_H=1 -DHAVE_DB_H=1 -DHAVE_DB_185_H=1 -DHAVE_RPCSVC_YPCLNT_H=1 -DHAVE_RPCSVC_NIS_H=1 -DHAVE_LDAP_H=1 -DHAVE_RESOLV_H=1 -DHAVE_TCPD_H=1 -DHAVE_NETINET_IP6_H=1 -DHAVE_GETADDRINFO=1 -DHAVE_MAILLOCK_H=1 -DHAVE_SASL_SASL_H=1 -DHAVE_OPENSSL_SSL_H=1
+#AC_LDFLAGS := -pie -Wl,-z,noexecstack,-z,relro,-z,now -Wl,--warn-shared-textrel -pie -Wl,-z,noexecstack,-z,relro,-z,now -Wl,--warn-shared-textrel
 #AC_LIBS := 
 
 # Private AutoConfig generated
diff --git a/debian/build/autoconf.pl b/debian/build/autoconf.pl
deleted file mode 100644
index ee649c3..0000000
--- a/debian/build/autoconf.pl
+++ /dev/null
@@ -1,41 +0,0 @@
-#------------------------------------------------------------------------------
-# Autoconf variables - in a form suitable for sh, perl
-# build/autoconf.pl.  Generated from autoconf.pl.in by configure.
-#------------------------------------------------------------------------------
-# Variables for, and by, Autoconf (Don't touch these! edit config step)
-my ($PACKAGE_NAME, $PACKAGE_VERSION, $prefix, $exec_prefix, $bindir,
-	$sbindir, $libexecdir, $datadir, $sysconfdir, $sharedstatedir,
-	$localstatedir, $libdir, $includedir, $infodir, $mandir, $docdir,
-	$srcdir, $abs_srcdir, $top_srcdir, $abs_top_srcdir,
-	$builddir, $abs_builddir, $top_builddir, $abs_top_builddir,
-	$VPATH);
-BEGIN {
-	$PACKAGE_NAME = "Sendmail";
-	$PACKAGE_VERSION = "8.14.2";
-	$prefix = "/usr";
-	$exec_prefix = "/usr";
-	$bindir = "/usr/bin";
-	$sbindir = "/usr/sbin";
-	$libexecdir = "/usr/lib/sm.bin";
-	$sysconfdir = "/etc";
-	$sharedstatedir = "/usr/com";
-	$localstatedir = "/var";
-	$libdir = "/usr/lib";
-	$includedir = "/usr/include";
-	$oldincludedir = "/usr/include";
-	$datarootdir = "/usr/share";
-	$datadir = "/usr/share";
-	$infodir = "/usr/share/info";
-	$mandir = "/usr/share/man";
-	$docdir = "/usr/share/doc";
-	$srcdir = ".";
-	$abs_srcdir = "/home/src/sendmail/sendmail-8.14.2/debian/build";
-	$top_srcdir = "..";
-	$abs_top_srcdir = "/home/src/sendmail/sendmail-8.14.2/debian";
-	$builddir = ".";
-	$abs_builddir = "/home/src/sendmail/sendmail-8.14.2/debian/build";
-	$top_builddir = "..";
-	$abs_top_builddir = "/home/src/sendmail/sendmail-8.14.2/debian";
-	$VPATH = ".";
-	};
-
diff --git a/debian/build/autoconf.sh b/debian/build/autoconf.sh
deleted file mode 100644
index 47b7e24..0000000
--- a/debian/build/autoconf.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#------------------------------------------------------------------------------
-# Autoconf variables - in a form suitable for sh, perl
-# build/autoconf.sh.  Generated from autoconf.sh.in by configure.
-#------------------------------------------------------------------------------
-# Variables for, and by, Autoconf (Don't touch these! edit config step)
-PACKAGE_NAME="Sendmail";
-PACKAGE_VERSION="8.14.2";
-prefix="/usr";
-exec_prefix="/usr";
-bindir="/usr/bin";
-sbindir="/usr/sbin";
-libexecdir="/usr/lib/sm.bin";
-sysconfdir="/etc";
-sharedstatedir="/usr/com";
-localstatedir="/var";
-libdir="/usr/lib";
-includedir="/usr/include";
-oldincludedir="/usr/include";
-datarootdir="/usr/share";
-datadir="/usr/share";
-infodir="/usr/share/info";
-mandir="/usr/share/man";
-docdir="/usr/share/doc";
-srcdir=".";
-abs_srcdir="/home/src/sendmail/sendmail-8.14.2/debian/build"
-top_srcdir=".."
-abs_top_srcdir="/home/src/sendmail/sendmail-8.14.2/debian"
-builddir="."
-abs_builddir="/home/src/sendmail/sendmail-8.14.2/debian/build"
-top_builddir=".."
-abs_top_builddir="/home/src/sendmail/sendmail-8.14.2/debian"
-VPATH=":"
-
diff --git a/debian/build/debian/changelog b/debian/build/debian/changelog
deleted file mode 100644
index 9072b4d..0000000
--- a/debian/build/debian/changelog
+++ /dev/null
@@ -1,329 +0,0 @@
-sendmail (8.14.2-1) unstable; urgency=low
-
-  * New Upstream release
-    + SASL 2.1.22 change sasl_decode64() requires MTA handle "="
-      closes: #443319
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 02 Nov 2007 22:14:00 -0000
-
-sendmail (8.14.2-0) private; urgency=low
-
-  * Upstream release
-  * Refit patches
-  * Run for a bit
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 02 Nov 2007 03:00:00 -0000
-
-sendmail (8.14.2.Beta0-0) private; urgency=low
-
-  * Upstream Beta
-  * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 23 Oct 2007 05:50:00 -0000
-
-sendmail (8.14.2.Beta0-0) private; urgency=low
-
-  * Upstream Beta
-  * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 15 Oct 2007 16:20:00 -0000
-
-sendmail (8.14.1-12) unstable; urgency=low
-
-  * Correct "poor man's" emphasis               closes: #448033
-    (Yes, Ubuntu does feed stuff back)
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 29 Oct 2007 22:46:00 -0000
-
-sendmail (8.14.1-11) unstable; urgency=low
-
-  * /etc/init.d/sendmail will now rebuild databases on 
-    start/reload/restart (like Redhat derived, various BSDs, etc)
-
-  * Finally nailed (fingers crossed) the elusive cause of
-        ;; connection timed out; no servers could be reached
-    There are still issues on what state to leave things in, but
-    at least the file will be turned into garbage     closes: #375787
-    + sendmail.conf::DAEMON_NETMODE now defaults to Static
-    + /etc/{ppp,dhcp3,network,resolvconf}/*/sendmail pass an additional option
-    + /usr/share/sendmail/dynamic is much more careful
-
-  * ARM is broken, disable -fstack-protector-all      closes: #446415
-  * add FEATURE(use_cw_file) to default sendmail.mc   closes: #433216
-  * remove /usr/share/bug/sendmail-doc -> sendmail    closes: #387799
-    
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Sat, 20 Oct 2007 23:35:30 -0000
-
-sendmail (8.14.1-10) unstable; urgency=low
-
-  * Do not blindly accept client certificates by default
-    thanks to Jeffrey Honig (from #sendmail@freenode)
-    NOTE: this only affects new installations - if you've already installed
-    sendmail, you and haven't changed the default; you should !
-    /etc/mail/tls/starttls.m4
-  * Set confRRT_IMPLIES_DSN to upstream default of False
-  * Enable pool() for libmilter                       closes: #445307
-    This should help high performance/load situations where select() just
-    doesn't scale well
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Thu, 04 Oct 2007 22:40:00 -0000
-
-sendmail (8.14.1-9) unstable; urgency=low
-
-  * Finally drop MAILER(cyrus21) in favour of cyrusv2
-  * Egads, a rules typo dropped all local patches :(  closes: #436185
-  * upgrade to db4.6 (and newer libdb-dev)
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 13 Aug 2007 20:52:22 -0000
-
-sendmail (8.14.1-8) unstable; urgency=low
-
-  * remove dependancy on update-inetd and netbase/inet-superserver
-    + Default install uses daemon mode (no need for inetd)
-    + update-inetd call predicated upon it existance
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Sat, 28 Jul 2007 01:17:00 -0000
-
-sendmail (8.14.1-7) unstable; urgency=low
-
-  * buildd's do not honour Build-Depends-Indep:, so replicate that
-    information on the Build-Depends line to solve FTBFS  Closes: #430405
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 29 May 2007 02:21:00 -0000
-
-sendmail (8.14.1-6) unstable; urgency=low
-
-  * The `ironclad or die` release, using newer gcc/binutils
-    features to further reduce the exploit footprint of an
-    application.   Thanks to Marc-Christian Petersen
-    Read more about all that good stuff at:
-    http://www.gentoo.org/proj/en/hardened/hardened-toolchain.xml#RELRO 
-
-  * Create an ELF "PT_GNU_RELRO" segment header in the object.
-    Or in other words: built with "-z relro"
-
-  * When generating an executable or shared library, mark it to tell
-    the dynamic linker to resolve all symbols when the program is
-    started, or when the shared library is linked to using dlopen,
-    instead of deferring function call resolution to the point when
-    the function is first called.
-    Or in other words: built with "-z now"
-
-  * Emit extra code to check for buffer overflows, such as stack
-    smashing attacks. This is done by adding a guard variable to
-    functions with vulnerable objects. This includes functions
-    that call alloca, and functions with buffers larger than 8
-    bytes. The guards are initialized when a function is entered
-    and then checked when the function exits.  If a guard check
-    fails, an error message is printed and the program exits.
-    Or in other words: built with "-fstack-protector-all"
-
-  * Compiled as PIE (Position Independant Executable)
-    This assists PAX enabled kernels, with ASLR, and is also needed
-    for GRSecurity.  Even with stock kernels, this makes the memory
-    mapping less static, hindering attacks.
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 29 May 2007 02:21:00 -0000
-
-sendmail (8.14.1-5) private; urgency=low
-
-  * DH_COMPAT = 5
-
-  * Tweak LSB setup of /etc/init.d/sendmail such that stop/start
-    when DAEMON_MODE=None is not an error
-
-  * Clean up rules file abit, more to go (I love deleting suff)
-    + drop sm_conf/sm_conf_opt from debian/rules
-    + drop old private copy of dbs and use cdbs (not cleanly)
-    + drop support of older sendmail versions (8.8.8+)
-    + drop support for building on older debian versions (slink+)
-    + drop split debian directory kluge
-    + drop smX support - it requires a complete revamp
-
-  * Things are still complicated by upstream not using autoconf/makefile
-    builds, but I have used them in support - much of that work remains and
-    will not be removed in the near term
-
-  * Add alternative build-depend for linux-libc-dev (which will depcrecate
-    linux-kernel-headers)
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Wed, 23 May 2007 05:00:00 -0000
-
-sendmail (8.14.1-4) unstable; urgency=low
-
-  * Fix occasional mailq failures caused by set -e and lsb scripts :(
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 22 May 2007 23:00:00 -0000
-
-sendmail (8.14.1-3) unstable; urgency=low
-
-  * Add missing build-depends for linux-kernel-headers
-    Thanks Marc-Christian Petersen
-  * LSB init scripts
-    Thanks Marc-Christian Petersen
-  * Finally, make rmail a suggestion, not a dependancy
-    and remove conflicts with old versions        closes: #376113
-  * Suffix _mta to start/stop/configure for ksh   closes: #424213
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Thu, 19 May 2007 20:14:00 -0000
-
-sendmail (8.14.1-2) unstable; urgency=high
-
-  * Rebuild against a fixed libd4.5        closes: #423153
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Thu, 10 May 2007 21:30:00 -0000
-
-sendmail (8.14.1-1) unstable; urgency=low
-
-  * *** *** libmilter gets a new version *** ***
-    *** *** MimeDefang and other packages will need to be rebuilt *** ***
-
-  * New upstream release
-    - Fix 8.14.0 regressions & issues
-  * Refit patches
-  * Drop qtool patch, equivalent applied upstream
-  * Force configure defaults (new machine, gotta get it right)
-  * update configure.ac for newer db versions
-  * refresh FAQ
-  * build against db4.5                                      closes: #421945
-  * build-indep-depends on groff, not groff-base             closes: #362872
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Sat, 05 May 2007 20:10:00 -0000
-
-sendmail (8.14.1-0) private; urgency=low
-
-  * New upstream release
-    - Fix 8.14.0 regressions & issues
-  * Refit patches
-  * Drop qtool patch, equivalent applied upstream
-  * Force configure defaults (new machine, gotta get it right)
-  * update configure.ac for newer db versions
-  * refresh FAQ
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 04 Apr 2007 04:00:00 -0000
-
-sendmail (8.14.1.Gamma0-0) private; urgency=low
-
-  * New upstream Gamma
-  * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 30 Mar 2007 04:40:00 -0000
-
-sendmail (8.14.1.Beta2-0) private; urgency=low
-
-  * New upstream Beta
-  * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Sat, 24 Mar 2007 04:30:00 -0000
-
-sendmail (8.14.1.Beta1-0) private; urgency=low
-
-  * New upstream Beta
-  * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 09 Mar 2007 17:00:00 -0000
-
-sendmail (8.14.1.Beta0-0) private; urgency=low
-
-  * New upstream Beta
-  * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 05 Mar 2007 05:40:00 -0000
-
-sendmail (8.14.0-0) private; urgency=low
-
-  * New upstream Release
-    - Headers 8bit clean
-    - Milter enhancements 
-  * Refit patches
-  * Some issues, so this will not be uploaded - errata of (2007/02/06) help
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Thu, 01 Feb 2007 16:20:00 -0000
-
-sendmail (8.14.0.Gamma0-0) private; urgency=low
-
-  * New upstream Release
-  * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Wed, 31 Jan 2007 20:50:00 -0000
-
-sendmail (8.14.0.Beta5-1) experimental; urgency=low
-
-  * New upstream Beta
-  * Refit patches
-
-  * Major item
-    + Welcome back space betwixt 'from:' and '<other stuff>'
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 09 Jan 2007 21:40:00 -0000
-
-sendmail (8.14.0.Beta4-1) experimental; urgency=low
-
-   * Sigh... built here, but not build machines      closes: #405917
-   * change from ~ to . to appease build scripts and match upstream
-   * drop my check_helo patch, needs rework
-   * Upstream incorporated patch for greet_pause     closes: #312164
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Sun, 07 Jan 2007 22:50:00 -0000
-
-sendmail (8.14.0~Beta4-1) experimental; urgency=low
-
-   * Release to experimental
-   * New upstream Beta
-   * Refit patches
-
-   * Major new feature:
-     + headers are 8 bit "transparent".
-     + the milter API has been extended.
-
-   * New/improved anti-SPAM features:
-     + no false-postives on greet_pause failures due to timeouts/rejections
-     + new option MaxNOOPCommands
-     + detection of open HTTP proxies (GET, POST, CONNECT, or USER)
-     + FEATURE(`require_rdns')
-     + FEATURE(`block_bad_helo')
-     + FEATURE(`badmx')
-     + option `relaytofulladdress' for FEATURE(`access_db')
-
-   * Upstream incorporated patch for greet_pause     closes: #312164
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 05 Jan 2007 19:07:46 -0000
-
-sendmail (8.14.0~Beta4-0) private; urgency=low
-
-  * New upstream Beta
-  * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Sun, 25 Dec 2006 04:30:00 -0000
-
-sendmail (8.14.0~Beta3-0) private; urgency=low
-
-   * New upstream Beta
-   * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 19 Dec 2006 00:10:00 -0000
-
-sendmail (8.14.0~Beta2-0) private; urgency=low
-
-   * New upstream Beta
-   * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Sat, 09 Dec 2006 18:40:00 -0000
-
-sendmail (8.14.0~Beta1-0) private; urgency=low
-
-   * New upstream Beta
-   * Refit patches
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Sun, 19 Nov 2006 17:50:00 -0000
-
-sendmail (8.14.0~Beta0-0) private; urgency=low
-
-   * New upstream Beta
-   * Support 8.14 in build tools
-   * Refit patches
-   * Update FFRs
-
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Wed, 01 Nov 2006 02:30:00 -0000
-
-/* vim:set ai et tw=80 */
diff --git a/debian/build/debian/changelog.sh b/debian/build/debian/changelog.sh
deleted file mode 100644
index 2235945..0000000
--- a/debian/build/debian/changelog.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh -e
-#-----------------------------------------------------------------------------
-# $Sendmail: changelog.sh,v 8.14.2 2007-11-02 22:20:56 cowboy Exp $
-#
-# Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
-#
-# build/debian/changelog.sh.  Generated from changelog.sh.in by configure.
-#
-# Debian script to generate changelogs for sendmail 8.14.2-1
-#
-# Note: this file supports 8.7.6 - 9.0.0
-#
-#-----------------------------------------------------------------------------
-set -e;
-#
-# Initialization
-PACKAGE='sendmail';
-
-#
-# Remove old combined changelog
-rm -f build/debian/changelog;
-
-echo "Building Sendmail 8.14.2-1 (527874) changelog.";
-
-#
-# Start with Custom changelog (if any)
-if [ -n "" ]; then
-	if [ -f .changelog ]; then
-		cat .changelog \
-			>> build/debian/changelog;
-		fi;
-	fi;
-
-#
-# Create a combined changelog *IFF* we have the pieces/parts...
-if [ ! -d private/changelogs ]; then
-	cat changelog >>build/debian/changelog;
-else
-	#
-	# v.r.m changelogs
-	if [ -f private/changelogs/8.14.2 ]; then
-		cat private/changelogs/8.14.2 \
-			>> build/debian/changelog;
-	#
-	# v.r changelogs
-	elif [ -f private/changelogs/8.14 ]; then
-		cat private/changelogs/8.14 >> build/debian/changelog;
-
-	#
-    # v changelogs
-    elif [ -f private/changelogs/8 ]; then
-        cat private/changelogs/8 >> build/debian/changelog;
-		fi;
-	#
-	# Variable definitions
-	cat private/changelogs/vars >> build/debian/changelog;
-	fi;
-
-#
-# Update 1st line to add --with-custom (defaults to null)
-if [ -z "" ]; then
-	mv build/debian/changelog build/debian/changelog.in;
-else
-	sed \
-		-e '1s/sendmail (8.14.2-/sendmail (8.14.2-/' \
-		-e '1s/sendmail (.8.14.2-/sendmail (8.14.2-/' \
-		build/debian/changelog \
-		> build/debian/changelog.in;
-	rm build/debian/changelog;
-	fi;
-
diff --git a/debian/build/debian/control.m4 b/debian/build/debian/control.m4
deleted file mode 100644
index 48e878e..0000000
--- a/debian/build/debian/control.m4
+++ /dev/null
@@ -1,262 +0,0 @@
-dnl #--------------------------------------------------------------------------
-dnl # $Sendmail: control.m4,v 8.14.2 2007-11-02 22:20:56 cowboy Exp $
-dnl #
-dnl # Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
-dnl #
-dnl # build/debian/control.m4.  Generated from control.m4.in by configure.
-dnl #
-dnl # Debian control.m4 for sendmail 8.14.2-1(527874)
-dnl #
-dnl # Note: the .in file supports 8.7.6 - 9.0.0, but the generated
-dnl #	file is customized to the version noted above.
-dnl #
-dnl # Note: Exercise care in the feeding of this file, especially wrt quoting!
-dnl #
-dnl #--------------------------------------------------------------------------
-changequote([[, ]])dnl
-dnl #
-dnl # The source package description
-dnl # Always built
-dnl #
-[[Source: sendmail
-Priority: extra
-Section:  mail
-Maintainer: Richard A Nelson (Rick) <cowboy@debian.org>
-Standards-Version: 3.7.2
-]]dnl # Sigh... build daemons ignore B-D-I, so replicate in B-D :(
-[[Build-Depends-Indep: groff, bsdmainutils
-Build-Depends: make (>> 3.79.1-14), m4, cdbs, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) | linux-kernel-headers, groff, bsdmainutils , libdb4.6-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev
-Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)
-Homepage: http://www.sendmail.org]]dnl
-dnl #
-dnl # The arch=any package: sendmail-bin
-dnl # Always built
-dnl #
-[[
-
-Package: sendmail-bin
-Architecture: any
-Section: mail
-Replaces: mail-transport-agent
-Provides: mail-transport-agent
-Conflicts: mail-transport-agent
-Depends: sendmail-base, sendmail-cf, ${shlibs:Depends}, ${perl:Depends} 
-Recommends: 
-Suggests: sendmail-doc, , sasl2-bin, libsasl2-modules | libsasl2-modules-plain | libsasl2-digestmd5-plain | libsasl2-digestmd5-des, openssl, cyrus-common
-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,
- although this means that its configuration can also be complex.
- .
- Fortunately, simple thing can be done easily, and complex things
- are possible, even if not easily understood ;)  Sendmail is the *ONLY*
- MTA with a Turing complete language to control *ALL* aspects of delivery!
- .
- Sendmail provides Security and SPAM/UCE/UBE protection via several means.
- .
- Sendmail includes *no* Mail User Agents (MUA), you'll have to
- pick from the plethora of available MUAs (mutt, vm, etc.)
- .
- This package supports REGEX, DB, NIS, NIS+, LDAP, DNS maps,
- and has enabled TCPWrappers, IPv6, LockFile, SMTP AUTH(SASL), STARTTLS(SSL).
- .
-Homepage: http://www.sendmail.org]]dnl
-dnl #
-dnl # The arch=any package: rmail
-dnl # Always built
-dnl #
-[[
-
-Package: rmail
-Architecture: any
-Section: mail
-Conflicts: sendmail (<< 8.13.1-7), postfix, exim, exim-tls, exim4-daemon-custom, exim4-daemon-heavy, exim4-daemon-light, courier-mta, smail, zmailer
-Depends: sendmail-bin | mail-transport-agent, ${shlibs:Depends}
-Description: MTA->UUCP remote mail handler
- Rmail handles mail received via uucp and passes it to the local
- sendmail (or workalike).
- .
- This version comes from the sendmail source package and the only
- change is the call to sendmail (from -obq to -obi).
- .
-Homepage: http://www.sendmail.org]]dnl
-dnl #
-dnl # The arch=any package: sensible-mda (debian private)
-dnl # Always built
-dnl #
-[[
-
-Package: sensible-mda
-Architecture: any
-Section: mail
-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
- split out in hopes that it might be useful for other MTA packages.
- .
- Sensible-mda is called by the MTA, and will in turn call whichever of
- the following MDAs that it finds (in this order):
- procmail, maildrop, deliver, mail.local]]dnl
-dnl #
-dnl # The arch=any package: libmilter
-dnl # Only built if MILTER is enabled
-dnl #
-ifelse([[yes]], [[yes]], [[[[
-
-Package: libmilter1
-Architecture: any
-Section: libs
-Depends: ${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
- to filter meta-information(headers) and content.
- .
- The Debian Sendmail package is built to support libmilter.
- .
- This package contains libmilter.so
- .
-Homepage: http://www.sendmail.org
-
-Package: libmilter1-dbg
-Architecture: any
-Section: libs
-Depends: libmilter1 (= ${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
- to filter meta-information(headers) and content.
- .
- The Debian Sendmail package is built to support libmilter.
- .
- This package contains debugging information for libmilter.so
- .
-Homepage: http://www.sendmail.org]]dnl
-dnl #
-dnl # The arch=any package: libmilter-dev
-dnl # Only built if MILTER is enabled
-dnl #
-[[
-
-Package: libmilter-dev
-Architecture: any
-Section: libdevel
-Depends: libmilter1 (= ${binary:Version})
-Suggests: sendmail-doc
-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
- to filter meta-information (headers) and content.
- .
- The Debian Sendmail package is built to support libmilter.
- .
- This is the libmilter static library and include files for development.
- .
- The documentation on building a Milter is in the sendmail-doc package.
- .
-Homepage: http://www.sendmail.org]]]])dnl
-dnl #
-dnl # The arch=all package: sendmail-doc
-dnl # Always built
-dnl #
-[[
-
-Package: sendmail-doc
-Architecture: all
-Section: doc
-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, although this means that its configuration
- can also be complex.
- .
- Don't try anything fancy in sendmail without using this for guidance.
- .
- Because of the complexity, you may find yourself wanting to peruse
- the documentation files included herein.  The main files are:
-   cf.README.gz    -- A reference for all things in sendmail.{mc,cf}
-   op.{ps,txt}.gz  -- The care and feeding of Sendmail.
-   faq.txt.gz      -- Sendmail FAQ, current as of the package date.
- .
- Other files include the references for smrsh and libmilter.
- .
-Homepage: http://www.sendmail.org]]dnl
-dnl #
-dnl # The arch=all package: sendmail
-dnl # Always built
-dnl #
-[[
-
-Package: sendmail
-Architecture: all
-Section: mail
-Replaces: sendmail-tls
-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,
- although this means that its configuration can also be complex.
- .
- Fortunately, simple thing can be done easily, and complex things
- are possible, even if not easily understood ;)  Sendmail is the *ONLY*
- MTA with a Turing complete language to control *ALL* aspects of delivery!
- .
- Sendmail provides Security and SPAM/UCE/UBE protection via several means.
- .
- Sendmail includes *no* Mail User Agents (MUA), you'll have to
- pick from the plethora of available MUAs (mutt, vm, etc.)
- .
- This package supports REGEX, DB, NIS, NIS+, LDAP, DNS maps,
- and has enabled TCPWrappers, IPv6, LockFile, SMTP AUTH(SASL), STARTTLS(SSL).
- .
- This package is to make installation/upgrading easier (Do NOT delete it)
- .
-Homepage: http://www.sendmail.org]]dnl
-dnl #
-dnl # The arch=all package: sendmail-base
-dnl # Always built
-dnl #
-[[
-
-Package: sendmail-base
-Architecture: all
-Section: mail
-Depends: m4, make, adduser, ${perl:Depends}
-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
- configurations, although this means that its configuration
- can also be complex.
- .
- This package contains the base, architecture independent, portions
- of the sendmail packages.
- .
-Homepage: http://www.sendmail.org]]dnl
-dnl #
-dnl # The arch=all package: sendmail-cf
-dnl # Always built
-dnl #
-[[
-
-Package: sendmail-cf
-Architecture: all
-Section: mail
-Suggests: sendmail-doc
-Depends: m4
-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, although this means that its configuration
- can also be complex.
- .
- This package contains the .m4 (configuration files) for the
- sendmail packages.
- .
-Homepage: http://www.sendmail.org]]dnl
-dnl #
-dnl # Provide the requisite trailing newline
-dnl #
-
-
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index 7ff23f1..f9647df 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -42,7 +42,7 @@ Provides: mail-transport-agent
 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
+Suggests: sendmail-doc, @sm_suggests@
 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,
diff --git a/debian/build/site.config.m4 b/debian/build/site.config.m4
deleted file mode 100644
index abd1f41..0000000
--- a/debian/build/site.config.m4
+++ /dev/null
@@ -1,241 +0,0 @@
-#-----------------------------------------------------------------------------
-# $Sendmail: site.config.m4,v 8.14.2 2007-11-02 22:20:56 cowboy Exp $
-#
-# Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
-#
-# build/site.config.m4.  Generated from site.config.m4.in by configure.
-#
-# Debian site.config.m4 for sendmail 8.14.2-1(527874)
-#
-# Note: the .in file supports 8.7.6 - 9.0.0, but the generated
-#	file is customized to the version noted above.
-#
-#-----------------------------------------------------------------------------
-#
-#------------------------------------------------------------------
-# Sendmail 8.14.2-1(527874) on 2007-11-02 at 22:20:56 (+0000)
-#------------------------------------------------------------------
-#
-#------------------------------------------------------------------
-# The following sendmail features are included
-#------------------------------------------------------------------
-#REGEX:      yes
-#NDBM:       no
-#NEWDB:      yes      -ldb-4.6
-#NIS:        yes
-#NISPLUS:    yes
-#LDAP:       yes       -lldap -llber
-#HESIOD:     no     
-#TCPD:       yes
-#BIND:       no
-#IPv6:       yes
-#Maillock:   yes
-#MILTER:     yes
-#SFIO:       no
-#AUTH:       yes		2
-#TLS:        yes
-#SHM:        yes
-#FFRs:        -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL
-#M4_FFRs:     define(`_FFR_MAIL_MACRO')
-#
-#------------------------------------------------------------------
-# Packages and build dependancies (Debian packages)
-#------------------------------------------------------------------
-#Sendmail:		sendmail
-#Build-Depends:	, libdb4.6-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev
-#Depends:		
-#Recommends:	
-#Suggests:		, sasl2-bin, libsasl2-modules | libsasl2-modules-plain | libsasl2-digestmd5-plain | libsasl2-digestmd5-des, openssl
-#
-#------------------------------------------------------------------
-# Build Setup
-#------------------------------------------------------------------
-#Autoconf version:     2.61
-#Automake version:	   1.10
-#DEBIAN_DH(DebHelper): 4.1				internal use(not reliable)
-#
-#DEB_BUILD_ARCH:	   amd64
-#DEB_BUILD_GNU_CPU:    x86_64
-#DEB_BUILD_GNU_SYSTEM: linux-gnu
-#DEB_BUILD_GNU_TYPE:   x86_64-linux-gnu
-#DEB_HOST_ARCH:		   amd64
-#DEB_HOST_GNU_CPU:	   x86_64
-#DEB_HOST_GNU_SYSTEM:  linux-gnu
-#DEB_HOST_GNU_TYPE:    x86_64-linux-gnu
-#
-#------------------------------------------------------------------
-# Autoconf variable settings				 defaults
-#------------------------------------------------------------------
-#prefix:		 /usr					 /usr/local
-#exec_prefix:	 /usr				 ${prefix}
-#bindir:		 /usr/bin					 ${exec_prefix}/bin
-#sbindir:		 /usr/sbin					 ${exec_prefix}/sbin
-#libexecdir:	 /usr/lib/sm.bin				 ${exec_prefix}/libexec
-#datadir:		 /usr/share					 ${prefix}/share
-#sysconfdir:	 /etc				 ${prefix}/etc
-#sharedstatedir: /usr/com			 ${prefix}/com
-#localstatedir:  /var			 ${prefix}/var
-#libdir:		 /usr/lib					 ${exec_prefix}/var
-#includedir:	 /usr/include				 ${prefix}/include
-#oldincludedir:  /usr/include			 /usr/include
-#infodir:		 /usr/share/info					 ${prefix}/info
-#mandir:		 /usr/share/man					 ${prefix}/man
-#docdir:		 /usr/share/doc					 ${prefix}/doc
-#srcdir:		 .					 configure or ..
-#
-#------------------------------------------------------------------
-# Build options for the various pieces parts of sendmail
-#------------------------------------------------------------------
-#
-# Make sure defaults are sound...
-define(`confLIBS', `')dnl # was -ldl
-#
-# global
-APPENDDEF(`confINCDIRS',	` ')
-APPENDDEF(`confMAPDEF',		` -DSOCKETMAP -DMAP_REGEX -DNEWDB -DNIS -DNISPLUS -DLDAPMAP')
-APPENDDEF(`confENVDEF',		` -DHASFCHMOD=1 -DHASSETRLIMIT=1 -DHASFLOCK=0 -DUSESETEUID=1 -DHASGETUSERSHELL=1 -DNETINET6')
-APPENDDEF(`confLIBS',		`')
-#
-# editmap
-APPENDDEF(`conf_editmap_ENVDEF',	`')
-APPENDDEF(`conf_editmap_LIBS',		` -ldb-4.6 -lldap -llber')
-#
-# libmilter
-APPENDDEF(`conf_libmilter_ENVDEF',	`-fPIC -DSM_CONF_POLL=1 -D_FFR_MULTILINE -D_FFR_SMFI_PROGRESS')
-APPENDDEF(`conf_libmilter_LIBS',	`')
-#
-# libsm
-APPENDDEF(`conf_libsm_ENVDEF',	`-fPIC -DHAVE_NANOSLEEP=1 -D_LDAP_EXAMPLE_ -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DSM_CONF_LDAP_MEMFREE')
-APPENDDEF(`conf_libsm_LIBS',	` -lldap -llber')
-#
-# libsmdb
-APPENDDEF(`conf_libsmdb_ENVDEF',	`')
-APPENDDEF(`conf_libsmdb_LIBS',		`')
-#
-# libsmutil
-APPENDDEF(`conf_libsmutil_ENVDEF',	`-fPIC')
-APPENDDEF(`conf_libsmutil_LIBS',	`')
-#
-# mail.local
-APPENDDEF(`conf_mail_local_ENVDEF',	` -DCONTENTLENGTH -DMAILLOCK')
-APPENDDEF(`conf_mail_local_LIBS',	` -lldap -llber -llockfile')
-#
-# mailstats
-APPENDDEF(`conf_mailstats_ENVDEF',	`')
-APPENDDEF(`conf_mailstats_LIBS',	` -lldap -llber')
-#
-# makemap
-APPENDDEF(`conf_makemap_ENVDEF',	`')
-APPENDDEF(`conf_makemap_LIBS',		` -ldb-4.6 -lldap -llber')
-#
-# praliases
-APPENDDEF(`conf_praliases_ENVDEF',	`')
-APPENDDEF(`conf_praliases_LIBS',	` -ldb-4.6 -lldap -llber')
-#
-# rmail
-APPENDDEF(`conf_rmail_ENVDEF',	`')
-APPENDDEF(`conf_rmail_LIBS',	` -lldap -llber')
-#
-# sendmail
-APPENDDEF(`conf_sendmail_ENVDEF',	` -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION  -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS  -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL')
-APPENDDEF(`conf_sendmail_LIBS',		` -ldb-4.6 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl')
-#
-# smrsh
-APPENDDEF(`conf_smrsh_ENVDEF',	` -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\"')
-APPENDDEF(`conf_smrsh_LIBS',	` -lldap -llber')
-#
-# vacation
-APPENDDEF(`conf_vacation_ENVDEF',	`')
-APPENDDEF(`conf_vacation_LIBS',		` -ldb-4.6 -lldap -llber')
-#
-#------------------------------------------------------------------
-# Build-time selection not handled by autoconf above
-#------------------------------------------------------------------
-# none, for the nonce...
-#
-#------------------------------------------------------------------
-# Global Build time configuration
-#------------------------------------------------------------------
-# compilation/link
-define(`confCC',		`cc')dnl                  #Compiler
-define(`confOPTIMIZE',  `-g -Wall -O2 -fPIC -fstack-protector-all')dnl              #Optimization
-define(`confCCOPTS',	`')dnl                      #CC options
-define(`confCCOPTS_SO'	`-fPIC')dnl                 #Shared libraries
-define(`confLD',		confCC)dnl                  #Linker
-define(`confLDOPTS',	`-pie -Wl,-z,noexecstack,-z,relro,-z,now -Wl,--warn-shared-textrel')dnl             #Linker opts
-define(`confLDOPTS_SO',	`-shared -fPIC -pie -Wl,-z,noexecstack,-z,relro,-z,now -Wl,--warn-shared-textrel')dnl #linker shared lib
-define(`confLIBDIRS',	`')dnl                      #-L linker flags
-define(`confMTCCOPTS',	`-D_REENTRANT')dnl          #Multi-thread cc opts
-define(`confMTLDOPTS',	`-lpthread')dnl             #Multi-thread ld opts
-define(`confSHAREDLIB_EXT', `.so')dnl               #
-define(`confSHAREDLIB_SUFFIX', `')dnl               #
-define(`confSHAREDLIBDIR', `/usr/lib')dnl           #
-define(`confSONAME',`-soname')dnl                   #
-#
-# paths, owners, and modes
-#	Note: can't use smmsp here, it is dynamically created
-#	Note: EBINDIR deserves a better home, suggestions?
-define(`confEBINDIR',	`/usr/lib/sm.bin')dnl          #mail.local,smrsh,etc.
-define(`confGBINGRP',	`mail')dnl                  #sgid binary group smmsp
-define(`confGBINMODE',	`02755')dnl                 #sgid binary mode
-define(`confGBINOWN',	`root')dnl                  #sgid binary owner
-define(`confHFDIR',		`/etc/mail')dnl     #helpfile dir
-define(`confHFFILE',	`helpfile')dnl              #helpfile name
-define(`confINCGRP',	`root')dnl                  #include group
-define(`confINCMODE',	`0744')dnl                  #include mode
-define(`confINCOWN',	`root')dnl                  #include owner
-ifelse(eval(527874 >= 527363), `1',dnl
-`define(`confINCLUDEDIR',`/usr/include')dnl           #include target',
-`define(`confINCLUDEDIR',`/usr/include/libmilter')dnl #include target'
-)dnl
-define(`confINST_DEP',	`')dnl                      #submit.cf clientmqueue
-define(`confLIBDIR',	`/usr/lib/libmilter')dnl    #library dir
-define(`confLIBGRP',	`root')dnl                  #library group
-define(`confLIBMODE',	`0744')dnl                  #library mode
-define(`confLIBOWN',	`root')dnl                  #library owner
-define(`confMANROOT',	`/usr/share/man/man')dnl          #man root
-define(`confMANROOTMAN',`/usr/share/man/man')dnl          #man root
-define(`confMANGRP',	`root')dnl                  #man group
-define(`confMANMODE',	`0744')dnl                  #man mode
-define(`confMANOWN',	`root')dnl                  #man owner
-define(`confMBINDIR',	`/usr/lib/sm.bin')dnl          #MTA bindir /usr/sbin
-define(`confMBINGRP',	`root')dnl                  #MTA bin grp
-define(`confMBINMODE',	`0755')dnl                  #MTA bin mode
-define(`confMBINOWN',	`root')dnl                  #MTA bin owner
-define(`confMSPQOWN',	`mail')dnl                  #MSP queue owner smmsp
-define(`confMSP_QUEUE_DIR', `/var/spool/mqueue-client')dnl
-define(`confSBINDIR',	`/usr/lib/sm.bin')dnl          #suid bin dir /usr/sbin
-define(`confSBINGRP',	`root')dnl                  #suid bin grp
-define(`confSBINMODE',	`04755')dnl                 #suid bin mode
-define(`confSBINOWN',	`root')dnl                  #suid bin owner
-#	Note, STDIR in /var/lib/sendmail... default is /var/spool/mqueue
-define(`confSTDIR',		`/var/lib/sendmail')dnl #Statistics dir
-define(`confSTFILE',	`statistics')dnl            #statistics name
-define(`confMSP_STFILE',`sm-client.st')dnl          #MSP statistics name
-define(`confSTMODE',	`0660')dnl                  #statistics mode
-define(`confUBINDIR',	`/usr/lib/sm.bin')dnl          #usr bin dir /usr/bin
-define(`confUBINGRP',	`mail')dnl                  #usr bin grp smmsp
-define(`confUBINMODE',	`0755')dnl                  #usr bin mode
-define(`confUBINOWN',	`root')dnl                  #usr bin owner
-#
-# don't provide links, I'll do them myself later
-# sigh... must have something in there or $(make install) croaks -- temp file
-define(`confLINKS', `sendmail-bin')dnl
-define(`confMTA_LINKS')dnl
-#
-# Force rmail installation
-define(`confFORCE_RMAIL')dnl
-#
-# don't install formatted man pages or sendmail.st
-dnl define(`confNO_MAN_INSTALL')dnl
-dnl define(`confNO_MAN_BUILD')dnl
-define(`confINSTALL_RAWMAN')dnl
-define(`confDONT_INSTALL_CATMAN', `')dnl # for 8.12
-define(`confMANDOC', `')dnl		         # for 8.9.3
-define(`confNROFF',  `cat')dnl	         # for 8.9.3
-define(`confNO_STATISTICS_INSTALL')dnl
-#
-# flags
-#
-# Tests (should be temporary)
-#
diff --git a/debian/build/update_chaos b/debian/build/update_chaos
deleted file mode 100644
index 5559766..0000000
--- a/debian/build/update_chaos
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/bin/sh
-#-----------------------------------------------------------------------------
-# $Sendmail: update_chaos,v 8.14.2 2007-11-02 22:20:56 cowboy Exp $
-#
-# Copyright (c) 2001-2007 Richard Nelson.  All Rights Reserved.
-#
-# build/update_chaos.  Generated from update_chaos.in by configure.
-#
-# Debian script to rationalize builds for Sendmail 8.14.2-1(@sm_math@)
-#
-# Note: the .in file supports 8.7.6 - 9.0.0, but the generated
-#	file is customized to the version noted above.
-#
-#-----------------------------------------------------------------------------
-set -e;
-
-#------------------------------------------------------------------
-# Exit, stage left, even... if not needed (private dir, or >= 8.10.0)
-#------------------------------------------------------------------
-BUILD_TREE='./../../build-tree/sendmail-8.14.2';
-if [ ! -d ${BUILD_TREE} ]; then
-	exit 0;
-	fi;
-if [ -d ${BUILD_TREE}/devtools/bin ]; then
-	exit 0;
-	fi;
-
-echo "Rationalizing Sendmail-8.14.2 setup...";
-
-#------------------------------------------------------------------
-# List of subdirectories to work on
-#------------------------------------------------------------------
-SUBDIRS="editmap libmilter mail.local mailstats
-	makemap praliases rmail sendmail smrsh vacation";
-
-#------------------------------------------------------------------
-# Match Sendmail's build directory conventions
-#------------------------------------------------------------------
-os=`uname -s | sed -e 's/\//-/g' -e 's/ //g'`;
-rel=`uname -r | sed -e 's/(/-/g' -e 's/)//g'`;
-arch=`uname -m | sed -e 's/ //g'`;
-OBJ_DIR="obj.${os}.${rel}.${arch}";
-
-#------------------------------------------------------------------
-# Function to escape quotes (to survive subsequent sed)
-#------------------------------------------------------------------
-esq () {
-	result=$(echo "${1}" | sed -e 's?\"?\\\\\\\"?g');
-	};
-
-#------------------------------------------------------------------
-# Prior to 8.10.0, sendmail source was in the src directory
-# Prior to 8.10.0, devtools was called BuildTools
-#	Create compatibility links (to look like 8.10.0+)
-#------------------------------------------------------------------
-if [ ! -d ${BUILD_TREE}/sendmail ]; then
-	echo "...Creating \${BUILD_TREE}/sendmail compatibility symlink";
-	ln -sf src ${BUILD_TREE}/sendmail;
-	if [ ! -d ${BUILD_TREE}/devtools ]; then
-		echo "...Creating \${BUILD_TREE}/devtools compatibility symlink";
-		ln -sf BuildTools ${BUILD_TREE}/devtools;
-		fi;
-	fi;
-
-#------------------------------------------------------------------
-# Prior to 8.10.0, objects were in the source directories, not separate
-#	Create compatibility links (to look like 8.10.0+)
-#------------------------------------------------------------------
-echo "...Creating ${OBJ_DIR}/<dir> directories";
-mkdir -p ${BUILD_TREE}/${OBJ_DIR};
-for subdir in $SUBDIRS; do
-	if [ -d ${BUILD_TREE}/${subdir} ]; then
-		ln -sf "../${subdir}/${OBJ_DIR}" \
-			${BUILD_TREE}/${OBJ_DIR}/${subdir};
-		fi;
-	done;
-
-#------------------------------------------------------------------
-# If 8.9.0+, we're done, get the flock outa here...
-#------------------------------------------------------------------
-if [ -e ${BUILD_TREE}/sendmail/Build ]; then
-	echo '...Done.';
-	exit 0;
-	fi;
-
-#------------------------------------------------------------------
-# Prior to 8.9.0, READ_ME was seen in a few places
-#	Create compatibility links
-#------------------------------------------------------------------
-echo '...Creating READ_ME compatility symlinks';
-for file in $(find ${BUILD_TREE} -name 'READ_ME'); do
-	ln -sf READ_ME $(echo "${file}" | sed -e 's/READ_ME/README/');
-	done;
-
-#------------------------------------------------------------------
-# Prior to 8.9.0, MAKE was used instead of Build
-#	 We'll install a small wrapper for the earlier releases
-# Prior to 8.9.0, Only src directory had an obj.* subdirectory
-#	Create compatibility links (to look like 8.9.0+)
-#------------------------------------------------------------------
-echo "...Creating <dir>/${OBJ_DIR}";
-for subdir in $SUBDIRS; do
-	if [ -d ${BUILD_TREE}/${subdir} ]; then
-		if [ ! -d ${BUILD_TREE}/${subdir}/Makefiles ]; then
-			mkdir -p ${BUILD_TREE}/${subdir}/${OBJ_DIR};
-			for file in `find ${BUILD_TREE}/${subdir} -type f`; do 
-				cp -a $file ${BUILD_TREE}/${subdir}/${OBJ_DIR};
-				done;
-			fi;
-		cp -a debian/build/Build ${BUILD_TREE}/${subdir}/;
-		fi;
-	done;
-#
-#------------------------------------------------------------------
-# Kluge the Makefiles to comply with our file locations.
-#------------------------------------------------------------------
-echo '...Kluging Makefiles';
-for file in mailstats/Makefile.dist \
-	mail.local/Makefile.dist \
-	makemap/Makefile.dist \
-	praliases/Makefile.dist \
-	smrsh/Makefile.dist \
-	src/Makefiles/Makefile.Linux \
-	; do
-	cp -a ${BUILD_TREE}/${file} ${BUILD_TREE}/${file}.save;
-	#
-	# Set local variables to allow for quoting...
-	esq " ";
-	sm_incdirs=$result;
-	esq " -DSOCKETMAP -DMAP_REGEX -DNEWDB -DNIS -DNISPLUS -DLDAPMAP";
-	sm_mapdef=$result;
-	esq " -DHASFCHMOD=1 -DHASSETRLIMIT=1 -DHASFLOCK=0 -DUSESETEUID=1 -DHASGETUSERSHELL=1 -DNETINET6";
-	sm_envdef=$result;
-	esq "";
-	sm_libs=$result;
-	#
-	# global
-	sed  \
-		-e 's?-I/usr/sww/include??' \
-		-e 's?-I/usr/local/include??' \
-		-e 's?-L/usr/sww/lib??' \
-		-e 's?../src?../../src?g' \
-		-e "s?^INCDIRS=\(.*\)\$?INCDIRS=\1 $sm_incdirs?" \
-		-e "s?^DBMDEF=.*?DBMDEF=$sm_mapdef?" \
-		-e "s?^ENVDEF=\(.*\)\$?ENVDEF=\1 $sm_envdef?" \
-		-e "s?^LIBS=.*?LIBS=$sm_libs?" \
-	${BUILD_TREE}/${file} > ${BUILD_TREE}/${file}.new;
-	mv ${BUILD_TREE}/${file}.new ${BUILD_TREE}/${file};
-	#
-	# compilation/link
-	sed \
-		-e 's?^O=.*?O=-g -Wall -O2 -fPIC -fstack-protector-all?' \
-		-e 's?^LIBDIRS=.*?LIBDIRS=?' \
-	${BUILD_TREE}/${file} > ${BUILD_TREE}/${file}.new;
-	mv ${BUILD_TREE}/${file}.new ${BUILD_TREE}/${file};
-
-	#
-	# paths, owners, and modes
-	#	Note: EBINDIR deserves a better home, suggestions?
-	sed \
-		-e 's?^BINDIR=.*?BINDIR=${DESTDIR}/usr/sbin?' \
-		-e 's?^BINMODE=.*?BINMODE=04755?' \
-		-e 's?^BINGRP=.*?BINGRP=mail?' \
-		-e 's?^BINOWN=.*?BINOWN=root?' \
-		-e 's?^HFDIR=.*?HFDIR=${DESTDIR}/etc/mail?' \
-		-e 's?^STDIR=.*?STDIR=${DESTDIR}/var/lib/sendmail?' \
-	${BUILD_TREE}/${file} > ${BUILD_TREE}/${file}.new;
-	mv ${BUILD_TREE}/${file}.new ${BUILD_TREE}/${file};
-
-	if [ "${file}" = 'mail.local/Makefile.dist' \
-		-o "${file}" = 'smrsh/Makefile.dist' \
-		]; then
-		sed \
-			-e 's?^BINDIR=.*?BINDIR=${DESTDIR}/usr/lib/sm.bin?' \
-			-e 's?^BINMODE=.*?BINMODE=04755?' \
-			-e 's?^BINGRP=.*?BINGRP=mail?' \
-			-e 's?^BINOWN=.*?BINOWN=root?' \
-		${BUILD_TREE}/${file} > ${BUILD_TREE}/${file}.new;
-		echo 'force-install: install' >> ${BUILD_TREE}/${file}.new;
-		mv ${BUILD_TREE}/${file}.new ${BUILD_TREE}/${file};
-
-	elif [ "${file}" = 'mailstats/Makefile.dist' \
-		-o "${file}" = 'makemap/Makefile.dist' \
-		-o "${file}" = 'praliases/Makefile.dist' \
-		]; then
-		sed \
-			-e 's?^BINDIR=.*?BINDIR=${DESTDIR}/usr/sbin?' \
-			-e 's?^BINMODE=.*?BINMODE=0755?' \
-			-e 's?^BINGRP=.*?BINGRP=mail?' \
-			-e 's?^BINOWN=.*?BINOWN=root?' \
-		${BUILD_TREE}/${file} > ${BUILD_TREE}/${file}.new;
-		mv ${BUILD_TREE}/${file}.new ${BUILD_TREE}/${file};
-		fi;
-
-	# For most directories, replace Makefile with our updated Makefile.dist
-	if [ "${file}" != 'src/Makefiles/Makefile.Linux' ]; then
-		cp ${BUILD_TREE}/${file} \
-			$(dirname "${BUILD_TREE}/${file}")/${OBJ_DIR}/Makefile;
-		fi;
-	done;
-
-echo '...Done.';