Imported Debian patch 8.13.6-1debian/8.13.6-1

25 files changed, 181 insertions, 57 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 137c6d6..9c72560 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -2,7 +2,7 @@ sendmail (8.13.1-14)
 
   * TLS errors:
    From http://lists.debian.org/debian-security/2003/09/msg00209.html
-   > I cannot get STARTTLS to work with the newest snendmail in unstable.
+   > I cannot get STARTTLS to work with the newest sendmail in unstable.
    > It *always* complains that the key file is group readable!
    > Now, before you scream RTFM, I did use GroupReadableKeyFile!
 
diff --git a/debian/build/config.guess b/debian/build/config.guess
index ad5281e..c38553d 100644
--- a/debian/build/config.guess
+++ b/debian/build/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-08-03'
+timestamp='2006-02-23'
 
 # 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
@@ -106,7 +106,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -206,6 +206,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
@@ -764,7 +767,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -772,6 +780,9 @@ 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
@@ -779,8 +790,11 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[345]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -851,7 +865,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,7 +888,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -919,6 +941,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -964,7 +989,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -974,7 +999,11 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1185,7 +1214,6 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1264,6 +1292,9 @@ EOF
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/debian/build/config.sub b/debian/build/config.sub
index 1c366df..ad9f395 100644
--- a/debian/build/config.sub
+++ b/debian/build/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-02-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +119,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +172,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +192,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -239,7 +248,7 @@ 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 | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -257,8 +266,9 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
@@ -286,6 +296,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -336,8 +349,9 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -696,6 +710,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -803,6 +820,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +882,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -1174,21 +1201,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index f37be12..0cedb8e 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -114,7 +114,23 @@ Description: Sendmail Mail Filter API (Milter)
  .
  The Debian Sendmail package is built to support libmilter.
  .
- This is just the libmilter.so
+ This package contains libmilter.so
+ .
+ Homepage: http://www.sendmail.org
+
+Package: libmilter0-dbg
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libmilter-dev (<= 8.13.3-0)
+Description: Sendmail Mail Filter API (Milter)
+ The Sendmail Mail Filter API (Milter) is designed to allow third-party
+ programs access to mail messages as they are being processed in order
+ 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 #
diff --git a/debian/build/debian/libmilter0-dbg.dirs.in b/debian/build/debian/libmilter0-dbg.dirs.in
new file mode 100644
index 0000000..91d68a1
--- /dev/null
+++ b/debian/build/debian/libmilter0-dbg.dirs.in
@@ -0,0 +1,2 @@
+./DEBIAN
+.@libdir@/debug
diff --git a/debian/cf/debian/sendmail.mc.in b/debian/cf/debian/sendmail.mc.in
index 90da565..73f8648 100644
--- a/debian/cf/debian/sendmail.mc.in
+++ b/debian/cf/debian/sendmail.mc.in
@@ -88,6 +88,11 @@ dnl # If you're on a dialup link, you should enable this - so sendmail
 dnl # will not bring up the link (it will queue mail for later)
 dnl define(`confCON_EXPENSIVE',`True')dnl
 dnl #
+dnl # Dialup/LAN connection overrides
+dnl #
+include(`/etc/mail/m4/dialup.m4')dnl
+include(`/etc/mail/m4/provider.m4')dnl
+dnl #
 dnl # Default Mailer setup
 MAILER_DEFINITIONS
 MAILER(`local')dnl
diff --git a/debian/changelog b/debian/changelog
index 602077d..7123d7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+sendmail (8.13.6-1) unstable; urgency=high
+
+   * Fix race condition, potentially allowing remote execution of arbitrary
+     code [CVE-2006-0058]. Using upstream patch 8.13.5.p0 (Closes: #358440)
+
+   * Add libmilter0-dbg to help those building milter packages
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Wed, 22 Mar 2006 20:50:00 -0000
+
+sendmail (8.13.5-4) private; urgency=low
+  * /etc/cron.d/sendmail needs to check for /etc/init.d/sendmail to see
+    if sendmail-bin package has been removed
+  * Restore somehow lost dialup/provider m4 files in default sendmail.mc
+  * make sendmail.conf defaults more sane (Dynamic, eth0)
+  * remove bogus confRRT_IMPLIES_DSN
+  * update default key length to 2048
+  * Add libmilter0-dbg to help those building milter packages
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Sun, 27 Nov 2005 21:50:00 -0000
+
 sendmail (8.13.5-3) unstable; urgency=low
   * Rebuild against libssl-0.9.8
   * New version of kFreeBSD patch
diff --git a/debian/control b/debian/control
index f82cb6d..9e6412d 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,23 @@ Description: Sendmail Mail Filter API (Milter)
  .
  The Debian Sendmail package is built to support libmilter.
  .
- This is just the libmilter.so
+ This package contains libmilter.so
+ .
+ Homepage: http://www.sendmail.org
+
+Package: libmilter0-dbg
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libmilter-dev (<= 8.13.3-0)
+Description: Sendmail Mail Filter API (Milter)
+ The Sendmail Mail Filter API (Milter) is designed to allow third-party
+ programs access to mail messages as they are being processed in order
+ 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
 
diff --git a/debian/local/Parse_conf.pm.in b/debian/local/Parse_conf.pm.in
index caf801e..3ebbeb6 100644
--- a/debian/local/Parse_conf.pm.in
+++ b/debian/local/Parse_conf.pm.in
@@ -62,8 +62,8 @@ my $debug;
 # Global variables
 #------------------------------------------------------------------------------
 my %parm_def = (
-	 'DAEMON_NETMODE'	=> 'Static'
-	,'DAEMON_NETIF'		=> 'lo'
+	 'DAEMON_NETMODE'	=> 'Dynamic'
+	,'DAEMON_NETIF'		=> 'eth0'
 	,'DAEMON_MODE'		=> 'Daemon'
 	,'DAEMON_RUNASUSER' => 'No'
 	,'DAEMON_PARMS'		=> ''
diff --git a/debian/local/sendmail.in b/debian/local/sendmail.in
index 36ccc7f..3666cfa 100644
--- a/debian/local/sendmail.in
+++ b/debian/local/sendmail.in
@@ -846,7 +846,6 @@ daemon_check () {
 	#
 	# Skip daemon run for the following:
 	#	* sendmail hasn't been configured
-	#	* smptd, a firewall frontend for sendmail, is installed
 	#	* DAEMON_MODE = (none | inet) & QUEUE_MODE = (none | cron)
 	if [ ! -s @sysconfdir@/mail/sendmail.cf ] || \
 	   [ ! -s @sysconfdir@/mail/sendmail.mc ]; then
diff --git a/debian/local/update_conf.in b/debian/local/update_conf.in
index dcb6ca3..90d0550 100644
--- a/debian/local/update_conf.in
+++ b/debian/local/update_conf.in
@@ -268,7 +268,7 @@ sub write_crontab {
 	my $var;
 	my $interval = '';
 	my $cronint  = '';
-	my $test	 = "test -x @datadir@/sendmail/sendmail";
+	my $test	 = "test -x @sysconfdir@/init.d/sendmail";
 	my $command  = '';
 	my $ok		 = '';
 	my $mailto	 = '';
diff --git a/debian/local/update_tls.in b/debian/local/update_tls.in
index ea7345d..3d37708 100644
--- a/debian/local/update_tls.in
+++ b/debian/local/update_tls.in
@@ -64,7 +64,7 @@ cat >$MTA_CFG <<EOT
 default_days	= 3650
 x509_extensions = X509v3
 [ req ]
-default_bits					= 1024
+default_bits					= 2048
 distinguished_name				= req_DN
 [ req_DN ]
 countryName						= "1. Country Name			   (2 letter code)"
diff --git a/debian/patches/8.13/8.13.5/client_helo.patch b/debian/patches/8.13/8.13.6/client_helo.patch
index 6cf447c..d60ac19 100644
--- a/debian/patches/8.13/8.13.5/client_helo.patch
+++ b/debian/patches/8.13/8.13.6/client_helo.patch
@@ -68,8 +68,8 @@
 #------------------------------------------------------------------------------
 diff -c 'deliver.orig' 'deliver.c'
 Index: ./deliver.orig
-Prereq:  8.990
-*** ./sendmail-8.13.5/sendmail/deliver.c	Tue Aug 10 17:50:11 2004
+Prereq:  8.1000
+*** ./sendmail-8.13.6/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.990
   	SM_TRY
 diff -c 'srvrsmtp.orig' 'srvrsmtp.c'
 Index: ./srvrsmtp.orig
-Prereq:  8.909
-*** ./sendmail-8.13.5/sendmail/srvrsmtp.c	Tue Aug 10 17:50:23 2004
+Prereq:  8.922
+*** ./sendmail-8.13.6/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.5/cyrusv2.m4.debian-patch b/debian/patches/8.13/8.13.6/cyrusv2.m4.debian-patch
index e48b70e..32f40b4 100644
--- a/debian/patches/8.13/8.13.5/cyrusv2.m4.debian-patch
+++ b/debian/patches/8.13/8.13.6/cyrusv2.m4.debian-patch
@@ -1,4 +1,4 @@
---- sendmail-8.13.5/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
+--- sendmail-8.13.6/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.5/dpatch.001 b/debian/patches/8.13/8.13.6/dpatch.001
index 6c1c2d8..248cc84 100644
--- a/debian/patches/8.13/8.13.5/dpatch.001
+++ b/debian/patches/8.13/8.13.6/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.5/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
+*** sendmail-8.13.6/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.5/dpatch.002 b/debian/patches/8.13/8.13.6/dpatch.002
index dfb9141..2eceb09 100644
--- a/debian/patches/8.13/8.13.5/dpatch.002
+++ b/debian/patches/8.13/8.13.6/dpatch.002
@@ -1,4 +1,4 @@
---- sendmail-8.13.5/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
+--- sendmail-8.13.6/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.5/dpatch.003 b/debian/patches/8.13/8.13.6/dpatch.003
index bd2440d..6424850 100644
--- a/debian/patches/8.13/8.13.5/dpatch.003
+++ b/debian/patches/8.13/8.13.6/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.5/rmail/rmail.c	Sat Sep 16 18:20:25 2000
+*** sendmail-8.13.6/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.5/dpatch.004 b/debian/patches/8.13/8.13.6/dpatch.004
index 33a8e2a..370202d 100644
--- a/debian/patches/8.13/8.13.5/dpatch.004
+++ b/debian/patches/8.13/8.13.6/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.5/sendmail/control.c	Sat Nov 20 15:26:23 1999
+*** sendmail-8.13.6/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.5/dpatch.005 b/debian/patches/8.13/8.13.6/dpatch.005
index c645bfe..0c5a019 100644
--- a/debian/patches/8.13/8.13.5/dpatch.005
+++ b/debian/patches/8.13/8.13.6/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.5/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
+*** sendmail-8.13.6/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.5/drac.patch b/debian/patches/8.13/8.13.6/drac.patch
index 3a3f540..ec3afb8 100644
--- a/debian/patches/8.13/8.13.5/drac.patch
+++ b/debian/patches/8.13/8.13.6/drac.patch
@@ -1,5 +1,5 @@
---- sendmail-8.13.5/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
-+++ sendmail-8.13.5/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
+--- sendmail-8.13.6/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
++++ sendmail-8.13.6/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.5/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
++++ sendmail-8.13.6/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.5/kfreebsd.patch b/debian/patches/8.13/8.13.6/kfreebsd.patch
index a766acf..23a6420 100644
--- a/debian/patches/8.13/8.13.5/kfreebsd.patch
+++ b/debian/patches/8.13/8.13.6/kfreebsd.patch
@@ -1,6 +1,6 @@
-diff -Nurd sendmail-8.13.5.orig/devtools/bin/Build sendmail-8.13.5/devtools/bin/Build
---- sendmail-8.13.5.orig/devtools/bin/Build	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.5/devtools/bin/Build	2005-09-09 12:02:15.000000000 +0200
+diff -Nurd sendmail-8.13.6.orig/devtools/bin/Build sendmail-8.13.6/devtools/bin/Build
+--- sendmail-8.13.6.orig/devtools/bin/Build	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.6/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.5.orig/devtools/bin/Build sendmail-8.13.5/devtools/bin/
  esac
  
  # get "base part" of operating system release
-diff -Nurd sendmail-8.13.5.orig/include/sm/conf.h sendmail-8.13.5/include/sm/conf.h
---- sendmail-8.13.5.orig/include/sm/conf.h	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.5/include/sm/conf.h	2005-09-09 11:57:33.000000000 +0200
+diff -Nurd sendmail-8.13.6.orig/include/sm/conf.h sendmail-8.13.6/include/sm/conf.h
+--- sendmail-8.13.6.orig/include/sm/conf.h	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.6/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.5.orig/include/sm/conf.h sendmail-8.13.5/include/sm/con
  **  DELL SVR4 Issue 2.2, and others
  **	From Kimmo Suominen <kim@grendel.lut.fi>
  **
-diff -Nurd sendmail-8.13.5.orig/include/sm/os/sm_os_linux.h sendmail-8.13.5/include/sm/os/sm_os_linux.h
---- sendmail-8.13.5.orig/include/sm/os/sm_os_linux.h	2005-09-09 11:36:00.000000000 +0200
-+++ sendmail-8.13.5/include/sm/os/sm_os_linux.h	2005-09-09 11:45:45.000000000 +0200
+diff -Nurd sendmail-8.13.6.orig/include/sm/os/sm_os_linux.h sendmail-8.13.6/include/sm/os/sm_os_linux.h
+--- sendmail-8.13.6.orig/include/sm/os/sm_os_linux.h	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.6/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.5/ldap_url_search.p0 b/debian/patches/8.13/8.13.6/ldap_url_search.p0
index 842ecf0..acad57f 100644
--- a/debian/patches/8.13/8.13.5/ldap_url_search.p0
+++ b/debian/patches/8.13/8.13.6/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.5/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
+--- ./sendmail-8.13.6/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.5/maxseq.patch b/debian/patches/8.13/8.13.6/maxseq.patch
index 9067b62..4c108eb 100644
--- a/debian/patches/8.13/8.13.5/maxseq.patch
+++ b/debian/patches/8.13/8.13.6/maxseq.patch
@@ -18,8 +18,8 @@
 #### Patch data follows ####
 diff -c 'conf.h' 'conf.h.new'
 Index: ./conf.h
-Prereq:  8.568
-*** ./sendmail-8.13.5/sendmail/conf.h	Fri Sep 21 19:01:46 2001
+Prereq:  8.570
+*** ./sendmail-8.13.6/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.5/qtool.patch b/debian/patches/8.13/8.13.6/qtool.patch
index 181c344..3044283 100644
--- a/debian/patches/8.13/8.13.5/qtool.patch
+++ b/debian/patches/8.13/8.13.6/qtool.patch
@@ -1,5 +1,5 @@
-*** ./sendmail-8.13.5/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
---- ./sendmail-8.13.5/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
+*** ./sendmail-8.13.6/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
+--- ./sendmail-8.13.6/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
 ***************
 *** 355,373 ****
   sub lock_file
diff --git a/debian/rules b/debian/rules
index 1791f45..ba4f80c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -218,7 +218,7 @@ else
 #	2) defaults (Prior to configure)
 ENABLE_INDEP := yes
 ENABLE_ARCH  := yes
-ENABLE_LIB	 := no
+ENABLE_LIB	 := yes
 ENABLE_BIN	 := yes
 ifneq (, $(findstring nodev,${SM_BUILD_OPT}))
 	ENABLE_DEV := no
@@ -502,6 +502,8 @@ info:
 	#	  configure   = ${CONFIG_OPTS}
 	#	  config opt  = ${SM_CONF_OPT}
 	#	  build opt   = ${SM_BUILD_OPT}
+	#	  ENABLE_INDEP= ${ENABLE_INDEP}
+	#	  ENABLE_ARCH = ${ENABLE_ARCH}
 	#	  ENABLE_DEV  = ${ENABLE_DEV}
 	#	  ENABLE_DOC  = ${ENABLE_DOC}
 	#	  compile opt = ${CC} ${CFLAGS} ${DEFINES}
@@ -806,7 +808,7 @@ endif
 
 
 #-------------
-.PHONY: build-arch
+.PHONY: check-arch
 check-arch: ${STAMP_DIR}/check-arch
 ${STAMP_DIR}/check-arch: ${STAMP_DIR}/build-arch
 # Skip work if nothing to do...
@@ -1069,8 +1071,12 @@ endif
 		debian/build/debian/sendmail-bin.lintian-overrides \
 		debian/sendmail-bin/usr/share/lintian/overrides/sendmail-bin;
 ifeq (, $(findstring nostrip,${DEB_BUILD_OPTIONS}))
-	dh_strip;
+	dh_strip --keep-debug;
 endif
+	# Remove unneeded debugging information
+	rm -rf debian/sendmail-bin/usr/lib/debug;
+	rm -rf debian/sensible-mda/usr/lib/debug;
+	rm -rf debian/rmail/usr/lib/debug;
 endif
 	dh_makeshlibs; # -V "libmilter0 (>= ${version_major}.${version_minor})";
 	dh_shlibdeps;