Imported Debian patch 8.14.4-2debian/8.14.4-2

9 files changed, 33 insertions, 33 deletions

diff --git a/debian/cf/Makefile b/debian/cf/Makefile
index ad02ee2..afb013b 100644
--- a/debian/cf/Makefile
+++ b/debian/cf/Makefile
@@ -160,7 +160,7 @@ sm_build_arch = amd64
 sm_custom = 
 sm_custom_s = 
 sm_databases = REGEX, DB, NIS, NIS+, LDAP, DNS
-sm_date = 2010-10-16
+sm_date = 2010-11-03
 sm_depends = 
 sm_dist_name = Debian
 sm_dist_vers = squeeze/sid
@@ -211,7 +211,7 @@ sm_newdb_lib = -ldb-4.8
 sm_praliases_envdef = 
 sm_praliases_libs =  -ldb-4.8 -lldap -llber
 sm_recommends = 
-sm_revision = -1
+sm_revision = -2
 sm_rmail_envdef = 
 sm_rmail_libs =  -lldap -llber
 sm_sendmail_envdef =  -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED  -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS  -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL
@@ -219,7 +219,7 @@ sm_sendmail_libs =  -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypt
 sm_smrsh_envdef =  -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\"
 sm_smrsh_libs =  -lldap -llber
 sm_suggests = , sasl2-bin, libsasl2-modules, openssl
-sm_time = 19:38:59
+sm_time = 22:21:32
 sm_utc = +0000
 sm_vacation_envdef = 
 sm_vacation_libs =  -ldb-4.8 -lldap -llber
@@ -245,13 +245,13 @@ top_srcdir = ..
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: Makefile,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: Makefile,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 1998-2010 Richard Nelson.  All Rights Reserved.
 #
 # cf/Makefile.  Generated from Makefile.in by configure.
 #
-# Rules file for Sendmail 8.14.4-1(527876)
+# Rules file for Sendmail 8.14.4-2(527876)
 #			 on  Debian squeeze/sid
 #			 via Debhelper V1
 #
@@ -259,7 +259,7 @@ top_srcdir = ..
 #		on Debian slink, potato, woody, testing, sid, ...
 #		but the generated file is customized to the version noted above.
 #
-# Richard Nelson <cowboy@debian.org> 2010-10-16 19:38:59 (+0000)
+# Richard Nelson <cowboy@debian.org> 2010-11-03 22:21:32 (+0000)
 #------------------------------------------------------------------------------
 #
 # Shipped data
diff --git a/debian/cf/debian/autoconf.m4 b/debian/cf/debian/autoconf.m4
index 7320a00..e75004d 100644
--- a/debian/cf/debian/autoconf.m4
+++ b/debian/cf/debian/autoconf.m4
@@ -1,12 +1,12 @@
 divert(-1)dnl
 #-----------------------------------------------------------------------------
-# $Sendmail: autoconf.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: autoconf.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 2001-2010 Richard Nelson.  All Rights Reserved.
 #
 # cf/debian/autoconf.m4.  Generated from autoconf.m4.in by configure.
 #
-# m4 autoconf config file for building Sendmail 8.14.4-1
+# m4 autoconf config file for building Sendmail 8.14.4-2
 #
 # Note: the .in file supports 8.7.6 - 9.0.0, but the generated
 #	file is customized to the version noted above.
@@ -14,7 +14,7 @@ divert(-1)dnl
 #-----------------------------------------------------------------------------
 #
 divert(0)dnl
-VERSIONID(`$Id: autoconf.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $')
+VERSIONID(`$Id: autoconf.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $')
 dnl #
 dnl #---------------------------------------------------------------------
 dnl # Export (from autoconf to m4) some items of dubious value
@@ -24,11 +24,11 @@ define(`SM_DATE',			`2010-10-11 17:53:00')dnl
 define(`SM_MINVERS',		`8.7.6')dnl
 define(`SM_MAXVERS',		`9.0.0')dnl
 define(`SM_CPYRT',			`2010')dnl
-define(`sm_date',			`2010-10-16')dnl
-define(`sm_time',			`19:38:59')dnl
+define(`sm_date',			`2010-11-03')dnl
+define(`sm_time',			`22:21:32')dnl
 define(`sm_utc',			`+0000')dnl
 define(`sm_version',		`8.14.4')dnl
-define(`sm_revision',		`-1')dnl
+define(`sm_revision',		`-2')dnl
 define(`sm_version_v',		`8')dnl
 define(`sm_version_r',		`14')dnl
 define(`sm_version_major',	`8.14')dnl
diff --git a/debian/cf/debian/sendmail.mc b/debian/cf/debian/sendmail.mc
index 5d234ea..156177a 100644
--- a/debian/cf/debian/sendmail.mc
+++ b/debian/cf/debian/sendmail.mc
@@ -1,6 +1,6 @@
 divert(-1)dnl
 #-----------------------------------------------------------------------------
-# $Sendmail: debproto.mc,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: debproto.mc,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 1998-2010 Richard Nelson.  All Rights Reserved.
 #
@@ -33,7 +33,7 @@ divert(0)dnl
 #
 define(`_USE_ETC_MAIL_')dnl
 include(`/usr/share/sendmail/cf/m4/cf.m4')dnl
-VERSIONID(`$Id: sendmail.mc, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $')
+VERSIONID(`$Id: sendmail.mc, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $')
 OSTYPE(`debian')dnl
 DOMAIN(`debian-mta')dnl
 dnl # Items controlled by /etc/mail/sendmail.conf - DO NOT TOUCH HERE
diff --git a/debian/cf/debian/submit.mc b/debian/cf/debian/submit.mc
index 0fd5239..d2d5596 100644
--- a/debian/cf/debian/submit.mc
+++ b/debian/cf/debian/submit.mc
@@ -1,6 +1,6 @@
 divert(-1)dnl
 #-----------------------------------------------------------------------------
-# $Sendmail: submit.mc,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: submit.mc,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 2000-2010 Richard Nelson.  All Rights Reserved.
 #
@@ -33,7 +33,7 @@ divert(0)dnl
 #
 define(`_USE_ETC_MAIL_')dnl
 include(`/usr/share/sendmail/cf/m4/cf.m4')dnl
-VERSIONID(`$Id: submit.mc, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $')
+VERSIONID(`$Id: submit.mc, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $')
 OSTYPE(`debian')dnl
 DOMAIN(`debian-msp')dnl
 dnl #
diff --git a/debian/cf/domain/debian-msp.m4 b/debian/cf/domain/debian-msp.m4
index 5f7be4b..6a6f037 100644
--- a/debian/cf/domain/debian-msp.m4
+++ b/debian/cf/domain/debian-msp.m4
@@ -1,12 +1,12 @@
 divert(-1)dnl
 #-----------------------------------------------------------------------------
-# $Sendmail: debian-msp.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: debian-msp.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 1998-2010 Richard Nelson.  All Rights Reserved.
 #
 # cf/domain/debian-msp.m4.  Generated from debian-msp.m4.in by configure.
 #
-# domain(debian-msp) config file for building Sendmail 8.14.4-1
+# domain(debian-msp) config file for building Sendmail 8.14.4-2
 #
 # Note: the .in file supports 8.7.6 - 9.0.0, but the generated
 #	file is customized to the version noted above.
@@ -21,7 +21,7 @@ dnl #---------------------------------------------------------------------
 ifdef(`sm_version', `dnl',
 `include(`/usr/share/sendmail/cf/debian/autoconf.m4')dnl')
 dnl #
-VERSIONID(`$Id: debian-msp.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $')
+VERSIONID(`$Id: debian-msp.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $')
 define(`DEBIAN_MSP')dnl
 define(`confCF_VERSION', `Submit')dnl
 dnl #
diff --git a/debian/cf/domain/debian-mta.m4 b/debian/cf/domain/debian-mta.m4
index d5e79af..fc46120 100644
--- a/debian/cf/domain/debian-mta.m4
+++ b/debian/cf/domain/debian-mta.m4
@@ -1,12 +1,12 @@
 divert(-1)dnl
 #-----------------------------------------------------------------------------
-# $Sendmail: debian-mta.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: debian-mta.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 1998-2010 Richard Nelson.  All Rights Reserved.
 #
 # cf/domain/debian-mta.m4.  Generated from debian-mta.m4.in by configure.
 #
-# domain(debian-mta) config file for building Sendmail 8.14.4-1
+# domain(debian-mta) config file for building Sendmail 8.14.4-2
 #
 # Note: the .in file supports 8.7.6 - 9.0.0, but the generated
 #	file is customized to the version noted above.
@@ -21,7 +21,7 @@ dnl #---------------------------------------------------------------------
 ifdef(`sm_version', `dnl' ,
 `include(`/usr/share/sendmail/cf/debian/autoconf.m4')dnl')
 dnl #
-VERSIONID(`$Id: debian-mta.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $')
+VERSIONID(`$Id: debian-mta.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $')
 define(`DEBIAN_MTA')dnl
 dnl #
 dnl # changes made herein *must* be reflected in parse_mc,update_db,debian.m4
diff --git a/debian/cf/hack/debian_auth.m4 b/debian/cf/hack/debian_auth.m4
index 697c328..0aa6852 100644
--- a/debian/cf/hack/debian_auth.m4
+++ b/debian/cf/hack/debian_auth.m4
@@ -1,6 +1,6 @@
 divert(-1)dnl
 #-----------------------------------------------------------------------------
-# $Sendmail: debian_auth.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: debian_auth.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 2001-2010 Richard Nelson.  All Rights Reserved.
 #
@@ -17,7 +17,7 @@ divert(-1)dnl
 #
 #-----------------------------------------------------------------------------
 divert(0)dnl
-VERSIONID(`$Id: debian_auth.m4,v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $')
+VERSIONID(`$Id: debian_auth.m4,v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $')
 dnl #
 dnl # MTA as Client authentication - only if authinfo/access_db *NOT* used...
 define(`confDEF_AUTH_INFO', `MAIL_SETTINGS_DIR`'default-auth-info')dnl
diff --git a/debian/cf/hack/virthost_by_ip.m4 b/debian/cf/hack/virthost_by_ip.m4
index 4c142e9..e147d2f 100644
--- a/debian/cf/hack/virthost_by_ip.m4
+++ b/debian/cf/hack/virthost_by_ip.m4
@@ -1,12 +1,12 @@
 divert(-1)dnl
 #-----------------------------------------------------------------------------
-# $Sendmail: virthost_by_ip.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: virthost_by_ip.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 2001-2010 Richard Nelson.  All Rights Reserved.
 #
 # cf/hack/virthost_by_ip.m4.  Generated from virthost_by_ip.m4.in by configure.
 #
-# hack(virthost_by_ip) config file for building Sendmail 8.14.4-1
+# hack(virthost_by_ip) config file for building Sendmail 8.14.4-2
 # Note: Also check op.{ps,txt} for the 'b' modifier to daemon_options - it
 #	extends ip based virtual hosting.
 #
@@ -23,7 +23,7 @@ dnl #---------------------------------------------------------------------
 ifdef(`sm_version', `dnl',
 `include(`/usr/share/sendmail/cf/debian/autoconf.m4')dnl')
 dnl #
-VERSIONID(`$Id: virthost_by_ip.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $')
+VERSIONID(`$Id: virthost_by_ip.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $')
 dnl #
 dnl #---------------------------------------------------------------------
 dnl # Virtual hosting extensions - Login (greeting message)
diff --git a/debian/cf/ostype/debian.m4 b/debian/cf/ostype/debian.m4
index 22c2d25..36ca11d 100644
--- a/debian/cf/ostype/debian.m4
+++ b/debian/cf/ostype/debian.m4
@@ -1,12 +1,12 @@
 divert(-1)dnl
 #-----------------------------------------------------------------------------
-# $Sendmail: debian.m4,v 8.14.4 2010-10-16 19:38:59 cowboy Exp $
+# $Sendmail: debian.m4,v 8.14.4 2010-11-03 22:21:32 cowboy Exp $
 #
 # Copyright (c) 1998-2010 Richard Nelson.  All Rights Reserved.
 #
 # cf/ostype/debian.m4.  Generated from debian.m4.in by configure.
 #
-# ostype(debian) config file for building Sendmail 8.14.4-1
+# ostype(debian) config file for building Sendmail 8.14.4-2
 #
 # Note: the .in file supports 8.7.6 - 9.0.0, but the generated
 #	file is customized to the version noted above.
@@ -21,8 +21,8 @@ dnl #---------------------------------------------------------------------
 ifdef(`sm_version', `dnl',
 `include(`/usr/share/sendmail/cf/debian/autoconf.m4')dnl')
 dnl #
-VERSIONID(`$Id: debian.m4, v 8.14.4-1 2010-10-16 19:38:59 cowboy Exp $')
-define(`confCF_VERSION', `Debian-1')dnl
+VERSIONID(`$Id: debian.m4, v 8.14.4-2 2010-11-03 22:21:32 cowboy Exp $')
+define(`confCF_VERSION', `Debian-2')dnl
 dnl #
 dnl # changes made herein *must* be reflected in parse_mc,update_db,debian.m4
 dnl #
@@ -98,10 +98,10 @@ ifelse(sm_enable_milter, `yes',dnl
 #
 #-------------------------------------------------------------------------
 #
-# Undocumented features are available in Debian Sendmail 8.14.4-1.
+# Undocumented features are available in Debian Sendmail 8.14.4-2.
 #	* none
 #
-# _FFR_ features are available in Debian Sendmail 8.14.4-1.
+# _FFR_ features are available in Debian Sendmail 8.14.4-2.
 ifelse(sm_enable_milter, `yes',dnl
 `#	* milter')
 #	* sm_ffr