Imported Debian patch 8.13.8-1debian/8.13.8-1

19 files changed, 167 insertions, 180 deletions

diff --git a/debian/build/config.guess b/debian/build/config.guess
index c38553d..396482d 100644
--- a/debian/build/config.guess
+++ b/debian/build/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -210,7 +211,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@ EOF
 	case ${UNAME_MACHINE} in
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
@@ -780,9 +783,6 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS_NT-*:*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
     i*:windows32*:*)
     	# uname -m includes "-pc" on this system.
     	echo ${UNAME_MACHINE}-mingw32
@@ -790,10 +790,10 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[3456]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[345]*)
+    EM64T:Interix*:[3456]*)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@ EOF
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@@ -989,7 +992,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
diff --git a/debian/build/config.sub b/debian/build/config.sub
index ad9f395..387c18d 100644
--- a/debian/build/config.sub
+++ b/debian/build/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-07-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -274,11 +276,11 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
@@ -286,9 +288,6 @@ case $basic_machine in
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -318,7 +317,7 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -329,7 +328,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,11 +357,11 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -373,8 +372,6 @@ case $basic_machine in
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -1128,7 +1125,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1217,7 +1214,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1369,6 +1366,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1378,9 +1378,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
diff --git a/debian/changelog b/debian/changelog
index 1557b65..5eb5bd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+sendmail (8.13.8-1) unstable; urgency=high
+
+   * CVE-2006-4434: sendmail 8.13.8 fixes remote DoS vulnerability
+     use-after-free vulnerability in Sendmail before 8.13.8
+     closes: #385054
+
+   * I hadn't released this earlier because I had the 8.13.7 errata
+     patches in 8.13.7-2, so it didn't look like a big deal.
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Tue, 29 Aug 2006 14:00:00 -0000
+
+sendmail (8.13.8-0) private; urgency=low
+
+   * New upstream - not much new (already had the errata in 8.13.7-2)
+   * Refit patches
+   * /var/lib/sendmail needs to be writable by smmsp for dead.letter
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Wed, 09 Aug 2006 16:50:00 -0000
+
 sendmail (8.13.7-2) unstable; urgency=low
 
    * Two upstream errata 
diff --git a/debian/configure b/debian/configure
index e68ceae..d916847 100644
--- a/debian/configure
+++ b/debian/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 8.13.4 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59e for Sendmail 8.13.4.
+# Generated by GNU Autoconf 2.60a for Sendmail 8.13.4.
 #
 # Report bugs to <bug/reportbug or sendmail@packages.debian.org>.
 #
@@ -14,7 +14,7 @@
 #    Copyright (c) 1998-2005 Richard Nelson.	All Rights Reserved.
 #
 #    Sendmail 8.13.4
-#    Generated by Autoconf 2.59e,  Automake 1.9
+#    Generated by Autoconf 2.60a,  Automake 1.9
 #
 #    Debian configure script for building Sendmail
 # 	 Note: this file supports Sendmail 8.7.6 - 9.0.0
@@ -252,8 +252,8 @@ IFS=$as_save_IFS
 
 
       for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells which exist, to save several forks.
-	 if test -f "$as_shell" &&
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -588,36 +588,36 @@ ac_default_prefix=/usr
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -1510,7 +1510,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 Sendmail configure 8.13.4
-generated by GNU Autoconf 2.59e
+generated by GNU Autoconf 2.60a
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1526,7 +1526,7 @@ cat <<EOF
    Copyright (c) 1998-2005 Richard Nelson.	All Rights Reserved.
 
    Sendmail 8.13.4
-   Generated by Autoconf 2.59e,  Automake 1.9
+   Generated by Autoconf 2.60a,  Automake 1.9
 
    Debian configure script for building Sendmail
 	 Note: this file supports Sendmail 8.7.6 - 9.0.0
@@ -1543,7 +1543,7 @@ 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.13.4, which was
-generated by GNU Autoconf 2.59e.  Invocation command line was
+generated by GNU Autoconf 2.60a.  Invocation command line was
 
   $ $0 $@
 
@@ -2066,7 +2066,7 @@ rm -f conftest.sed
 
 { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2507,7 +2507,7 @@ fi
   MAINT=$MAINTAINER_MODE_TRUE
 
 
-ac_version="2.59e";
+ac_version="2.60a";
 am_version="1.9";
 
 
@@ -3286,7 +3286,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -3314,6 +3314,12 @@ done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3325,8 +3331,6 @@ See \`config.log' for more details." >&2;}
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
@@ -3533,7 +3537,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_compiler_gnu=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -3719,13 +3723,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -3790,6 +3794,11 @@ static char *f (char * (*g) (char **, int), char **p, ...)
    that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -3850,7 +3859,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
@@ -4632,7 +4641,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_header_stdc=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -5137,7 +5146,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Header=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_Header'}'`
 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -5220,7 +5229,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -5418,7 +5427,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_regfree=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_regfree" >&5
@@ -5524,7 +5533,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -5724,7 +5733,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_ndbm_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -5852,7 +5861,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -6189,7 +6198,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6271,7 +6280,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_db_db_create_4002=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6357,7 +6366,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6439,7 +6448,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_db_db_create=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6525,7 +6534,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6607,7 +6616,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_db_db_open=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6693,7 +6702,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6775,7 +6784,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_db_dbopen=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6862,7 +6871,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -6944,7 +6953,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_db_dbopen=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -7080,7 +7089,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -7251,7 +7260,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_nsl_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -7360,7 +7369,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -7532,7 +7541,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_nsl_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -7649,7 +7658,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -7817,7 +7826,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_ldap_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -7902,7 +7911,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_ldap_ldap_init=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -7987,7 +7996,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_ldap_ldap_memfree=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -8068,7 +8077,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_lber_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -8192,7 +8201,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_umich_ldap_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -8273,7 +8282,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_umich_lber_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -8433,7 +8442,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -8613,7 +8622,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_resolv___res_query=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -8694,7 +8703,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_resolv_res_query=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -8792,7 +8801,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_bind___res_query=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -8915,7 +8924,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -9149,7 +9158,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -9318,7 +9327,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	sm_have_tcpd=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		fi;
 
 	if test $sm_have_tcpd = yes; then
@@ -9387,7 +9396,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_wrap_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -9497,7 +9506,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -9748,7 +9757,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -9868,7 +9877,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -10039,7 +10048,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_lockfile_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -10155,7 +10164,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -10327,7 +10336,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_sfio_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -10445,7 +10454,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -10679,7 +10688,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -10819,7 +10828,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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; }
 
@@ -10996,7 +11005,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_ssl_SSL_library_init=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -11715,7 +11724,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by Sendmail $as_me 8.13.4, which was
-generated by GNU Autoconf 2.59e.  Invocation command line was
+generated by GNU Autoconf 2.60a.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -11743,7 +11752,7 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -11762,7 +11771,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 Sendmail config.status 8.13.4
-configured by $0, generated by GNU Autoconf 2.59e,
+configured by $0, generated by GNU Autoconf 2.60a,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
@@ -12572,6 +12581,7 @@ $ac_datarootdir_hack
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
diff --git a/debian/local/update_sys.in b/debian/local/update_sys.in
index ec84f02..3ec4ff8 100644
--- a/debian/local/update_sys.in
+++ b/debian/local/update_sys.in
@@ -156,8 +156,8 @@ if [ ! -d @localstatedir@/lib/sendmail ]; then
 	changed=1;
 	mkdir @localstatedir@/lib/sendmail;
 	fi;
-chown smmta:smmta @localstatedir@/lib/sendmail;
-chmod 02751 @localstatedir@/lib/sendmail;
+chown smmta:smmsp @localstatedir@/lib/sendmail;
+chmod 02771 @localstatedir@/lib/sendmail;
 if [ -d /var/state/sendmail/host_status ]; then
 	changed=1;
 	echo "Moving /var/state/sendmail/host_status to /var/lib/sendmail/";
diff --git a/debian/patches/8.13/8.13.7/main.c.DaemonPid.p0 b/debian/patches/8.13/8.13.7/main.c.DaemonPid.p0
deleted file mode 100644
index 1fae8a0..0000000
--- a/debian/patches/8.13/8.13.7/main.c.DaemonPid.p0
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /cvs/sendmail/main.c,v
-retrieving revision 8.944
-diff -u -r8.944 main.c
---- sendmail-8.13.7/sendmail/main.c	21 Apr 2006 23:56:42 -0000	8.944
-+++ main.c	15 Jun 2006 18:38:35 -0000
-@@ -2408,6 +2408,8 @@
- 	{
- 		char dtype[200];
- 
-+		/* avoid cleanup in finis(), DaemonPid will be set below */
-+		DaemonPid = 0;
- 		if (!run_in_foreground && !tTd(99, 100))
- 		{
- 			/* put us in background */
-@@ -2440,7 +2442,10 @@
- 
- 		dtype[0] = '\0';
- 		if (OpMode == MD_DAEMON)
-+		{
- 			(void) sm_strlcat(dtype, "+SMTP", sizeof dtype);
-+			DaemonPid = CurrentPid;
-+		}
- 		if (QueueIntvl > 0)
- 		{
- 			(void) sm_strlcat2(dtype,
diff --git a/debian/patches/8.13/8.13.7/queue.c.20060614 b/debian/patches/8.13/8.13.7/queue.c.20060614
deleted file mode 100644
index 6a0c85d..0000000
--- a/debian/patches/8.13/8.13.7/queue.c.20060614
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: queue.c
-===================================================================
-RCS file: /cvs/sendmail/queue.c,v
-retrieving revision 8.954
-retrieving revision 8.954.2.2
-diff -u -r8.954 -r8.954.2.2
---- sendmail-8.13.7/sendmail/queue.c	22 Apr 2006 01:07:00 -0000	8.954
-+++ queue.c	14 Jun 2006 21:50:56 -0000	8.954.2.2
-@@ -6695,8 +6695,7 @@
- 	static time_t nextupdate = 0;
- 
- #if SM_CONF_SHM
--	/* only the daemon updates this structure */
--	if (ShmId == SM_SHM_NO_ID || DaemonPid != CurrentPid)
-+	if (ShmId == SM_SHM_NO_ID && DaemonPid != CurrentPid)
- 		return;
- #endif /* SM_CONF_SHM */
- 	now = curtime();
diff --git a/debian/patches/8.13/8.13.7/client_helo.patch b/debian/patches/8.13/8.13.8/client_helo.patch
index 7bf5cc2..557603c 100644
--- a/debian/patches/8.13/8.13.7/client_helo.patch
+++ b/debian/patches/8.13/8.13.8/client_helo.patch
@@ -69,7 +69,7 @@
 diff -c 'deliver.orig' 'deliver.c'
 Index: ./deliver.orig
 Prereq:  8.1003.2.1
-*** ./sendmail-8.13.7/sendmail/deliver.c	Tue Aug 10 17:50:11 2004
+*** ./sendmail-8.13.8/sendmail/deliver.c	Tue Aug 10 17:50:11 2004
 --- ./deliver.c	Tue Aug 10 17:44:04 2004
 ***************
 *** 1363,1368 ****
@@ -83,8 +83,8 @@ Prereq:  8.1003.2.1
   	SM_TRY
 diff -c 'srvrsmtp.orig' 'srvrsmtp.c'
 Index: ./srvrsmtp.orig
-Prereq:  8.924.2.2
-*** ./sendmail-8.13.7/sendmail/srvrsmtp.c	Tue Aug 10 17:50:23 2004
+Prereq:  8.924.2.5
+*** ./sendmail-8.13.8/sendmail/srvrsmtp.c	Tue Aug 10 17:50:23 2004
 --- ./srvrsmtp.c	Tue Aug 10 17:42:54 2004
 ***************
 *** 444,449 ****
diff --git a/debian/patches/8.13/8.13.7/cyrusv2.m4.debian-patch b/debian/patches/8.13/8.13.8/cyrusv2.m4.debian-patch
index fcb1b8b..513b312 100644
--- a/debian/patches/8.13/8.13.7/cyrusv2.m4.debian-patch
+++ b/debian/patches/8.13/8.13.8/cyrusv2.m4.debian-patch
@@ -1,4 +1,4 @@
---- sendmail-8.13.7/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
+--- sendmail-8.13.8/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
 +++ cyrusv2.m4.new	Wed Jun  5 04:21:34 2002
 @@ -12,7 +12,7 @@
  
diff --git a/debian/patches/8.13/8.13.7/dpatch.001 b/debian/patches/8.13/8.13.8/dpatch.001
index f60aaf6..b222f89 100644
--- a/debian/patches/8.13/8.13.7/dpatch.001
+++ b/debian/patches/8.13/8.13.8/dpatch.001
@@ -19,7 +19,7 @@
 diff -c 'cf/feature/local_procmail.m4' 'debian/patches/local_procmail.m4'
 Index: ./cf/feature/local_procmail.m4
 Prereq:  8.22
-*** sendmail-8.13.7/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
+*** sendmail-8.13.8/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
 --- ./debian/patches/local_procmail.m4	Sat Nov 20 15:39:46 1999
 ***************
 *** 27,32 ****
diff --git a/debian/patches/8.13/8.13.7/dpatch.002 b/debian/patches/8.13/8.13.8/dpatch.002
index a73f33c..8a71d57 100644
--- a/debian/patches/8.13/8.13.7/dpatch.002
+++ b/debian/patches/8.13/8.13.8/dpatch.002
@@ -1,4 +1,4 @@
---- sendmail-8.13.7/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
+--- sendmail-8.13.8/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
 +++ ./debian/patches/cf/mailer/cyrus.m4	Tue May  2 14:41:21 2000
 @@ -36,12 +36,12 @@
  # 
diff --git a/debian/patches/8.13/8.13.7/dpatch.003 b/debian/patches/8.13/8.13.8/dpatch.003
index 07c1a75..803ea5c 100644
--- a/debian/patches/8.13/8.13.7/dpatch.003
+++ b/debian/patches/8.13/8.13.8/dpatch.003
@@ -19,7 +19,7 @@
 diff -c 'rmail/rmail.c' 'debian/patches/rmail.c'
 Index: ./rmail/rmail.c
 Prereq:  8.61
-*** sendmail-8.13.7/rmail/rmail.c	Sat Sep 16 18:20:25 2000
+*** sendmail-8.13.8/rmail/rmail.c	Sat Sep 16 18:20:25 2000
 --- ./debian/patches/rmail.c	Thu Sep 28 17:00:59 2000
 ***************
 *** 318,324 ****
diff --git a/debian/patches/8.13/8.13.7/dpatch.004 b/debian/patches/8.13/8.13.8/dpatch.004
index 3c71838..f73d47e 100644
--- a/debian/patches/8.13/8.13.7/dpatch.004
+++ b/debian/patches/8.13/8.13.8/dpatch.004
@@ -19,7 +19,7 @@
 diff -c 'sendmail/control.c' 'debian/patches/control.c'
 Index: ./sendmail/control.c
 Prereq:  8.126
-*** sendmail-8.13.7/sendmail/control.c	Sat Nov 20 15:26:23 1999
+*** sendmail-8.13.8/sendmail/control.c	Sat Nov 20 15:26:23 1999
 --- ./debian/patches/control.c	Sat Nov 20 15:39:52 1999
 ***************
 *** 92,98 ****
diff --git a/debian/patches/8.13/8.13.7/dpatch.005 b/debian/patches/8.13/8.13.8/dpatch.005
index 5cd0699..40be5b4 100644
--- a/debian/patches/8.13/8.13.7/dpatch.005
+++ b/debian/patches/8.13/8.13.8/dpatch.005
@@ -19,7 +19,7 @@
 diff -c './cf/mailer/fax.m4' 'fax.m4'
 Index: ./cf/mailer/fax.m4
 Prereq:  8.16
-*** sendmail-8.13.7/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
+*** sendmail-8.13.8/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
 --- ./fax.m4	Wed Jan  3 14:26:13 2001
 ***************
 *** 19,26 ****
diff --git a/debian/patches/8.13/8.13.7/drac.patch b/debian/patches/8.13/8.13.8/drac.patch
index 861bf57..a096cab 100644
--- a/debian/patches/8.13/8.13.7/drac.patch
+++ b/debian/patches/8.13/8.13.8/drac.patch
@@ -1,5 +1,5 @@
---- sendmail-8.13.7/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
-+++ sendmail-8.13.7/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
+--- sendmail-8.13.8/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
++++ sendmail-8.13.8/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
 @@ -2110,6 +2110,13 @@
  R127.0.0.1		$@ RELAY		originated locally
  RIPv6:::1		$@ RELAY		originated locally
@@ -15,7 +15,7 @@
  R$*			$: $>A <$1> <?> <+ Connect> <$1>
  R<RELAY> $* 		$@ RELAY		relayable IP address
 --- /dev/null   2002-01-01 00:00:00.000000000 +0900
-+++ sendmail-8.13.7/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
++++ sendmail-8.13.8/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
 @@ -0,0 +1,5 @@
 +define(`_DRAC_', `')
 +
diff --git a/debian/patches/8.13/8.13.7/kfreebsd.patch b/debian/patches/8.13/8.13.8/kfreebsd.patch
index d7d1a79..53850c5 100644
--- a/debian/patches/8.13/8.13.7/kfreebsd.patch
+++ b/debian/patches/8.13/8.13.8/kfreebsd.patch
@@ -1,6 +1,6 @@
-diff -Nurd sendmail-8.13.7.orig/devtools/bin/Build sendmail-8.13.7/devtools/bin/Build
---- sendmail-8.13.7.orig/devtools/bin/Build	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.7/devtools/bin/Build	2005-09-09 12:02:15.000000000 +0200
+diff -Nurd sendmail-8.13.8.orig/devtools/bin/Build sendmail-8.13.8/devtools/bin/Build
+--- sendmail-8.13.8.orig/devtools/bin/Build	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.8/devtools/bin/Build	2005-09-09 12:02:15.000000000 +0200
 @@ -422,6 +422,7 @@
    NeXT)		mkdir="mkdirs";;
    UNICOSMK)	rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\.\(.*\)\..*$/\1.\2.\3/'`;;
@@ -9,9 +9,9 @@ diff -Nurd sendmail-8.13.7.orig/devtools/bin/Build sendmail-8.13.7/devtools/bin/
  esac
  
  # get "base part" of operating system release
-diff -Nurd sendmail-8.13.7.orig/include/sm/conf.h sendmail-8.13.7/include/sm/conf.h
---- sendmail-8.13.7.orig/include/sm/conf.h	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.7/include/sm/conf.h	2005-09-09 11:57:33.000000000 +0200
+diff -Nurd sendmail-8.13.8.orig/include/sm/conf.h sendmail-8.13.8/include/sm/conf.h
+--- sendmail-8.13.8.orig/include/sm/conf.h	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.8/include/sm/conf.h	2005-09-09 11:57:33.000000000 +0200
 @@ -783,7 +783,7 @@
  **	See also BSD defines.
  */
@@ -100,9 +100,9 @@ diff -Nurd sendmail-8.13.7.orig/include/sm/conf.h sendmail-8.13.7/include/sm/con
  **  DELL SVR4 Issue 2.2, and others
  **	From Kimmo Suominen <kim@grendel.lut.fi>
  **
-diff -Nurd sendmail-8.13.7.orig/include/sm/os/sm_os_linux.h sendmail-8.13.7/include/sm/os/sm_os_linux.h
---- sendmail-8.13.7.orig/include/sm/os/sm_os_linux.h	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.7/include/sm/os/sm_os_linux.h	2005-09-09 11:45:45.000000000 +0200
+diff -Nurd sendmail-8.13.8.orig/include/sm/os/sm_os_linux.h sendmail-8.13.8/include/sm/os/sm_os_linux.h
+--- sendmail-8.13.8.orig/include/sm/os/sm_os_linux.h	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.8/include/sm/os/sm_os_linux.h	2005-09-09 11:45:45.000000000 +0200
 @@ -15,23 +15,27 @@
  
  #define SM_OS_NAME	"linux"
diff --git a/debian/patches/8.13/8.13.7/ldap_url_search.p0 b/debian/patches/8.13/8.13.8/ldap_url_search.p0
index 63f5436..98b06b2 100644
--- a/debian/patches/8.13/8.13.7/ldap_url_search.p0
+++ b/debian/patches/8.13/8.13.8/ldap_url_search.p0
@@ -4,7 +4,7 @@ RCS file: /cvs/libsm/ldap.c,v
 retrieving revision 1.51
 retrieving revision 1.53
 diff -u -r1.51 -r1.53
---- ./sendmail-8.13.7/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
+--- ./sendmail-8.13.8/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
 +++ ldap.c	30 Oct 2003 23:33:10 -0000	1.53
 @@ -1043,6 +1043,7 @@
  						   NULL : lmap->ldap_attr),
diff --git a/debian/patches/8.13/8.13.7/maxseq.patch b/debian/patches/8.13/8.13.8/maxseq.patch
index 1e678e8..0181b02 100644
--- a/debian/patches/8.13/8.13.7/maxseq.patch
+++ b/debian/patches/8.13/8.13.8/maxseq.patch
@@ -19,7 +19,7 @@
 diff -c 'conf.h' 'conf.h.new'
 Index: ./conf.h
 Prereq:  8.570
-*** ./sendmail-8.13.7/sendmail/conf.h	Fri Sep 21 19:01:46 2001
+*** ./sendmail-8.13.8/sendmail/conf.h	Fri Sep 21 19:01:46 2001
 --- ./conf.h.new	Wed Oct 10 09:24:41 2001
 ***************
 *** 74,79 ****
diff --git a/debian/patches/8.13/8.13.7/qtool.patch b/debian/patches/8.13/8.13.8/qtool.patch
index dc288b2..c0e98d3 100644
--- a/debian/patches/8.13/8.13.7/qtool.patch
+++ b/debian/patches/8.13/8.13.8/qtool.patch
@@ -1,5 +1,5 @@
-*** ./sendmail-8.13.7/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
---- ./sendmail-8.13.7/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
+*** ./sendmail-8.13.8/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
+--- ./sendmail-8.13.8/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
 ***************
 *** 355,373 ****
   sub lock_file