Imported Debian patch 8.14.2-5debian/8.14.2-5

17 files changed, 425 insertions, 242 deletions

diff --git a/debian/Makefile.in b/debian/Makefile.in
index 1fda743..c3118b7 100644
--- a/debian/Makefile.in
+++ b/debian/Makefile.in
@@ -100,7 +100,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	./build/install-sh ./build/missing ./build/mkinstalldirs \
 	AUTHORS COPYING ChangeLog INSTALL NEWS TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index 68e2219..ec6b8f0 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,9 +2,9 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.2 2008-04-09 21:05:31 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.2 2008-04-21 18:20:36 cowboy Exp $
 #
-# Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
+# Copyright (c) 1998-2008 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> 2008-04-09 21:05:31 (-0700)
+# Richard Nelson <cowboy@debian.org> 2008-04-21 18:20:36 (-0700)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
@@ -70,12 +70,12 @@ INSTALL_SCRIPT := ${INSTALL} -m 0755
 # AutoConfig generated
 #AC_CC	:= cc
 #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_DEFS := -g -Wall -O2 -fPIC -fstack-protector-all -g -Wall -O2 -fPIC -fstack-protector-all -DPACKAGE_NAME=\"Sendmail\" -DPACKAGE_TARNAME=\"sendmail\" -DPACKAGE_VERSION=\"8.14.3\" -DPACKAGE_STRING=\"Sendmail\ 8.14.3\" -DPACKAGE_BUGREPORT=\"bug/reportbug\ or\ sendmail@packages.debian.org\" -DPACKAGE=\"sendmail\" -DVERSION=\"8.14.3\" -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_LIBMILTER_MFAPI_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
-sm_libmilter_version := 1
+sm_libmilter_version := 1.0.0
 
 # Define standard compile/install flags (skip if not yet configured)
 DUMMY_CC := $(shell echo '-CC-' | tr '-' '@')
diff --git a/debian/build/debian/sendmail-base.postinst.in b/debian/build/debian/sendmail-base.postinst.in
index f726fcc..769e441 100644
--- a/debian/build/debian/sendmail-base.postinst.in
+++ b/debian/build/debian/sendmail-base.postinst.in
@@ -92,12 +92,12 @@ case "$1" in
 		if [ -x /usr/sbin/update-inetd ]; then
 			update-inetd --remove "^587";
 			update-inetd --group MAIL --add \
-				"#<off># smtp\tstream\ttcp\tnowait\troot\t@sbindir@/sendmail sendmail -Am -bs";
+				"smtp\tstream\ttcp\tnowait\troot\t@sbindir@/sendmail sendmail -Am -bs";
 			update-inetd --group MAIL --add \
-				"#<off># submission\tstream\ttcp\tnowait\troot\t@sbindir@/sendmail sendmail -Am -bs";
+				"submission\tstream\ttcp\tnowait\troot\t@sbindir@/sendmail sendmail -Am -bs";
 			update-inetd --group MAIL --add \
-				"#<off># smtps\tstream\ttcp\tnowait\troot\t@sbindir@/sendmail sendmail -Am -bs";
-			update-inetd --group MAIL --disable smtp,smtps,submission;
+				"smtps\tstream\ttcp\tnowait\troot\t@sbindir@/sendmail sendmail -Am -bs";
+			update-inetd --group MAIL --multi --disable smtp,smtps,submission;
 			fi;	
 
 		;;
diff --git a/debian/cf/Makefile.in b/debian/cf/Makefile.in
index 522f761..53a252e 100644
--- a/debian/cf/Makefile.in
+++ b/debian/cf/Makefile.in
@@ -35,7 +35,8 @@ target_triplet = @target@
 subdir = cf
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/./build/mkinstalldirs
diff --git a/debian/changelog b/debian/changelog
index be8a1cf..8bcc476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+sendmail (8.14.2-5) unstable; urgency=low
+
+  * Determine libmilter library level dynamically - using the upstream
+    notation of <version-major>.<version-minor>.<patch-level>
+
+    This way, I don't need to remember to bump .so levels by hand, as
+    upstream is pretty good about incompatabilites - and the package
+    name directly corresponds with what a milter developer/builder
+    needs to know (instead of libmilter2 == 1.0.1) - though the sendmail
+    version also gives that information.
+
+    This does affect the milter packages, who currently link against
+    libmilter1, as the new name is libmilter1.0.0 (the -dev package
+    keeps is name; libmilter-dev).
+
+    NOTE: things will continue work until milters are rebuilt - as
+    the old library package still works.
+
+    With this change, when 8.14.3 is shipped, it will automatically
+    create libmilter1.0.1 (a bump in the patch level).
+
+    I thought about adding a compat symlink, but the milters don't seem
+    to be written in a way that makes that possible - they apparently are
+    checking exact values of SMFI_VERSION, instead of
+      SM_LM_VRS_MAJOR(SMFI_VERSION) & SM_LM_VRS_MINOR(SMFI_VERSION)
+    and so don't work with the newer 1.0.1 level anyway (trust me) :(
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 21 Apr 2008 18:04:00 -0000
+
 sendmail (8.14.2-4) unstable; urgency=low
 
   * remove bad brackets from example access IPv6  Closes: #471086
@@ -11,7 +40,7 @@ sendmail (8.14.2-4) unstable; urgency=low
   * 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
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 03 Apr 2008 15:55:00 -0000
 
 sendmail (8.14.2-3) unstable; urgency=low
 
diff --git a/debian/configure b/debian/configure
index 961d6bb..f574a5b 100644
--- a/debian/configure
+++ b/debian/configure
@@ -1,19 +1,19 @@
 #! /bin/sh
-# From configure.ac Revision: 8.14.2 .
+# From configure.ac Revision: 8.14.3 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Sendmail 8.14.2.
+# Generated by GNU Autoconf 2.61 for Sendmail 8.14.3.
 #
 # Report bugs to <bug/reportbug or sendmail@packages.debian.org>.
 #
 # #
 # #	$Sendmail$
-# #	   from Sendmail: ./configure.ac,v 8.14.2 2007-10-04 21:42:00
+# #	   from Sendmail: ./configure.ac,v 8.14.3 2008-04-21 16:15:00
 # #
 # cat <<EOF
 #
-#    Copyright (c) 1998-2007 Richard Nelson.	All Rights Reserved.
+#    Copyright (c) 1998-2008 Richard Nelson.	All Rights Reserved.
 #
-#    Sendmail 8.14.2
+#    Sendmail 8.14.3
 #    Generated by Autoconf 2.61,  Automake _am_version
 #
 #    Debian configure script for building Sendmail
@@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Sendmail'
 PACKAGE_TARNAME='sendmail'
-PACKAGE_VERSION='8.14.2'
-PACKAGE_STRING='Sendmail 8.14.2'
+PACKAGE_VERSION='8.14.3'
+PACKAGE_STRING='Sendmail 8.14.3'
 PACKAGE_BUGREPORT='bug/reportbug or sendmail@packages.debian.org'
 
 ac_unique_file="./build/site.config.m4.in"
@@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sendmail 8.14.2 to adapt to many kinds of systems.
+\`configure' configures Sendmail 8.14.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1415,7 +1415,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sendmail 8.14.2:";;
+     short | recursive ) echo "Configuration of Sendmail 8.14.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1524,7 +1524,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sendmail configure 8.14.2
+Sendmail configure 8.14.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1534,13 +1534,13 @@ gives unlimited permission to copy, distribute and modify it.
 
 #
 #	$Sendmail$
-#	   from Sendmail: ./configure.ac,v 8.14.2 2007-10-04 21:42:00
+#	   from Sendmail: ./configure.ac,v 8.14.3 2008-04-21 16:15:00
 #
 cat <<EOF
 
-   Copyright (c) 1998-2007 Richard Nelson.	All Rights Reserved.
+   Copyright (c) 1998-2008 Richard Nelson.	All Rights Reserved.
 
-   Sendmail 8.14.2
+   Sendmail 8.14.3
    Generated by Autoconf 2.61,  Automake _am_version
 
    Debian configure script for building Sendmail
@@ -1557,7 +1557,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sendmail $as_me 8.14.2, which was
+It was created by Sendmail $as_me 8.14.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1910,6 +1910,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
 ac_aux_dir=
 for ac_dir in ./build "$srcdir"/./build; do
   if test -f "$ac_dir/install-sh"; then
@@ -2372,7 +2373,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sendmail'
- VERSION='8.14.2'
+ VERSION='8.14.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2547,11 +2548,11 @@ am_version="_am_version";
 am_version="$am__api_version";
 
 
-SM_VERS='8.14.2';
-SM_DATE='2007-10-04 21:42:00';
+SM_VERS='8.14.3';
+SM_DATE='2008-04-21 16:15:00';
 SM_MINVERS='8.7.6';
 SM_MAXVERS='9.0.0';
-SM_CPYRT='2007';
+SM_CPYRT='2008';
 
 
 
@@ -2607,7 +2608,7 @@ PACKAGE_STRING="${PACKAGE_NAME} ${PACKAGE_VERSION}";
 #	beta  = suffix for beta version (8.12.0.Beta7 -> 7)
 #	math  = for numeric (<, >=, etc.) comparisons
 #		 9.0.0	 = 589824  (9.0  = 589824)
-#		 8.14.1  = 527873  (8.14 = 527872)
+#		 8.14.3  = 527875  (8.14 = 527872)
 #		 8.13.1  = 527617  (8.13 = 527616)
 #		 8.12.11 = 527371  (8.12 = 527360)
 #		 8.11.7  = 527111  (8.11 = 527104)
@@ -4910,68 +4911,13 @@ if test "$sm_enable_shm" != "no"; then
 # Milter (_FFR_ on 8.10, 8.11, native on 8.12+)
 if test "$sm_enable_milter" != "no"; then
 	sm_libmilter_envdef="$sm_libmilter_envdef -DSM_CONF_POLL=1";
-	sm_libmilter_version=0;
-	v2i 8.14.0;
-	if  test $sm_version_math -ge $sm_version_test; then
-		sm_libmilter_version=1;
-		fi;
-	v2i 8.10.0;
-	if	test $sm_version_math -ge $sm_version_test; then
-		sm_enable_milter=yes;
-		v2i 8.12.0;
-		if	test $sm_version_math -ge $sm_version_test; then
-			sm_libmilter_envdef="$sm_libmilter_envdef -D_FFR_MULTILINE";
-			v2i 8.13.0;
-			if	test $sm_version_math -lt $sm_version_test; then
-				sm_sendmail_envdef="$sm_sendmail_envdef -DMILTER";
-				sm_libmilter_envdef="$sm_libmilter_envdef \
--D_FFR_MILTER_ROOT_UNSAFE";
-				fi;
-			sm_libmilter_libs="$sm_libmilter_libs"
-		else
-			sm_libmilter_envdef="$sm_libmilter_envdef -D_FFR_MILTER";
-			sm_sendmail_envdef="$sm_sendmail_envdef -D_FFR_MILTER";
-			fi;
-		v2i 8.11.0;
-		if	test $sm_version_math -ge $sm_version_test; then
-			sm_libmilter_envdef="$sm_libmilter_envdef -D_FFR_SMFI_PROGRESS";
-			fi;
-		fi;
-	fi;
-
-
-# SFIO (required for TLS and security layer of SASL on 8.11)
-# We'll let it go through here on any version (to check headers), but
-# issue no messages unless needed...
-if test "$sm_enable_tls" != "no"; then
-	if test $sm_enable_sfio != no; then
-		sm_enable_sfio=auto;
-	elif test $sm_enable_tls = yes; then
-		if test "$sm_version_major" = "8.11"; then
-			{ { echo "$as_me:$LINENO: error: SFIO is disabled, but you asked for TLS" >&5
-echo "$as_me: error: SFIO is disabled, but you asked for TLS" >&2;}
-   { (exit 1); exit 1; }; }
-			fi;
-	elif test $sm_enable_tls = auto; then
-		if test "$sm_version_major" = "8.11"; then
-			{ echo "$as_me:$LINENO: WARNING: SFIO is disabled, not trying TLS" >&5
-echo "$as_me: WARNING: SFIO is disabled, not trying TLS" >&2;}
-			fi;
-		fi;
-elif test $sm_enable_sfio != no; then
-	if test "$sm_version_major" = "8.11"; then
-		{ echo "$as_me:$LINENO: WARNING: TLS is disabled, no need for SFIO" >&5
-echo "$as_me: WARNING: TLS is disabled, no need for SFIO" >&2;}
-		fi;
-	sm_enable_sfio=no;
-	fi;
 
-#-------------------------------------------------------------------
-#
-# Check for presence of REGEX headers
-#
-sm_have_regex=no;
-if test $sm_enable_regex != no; then
+	# Determin which level of the milter interface we're using
+	sm_libmilter_version=0;
+	old_cflags="$CFLAGS";
+	old_cppflags="$CFLAGS";
+	export CFLAGS="$CFLAGS -I $PWD/../build-tree/*/include";
+	export CPPFLAGS="$CPPFLAGS -I $PWD/../build-tree/*/include";
 	# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 
@@ -5042,6 +4988,279 @@ done
 
 
 
+for ac_header in libmilter/mfapi.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ------------------------------------------------------------ ##
+## Report this to bug/reportbug or sendmail@packages.debian.org ##
+## ------------------------------------------------------------ ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ sm_have_mfapi=yes
+
+else
+  sm_have_mfapi=no
+          sm_libmilter_version=0
+fi
+
+done
+
+	if test "$sm_have_mfapi" = 'yes'; then
+		{ echo "$as_me:$LINENO: checking libmilter version" >&5
+echo $ECHO_N "checking libmilter version... $ECHO_C" >&6; }
+		cat >conftest.$ac_ext <<_ACEOF
+
+			#include <stdlib.h>
+			#include <stdio.h>
+			#include <string.h>
+			#include "libmilter/mfapi.h"
+			char vers[30] = "0";
+			int main (void) {
+				snprintf(vers
+				        ,sizeof(vers)
+				        ,"%d%c%d%c%d"
+				        ,SM_LM_VRS_MAJOR(SMFI_VERSION)
+				        ,'.'
+				        ,SM_LM_VRS_MINOR(SMFI_VERSION)
+				        ,'.'
+				        ,SM_LM_VRS_PLVL(SMFI_VERSION)
+				        );
+				fprintf(stdout
+				       ,"%s\n"
+				       ,vers
+				       );
+				return 0;
+				}
+
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext >conftest.out 2>conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  sm_libmilter_version="$(cat conftest.out)"
+
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+sm_libmilter_version=0
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+		 { echo "$as_me:$LINENO: result: $sm_libmilter_version" >&5
+echo "${ECHO_T}$sm_libmilter_version" >&6; }
+		fi;
+	export CFLAGS="$old_cflags";
+	export CPPFLAGS="$old_cppflags";
+
+	v2i 8.10.0;
+	if	test $sm_version_math -ge $sm_version_test; then
+		sm_enable_milter=yes;
+		v2i 8.12.0;
+		if	test $sm_version_math -ge $sm_version_test; then
+			sm_libmilter_envdef="$sm_libmilter_envdef -D_FFR_MULTILINE";
+			v2i 8.13.0;
+			if	test $sm_version_math -lt $sm_version_test; then
+				sm_sendmail_envdef="$sm_sendmail_envdef -DMILTER";
+				sm_libmilter_envdef="$sm_libmilter_envdef \
+-D_FFR_MILTER_ROOT_UNSAFE";
+				fi;
+			sm_libmilter_libs="$sm_libmilter_libs"
+		else
+			sm_libmilter_envdef="$sm_libmilter_envdef -D_FFR_MILTER";
+			sm_sendmail_envdef="$sm_sendmail_envdef -D_FFR_MILTER";
+			fi;
+		v2i 8.11.0;
+		if	test $sm_version_math -ge $sm_version_test; then
+			sm_libmilter_envdef="$sm_libmilter_envdef -D_FFR_SMFI_PROGRESS";
+			fi;
+		fi;
+	fi;
+
+
+# SFIO (required for TLS and security layer of SASL on 8.11)
+# We'll let it go through here on any version (to check headers), but
+# issue no messages unless needed...
+if test "$sm_enable_tls" != "no"; then
+	if test $sm_enable_sfio != no; then
+		sm_enable_sfio=auto;
+	elif test $sm_enable_tls = yes; then
+		if test "$sm_version_major" = "8.11"; then
+			{ { echo "$as_me:$LINENO: error: SFIO is disabled, but you asked for TLS" >&5
+echo "$as_me: error: SFIO is disabled, but you asked for TLS" >&2;}
+   { (exit 1); exit 1; }; }
+			fi;
+	elif test $sm_enable_tls = auto; then
+		if test "$sm_version_major" = "8.11"; then
+			{ echo "$as_me:$LINENO: WARNING: SFIO is disabled, not trying TLS" >&5
+echo "$as_me: WARNING: SFIO is disabled, not trying TLS" >&2;}
+			fi;
+		fi;
+elif test $sm_enable_sfio != no; then
+	if test "$sm_version_major" = "8.11"; then
+		{ echo "$as_me:$LINENO: WARNING: TLS is disabled, no need for SFIO" >&5
+echo "$as_me: WARNING: TLS is disabled, no need for SFIO" >&2;}
+		fi;
+	sm_enable_sfio=no;
+	fi;
+
+#-------------------------------------------------------------------
+#
+# Check for presence of REGEX headers
+#
+sm_have_regex=no;
+if test $sm_enable_regex != no; then
+
 for ac_header in regex.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -8827,24 +9046,28 @@ done
 
 	if test $ac_cv_header_tcpd_h = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+			/* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-			int allow_severity = 0;
-			int deny_severity  = 0;
+				#include <tcpd.h>
+				extern int allow_severity;
+				extern int deny_severity;
+				struct request_info *request;
 
 
 int
 main ()
 {
-hosts_access()
+hosts_access(request);
 
   ;
   return 0;
 }
+
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -11062,7 +11285,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sendmail $as_me 8.14.2, which was
+This file was extended by Sendmail $as_me 8.14.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11109,7 +11332,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Sendmail config.status 8.14.2
+Sendmail config.status 8.14.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/debian/configure.ac b/debian/configure.ac
index 13d39b2..4f336c9 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -1,20 +1,20 @@
-#------------------------------------------------------------------------------
+]#------------------------------------------------------------------------------
 #
 #	$Sendmail: ./configure.ac,v 8.14.1 2007/10/04 21:42:00 cowboy Exp $
 #
-#	Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
+#	Copyright (c) 1998-2008 Richard Nelson.  All Rights Reserved.
 #
 #	Debian configure file for building Sendmail
-#	  Note: this file supports Sendmail 8.7.6 - 8.14.1
+#	  Note: this file supports Sendmail 8.7.6 - 8.14.3
 #			and has been tested on autoconf 2.12, 2.13, 2.50, 2.52, 2.53
 #
 #	  Note: Most of this file is vanilla 2.12, but the copyright and
 #			ac_init portion are dual-pathed to better support 2.50+
 #
 #------------------------------------------------------------------------------
-define([_SM_CPYRT],  [2007])dnl
-define([_SM_VERS],	[8.14.2])dnl
-define([_SM_DATE],	[2007-10-04 21:42:00])dnl
+define([_SM_CPYRT],  [2008])dnl
+define([_SM_VERS],	[8.14.3])dnl
+define([_SM_DATE],	[2008-04-21 16:15:00])dnl
 define([_SM_MAXVERS],[9.0.0])dnl
 define([_SM_MINVERS],[8.7.6])dnl
 
@@ -84,7 +84,8 @@ EOF
 AC_REVISION([$Revision: ]_SM_VERS[ $])
 define([AC_INIT_BINSH],)dnl
 ifdef([AC_COPYRIGHT],[
-AC_INIT([Sendmail],_SM_VERS,[bug/reportbug or sendmail@packages.debian.org])
+AC_INIT([Sendmail],[_SM_VERS],[bug/reportbug or sendmail@packages.debian.org])
+AC_CONFIG_MACRO_DIR(./build)
 AC_CONFIG_SRCDIR([./build/site.config.m4.in])dnl
 ],[
 AC_INIT(./build/site.config.m4.in)
@@ -93,7 +94,7 @@ AC_INIT(./build/site.config.m4.in)
 AC_SUBST(PACKAGE_NAME) AC_SUBST(PACKAGE_STRING)
 ])dnl
 AC_CONFIG_AUX_DIR([./build])dnl
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 AC_ARG_PROGRAM
 AC_PROG_MAKE_SET
 AM_INIT_AUTOMAKE
@@ -172,7 +173,7 @@ PACKAGE_STRING="${PACKAGE_NAME} ${PACKAGE_VERSION}";]
 #	beta  = suffix for beta version (8.12.0.Beta7 -> 7)
 #	math  = for numeric (<, >=, etc.) comparisons
 #		 9.0.0	 = 589824  (9.0  = 589824)
-#		 8.14.1  = 527873  (8.14 = 527872) 
+#		 8.14.3  = 527875  (8.14 = 527872) 
 #		 8.13.1  = 527617  (8.13 = 527616)
 #		 8.12.11 = 527371  (8.12 = 527360)
 #		 8.11.7  = 527111  (8.11 = 527104)
@@ -634,11 +635,50 @@ AC_SUBST(sm_enable_shm)
 # Milter (_FFR_ on 8.10, 8.11, native on 8.12+)
 if test "$sm_enable_milter" != "no"; then
 	sm_libmilter_envdef="$sm_libmilter_envdef -DSM_CONF_POLL=1";
+
+	# Determin which level of the milter interface we're using
 	sm_libmilter_version=0;
-	v2i 8.14.0;
-	if  test $sm_version_math -ge $sm_version_test; then
-		sm_libmilter_version=1;
+	old_cflags="$CFLAGS";
+	old_cppflags="$CFLAGS";
+	export CFLAGS="$CFLAGS -I $PWD/../build-tree/*/include";
+	export CPPFLAGS="$CPPFLAGS -I $PWD/../build-tree/*/include";
+	AC_CHECK_HEADERS(libmilter/mfapi.h,
+		[sm_have_mfapi=yes]
+		,[sm_have_mfapi=no
+          sm_libmilter_version=0])
+	if test "$sm_have_mfapi" = 'yes'; then
+		AC_MSG_CHECKING([libmilter version])
+		SM_RESULT_IFELSE([[
+			#include <stdlib.h>
+			#include <stdio.h>
+			#include <string.h>
+			#include "libmilter/mfapi.h"
+			char vers[30] = "0";
+			int main (void) {
+				snprintf(vers
+				        ,sizeof(vers)
+				        ,"%d%c%d%c%d"
+				        ,SM_LM_VRS_MAJOR(SMFI_VERSION)
+				        ,'.'
+				        ,SM_LM_VRS_MINOR(SMFI_VERSION)
+				        ,'.'
+				        ,SM_LM_VRS_PLVL(SMFI_VERSION)
+				        );
+				fprintf(stdout
+				       ,"%s\n"
+				       ,vers
+				       );
+				return 0;
+				}
+			]]
+			,[AS_VAR_SET(sm_libmilter_version, "$(cat conftest.out)")]
+			,[sm_libmilter_version=0]
+			)
+		 AC_MSG_RESULT([$sm_libmilter_version])
 		fi;
+	export CFLAGS="$old_cflags";
+	export CPPFLAGS="$old_cppflags";
+
 	v2i 8.10.0;
 	if	test $sm_version_math -ge $sm_version_test; then
 		sm_enable_milter=yes;
@@ -1277,11 +1317,15 @@ if test $sm_enable_tcpd != no; then
 		,[sm_have_tcpd=no])
 
 	if test $ac_cv_header_tcpd_h = yes ; then
-		AC_TRY_COMPILE([
-			int allow_severity = 0;
-			int deny_severity  = 0;
-			]
-			,[hosts_access()]
+		AC_COMPILE_IFELSE([
+			AC_LANG_PROGRAM([[
+				#include <tcpd.h>
+				extern int allow_severity;
+				extern int deny_severity;
+				struct request_info *request;
+				]]
+				,[[hosts_access(request);]]
+				)]
 			,[sm_have_tcpd=yes]
 			,[sm_have_tcpd=no])
 		fi;
diff --git a/debian/control b/debian/control
index 09ecc35..29d7d33 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Description: Mail Delivery Agent wrapper
  the following MDAs that it finds (in this order):
  procmail, maildrop, deliver, mail.local
 
-Package: libmilter1
+Package: libmilter1.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
@@ -77,10 +77,10 @@ Description: Sendmail Mail Filter API (Milter)
  .
 Homepage: http://www.sendmail.org
 
-Package: libmilter1-dbg
+Package: libmilter1.0.0-dbg
 Architecture: any
 Section: libs
-Depends: libmilter1 (= ${binary:Version}), ${shlibs:Depends}
+Depends: libmilter1.0.0 (= ${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
@@ -95,7 +95,7 @@ Homepage: http://www.sendmail.org
 Package: libmilter-dev
 Architecture: any
 Section: libdevel
-Depends: libmilter1 (= ${binary:Version})
+Depends: libmilter1.0.0 (= ${binary:Version})
 Suggests: sendmail-doc
 Description: Sendmail Mail Filter API (Milter)
  The Sendmail Mail Filter API (Milter) is designed to allow third-party
diff --git a/debian/examples/Makefile.in b/debian/examples/Makefile.in
index 496bdff..86e6fad 100644
--- a/debian/examples/Makefile.in
+++ b/debian/examples/Makefile.in
@@ -39,7 +39,8 @@ DIST_COMMON = $(dist_man_MANS) $(dist_sbin_SCRIPTS) \
 	$(nobase_dist_sysconf_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/./build/mkinstalldirs
diff --git a/debian/libmilter0.dirs b/debian/libmilter0.dirs
deleted file mode 100644
index a0e05a3..0000000
--- a/debian/libmilter0.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-./DEBIAN
-./usr/lib/libmilter
-./usr/share/doc/sendmail/libmilter0
-./usr/share/bug
-./usr/share/lintian/overrides
diff --git a/debian/libmilter0.links b/debian/libmilter0.links
deleted file mode 100644
index 4968d51..0000000
--- a/debian/libmilter0.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/bug/sendmail usr/share/bug/libmilter0
diff --git a/debian/libmilter0.lintian-overrides b/debian/libmilter0.lintian-overrides
deleted file mode 100644
index f4df27b..0000000
--- a/debian/libmilter0.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libmilter0: description-synopsis-starts-with-a-capital-letter
-libmilter0: postinst-has-useless-call-to-ldconfig
-libmilter0: postrm-has-useless-call-to-ldconfig
-libmilter0: non-dev-pkg-with-shlib-symlink
diff --git a/debian/libmilter0.postrm b/debian/libmilter0.postrm
deleted file mode 100644
index bce8f3f..0000000
--- a/debian/libmilter0.postrm
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh -e
-#
-# Debian post removal script
-#
-# Install of already installed package:
-#	1) Upgrade of package:
-#		new-preinst upgrade old-version
-#		*) new-postrm abort-upgrade old-version
-#	2) package had some configuration files from a previous version installed
-#		new-preinst install old-version
-#		*) new-postrm abort-install old-version
-#	3) Otherwise (i.e., the package was completely purged)
-#		new-preinst install
-#		*) new-postrm abort-install
-#
-# Removal of a package:
-#	1) prerm remove
-#	2) The package's files are removed (except conffiles).
-#	3) postrm remove
-#	4) All the maintainer scripts except the postrm are removed.
-#	5) The conffiles and any backup files
-#		(~-files, #*# files, %-files, .dpkg-{old,new,tmp}, etc.) are removed.
-#	6) postrm purge
-#	7) The package's file list is removed
-#
-set -e;
-
-PACKAGE=libmilter0;
-
-case "$1" in
-	remove)
-		# /usr/share/doc/$PACKAGE is a symlink to /usr/share/doc/sendmail
-		rm -f /usr/share/doc/sendmail/$PACKAGE 2>/dev/null || true;
-		rmdir /usr/share/doc/sendmail/sendmail 2>/dev/null || true;
-		;;
-
-	purge)
-		;;
-
-	upgrade)
-		;;
-
-	failed-upgrade|abort-install|abort-upgrade|disappear)
-		;;
-
-	*)
-		echo "$PACKAGE postrm called with unknown argument \`$1'" >&2;
-		exit 1;
-		;;
-	esac;
-
-#DEBHELPER#
-exit 0;
diff --git a/debian/libmilter0.preinst b/debian/libmilter0.preinst
deleted file mode 100644
index 6de8cea..0000000
--- a/debian/libmilter0.preinst
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh -e
-#
-# Debian pre install script
-#
-# Install of already installed package:
-#	1) Upgrade of package:
-#		new-preinst upgrade old-version
-#		*) new-postrm abort-upgrade old-version
-#	2) package had some configuration files from a previous version installed
-#		new-preinst install old-version
-#		*) new-postrm abort-install old-version
-#	3) Otherwise (i.e., the package was completely purged)
-#		new-preinst install
-#		*) new-postrm abort-install
-#
-set -e;
-
-PACKAGE=libmilter0;
-
-case "$1" in
-	install)
-		# DPKG doesn't overwrite directories with symlinks...
-		if [ -d /usr/share/doc/sendmail/$PACKAGE ]; then
-			rm -rf /usr/share/doc/sendmail/$PACKAGE;
-			fi;
-		if [ ! -d /usr/share/doc/sendmail/sendmail ]; then
-			mkdir -p /usr/share/doc/sendmail/sendmail;
-			chmod a+rx /usr/share/doc/sendmail/sendmail;
-			fi;
-		ln -sf sendmail /usr/share/doc/sendmail/$PACKAGE;
-		;;
-
-	upgrade)
-		# DPKG doesn't overwrite directories with symlinks...
-		if [ -d /usr/share/doc/sendmail/$PACKAGE ]; then
-			rm -rf /usr/share/doc/sendmail/$PACKAGE;
-			fi;
-		if [ ! -d /usr/share/doc/sendmail/sendmail ]; then
-			mkdir -p /usr/share/doc/sendmail/sendmail;
-			chmod a+rx /usr/share/doc/sendmail/sendmail;
-			fi;
-		ln -sf sendmail /usr/share/doc/sendmail/$PACKAGE;
-		;;
-
-	abort-upgrade)
-		;;
-
-	*)
-		echo "$PACKAGE preinst called with unknown argument \`$1'" >&2;
-		exit 1;
-		;;
-	esac;
-
-#DEBHELPER#
-exit 0;
diff --git a/debian/local/Makefile.in b/debian/local/Makefile.in
index 32b6d15..8b6bec2 100644
--- a/debian/local/Makefile.in
+++ b/debian/local/Makefile.in
@@ -48,7 +48,8 @@ DIST_COMMON = $(dist_man_MANS) $(dist_pkgdata_SCRIPTS) \
 	$(srcdir)/update_smrsh.in $(srcdir)/update_sys.in \
 	$(srcdir)/update_tls.in $(srcdir)/update_tlsm4.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/./build/mkinstalldirs
diff --git a/debian/rules b/debian/rules
index 0270321..0db075f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,7 +147,7 @@ refresh-debian::
 	# Remove local testing configuration
 	# Make sure directories are writeable by the owner (mine aren't)
 	chmod -R ug+w debian;
-	-(cd debian && aclocal);
+	-(cd debian && aclocal -I ./build);
 	-(cd debian && autoconf);
 	-(cd debian && automake);
 	# Force a configure here, using $(CURDIR) so the changelog, etc.
@@ -440,7 +440,7 @@ common-install-arch::
 			if [ "$${subdir}" = 'libmilter' ]; then \
 				(cd ${DEB_SRCDIR}/obj*/$${subdir} && \
 					$(INSTALL) libmilter.so.${sm_libmilter_version} \
-						../../../../debian/libmilter${sm_libmilter_version}${libdir}; \
+						../../../../debian/libmilter${sm_libmilter_version}${libdir}/; \
 				); \
 			elif [ "$${subdir}" = 'mail.local' ]  \
 			||	 [ "$${subdir}" = 'rmail' ]; then \
diff --git a/debian/sensible_mda/Makefile.in b/debian/sensible_mda/Makefile.in
index 24f2b8a..d90cac6 100644
--- a/debian/sensible_mda/Makefile.in
+++ b/debian/sensible_mda/Makefile.in
@@ -38,7 +38,8 @@ subdir = sensible_mda
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/sensible-mda.c.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/./build/mkinstalldirs