Imported Debian patch 8.14.1-10debian/8.14.1-10

10 files changed, 53 insertions, 34 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index ffe8f81..5fdbd1d 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.1 2007-08-17 21:03:32 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.1 2007-10-04 15:02:00 cowboy Exp $
 #
 # Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
 #
@@ -16,7 +16,7 @@
 #		on Debian slink, potato, woody, testing, sid, ...
 #		but the generated file is customized to the version noted above.
 #
-# Richard Nelson <cowboy@debian.org> 2007-08-17 21:03:32 (-0700)
+# Richard Nelson <cowboy@debian.org> 2007-10-04 15:02:00 (-0700)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index 2d6d3af..7ff23f1 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -26,7 +26,8 @@ Standards-Version: 3.7.2
 ]]dnl # Sigh... build daemons ignore B-D-I, so replicate in B-D :(
 [[Build-Depends-Indep: groff, bsdmainutils
 Build-Depends: make (>> 3.79.1-14), m4, cdbs, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) | linux-kernel-headers, groff, bsdmainutils @sm_badepends@
-Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)]]dnl
+Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)
+Homepage: http://www.sendmail.org]]dnl
 dnl #
 dnl # The arch=any package: sendmail-bin
 dnl # Always built
@@ -59,7 +60,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  This package supports @sm_databases@ maps,
  and has enabled @sm_features@.
  .
- Homepage: http://www.sendmail.org]]dnl
+Homepage: http://www.sendmail.org]]dnl
 dnl #
 dnl # The arch=any package: rmail
 dnl # Always built
@@ -78,7 +79,7 @@ Description: MTA->UUCP remote mail handler
  This version comes from the sendmail source package and the only
  change is the call to sendmail (from -obq to -obi).
  .
- Homepage: http://www.sendmail.org]]dnl
+Homepage: http://www.sendmail.org]]dnl
 dnl #
 dnl # The arch=any package: sensible-mda (debian private)
 dnl # Always built
@@ -115,7 +116,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  This package contains libmilter.so
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: libmilter@sm_libmilter_version@-dbg
 Architecture: any
@@ -130,7 +131,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  This package contains debugging information for libmilter.so
  .
- Homepage: http://www.sendmail.org]]dnl
+Homepage: http://www.sendmail.org]]dnl
 dnl #
 dnl # The arch=any package: libmilter-dev
 dnl # Only built if MILTER is enabled
@@ -153,7 +154,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  The documentation on building a Milter is in the sendmail-doc package.
  .
- Homepage: http://www.sendmail.org]]]])dnl
+Homepage: http://www.sendmail.org]]]])dnl
 dnl #
 dnl # The arch=all package: sendmail-doc
 dnl # Always built
@@ -179,7 +180,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  .
  Other files include the references for smrsh and libmilter.
  .
- Homepage: http://www.sendmail.org]]dnl
+Homepage: http://www.sendmail.org]]dnl
 dnl #
 dnl # The arch=all package: sendmail
 dnl # Always built
@@ -211,7 +212,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  .
  This package is to make installation/upgrading easier (Do NOT delete it)
  .
- Homepage: http://www.sendmail.org]]dnl
+Homepage: http://www.sendmail.org]]dnl
 dnl #
 dnl # The arch=all package: sendmail-base
 dnl # Always built
@@ -232,7 +233,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  This package contains the base, architecture independent, portions
  of the sendmail packages.
  .
- Homepage: http://www.sendmail.org]]dnl
+Homepage: http://www.sendmail.org]]dnl
 dnl #
 dnl # The arch=all package: sendmail-cf
 dnl # Always built
@@ -253,7 +254,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  This package contains the .m4 (configuration files) for the
  sendmail packages.
  .
- Homepage: http://www.sendmail.org]]dnl
+Homepage: http://www.sendmail.org]]dnl
 dnl #
 dnl # Provide the requisite trailing newline
 dnl #
diff --git a/debian/cf/debian/sendmail.mc.in b/debian/cf/debian/sendmail.mc.in
index 73f8648..5ccf60e 100644
--- a/debian/cf/debian/sendmail.mc.in
+++ b/debian/cf/debian/sendmail.mc.in
@@ -51,6 +51,7 @@ dnl #
 dnl # Daemon options - restrict to servicing LOCALHOST ONLY !!!
 dnl # Remove `, Addr=' clauses to receive from any interface
 dnl # If you want to support IPv6, switch the commented/uncommentd lines
+dnl #
 FEATURE(`no_default_msa')dnl
 dnl DAEMON_OPTIONS(`Family=inet6, Name=MTA-v6, Port=smtp, Addr=::1')dnl
 DAEMON_OPTIONS(`Family=inet,  Name=MTA-v4, Port=smtp, Addr=127.0.0.1')dnl
diff --git a/debian/cf/domain/debian-msp.m4.in b/debian/cf/domain/debian-msp.m4.in
index c237c29..500314d 100644
--- a/debian/cf/domain/debian-msp.m4.in
+++ b/debian/cf/domain/debian-msp.m4.in
@@ -42,7 +42,7 @@ dnl #
 dnl # flags
 define(`confPROCESS_TITLE_PREFIX',	`MSP')dnl
 define(`confNO_RCPT_ACTION',		`add-to-undisclosed')dnl
-define(`confRRT_IMPLIES_DSN',		`True')dnl
+define(`confRRT_IMPLIES_DSN',		`False')dnl
 define(`confSAFE_FILE_ENV',			`/')dnl
 define(`confSAFE_QUEUE',			`True')dnl
 define(`confQUEUE_FILE_MODE',		`0660')dnl
diff --git a/debian/cf/domain/debian-mta.m4.in b/debian/cf/domain/debian-mta.m4.in
index 29baa26..0aaff70 100644
--- a/debian/cf/domain/debian-mta.m4.in
+++ b/debian/cf/domain/debian-mta.m4.in
@@ -40,7 +40,7 @@ dnl # flags
 define(`confPROCESS_TITLE_PREFIX',	`MTA')dnl
 define(`confMAX_DAEMON_CHILDREN',	`0')dnl
 define(`confNO_RCPT_ACTION',		`add-to-undisclosed')dnl
-define(`confRRT_IMPLIES_DSN',		`True')dnl
+define(`confRRT_IMPLIES_DSN',		`False')dnl
 define(`confSAFE_FILE_ENV',			`/')dnl
 define(`confSAFE_QUEUE',			`True')dnl
 define(`confQUEUE_FILE_MODE',		`0600')dnl
diff --git a/debian/changelog b/debian/changelog
index d12eaea..23c8114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,24 @@
+sendmail (8.14.1-10) unstable; urgency=low
+
+  * Do not blindly accept client certificates by default
+    thanks to Jeffrey Honig (from #sendmail@freenode)
+    NOTE: this only affects new installations - if you've already installed
+    sendmail, you and haven't changed the default; you should !
+    /etc/mail/tls/starttls.m4
+  * Set confRRT_IMPLIES_DSN to upstream default of False
+  * Enable pool() for libmilter                       closes: #445307
+    This should help high performance/load situations where select() just
+    doesn't scale well
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Thu, 04 Oct 2007 22:40:00 -0000
+
 sendmail (8.14.1-9) unstable; urgency=low
 
   * Finally drop MAILER(cyrus21) in favour of cyrusv2
   * Egads, a rules typo dropped all local patches :(  closes: #436185
   * upgrade to db4.6 (and newer libdb-dev)
 
- -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 13 Aug 2007 23:52:22 -0000
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Mon, 13 Aug 2007 20:52:22 -0000
 
 sendmail (8.14.1-8) unstable; urgency=low
 
diff --git a/debian/configure b/debian/configure
index f3430d0..50005ba 100644
--- a/debian/configure
+++ b/debian/configure
@@ -7,7 +7,7 @@
 #
 # #
 # #	$Sendmail$
-# #	   from Sendmail: ./configure.ac,v 8.14.1 2007-05-21 20:45:00
+# #	   from Sendmail: ./configure.ac,v 8.14.1 2007-10-04 21:42:00
 # #
 # cat <<EOF
 #
@@ -1534,7 +1534,7 @@ gives unlimited permission to copy, distribute and modify it.
 
 #
 #	$Sendmail$
-#	   from Sendmail: ./configure.ac,v 8.14.1 2007-05-21 20:45:00
+#	   from Sendmail: ./configure.ac,v 8.14.1 2007-10-04 21:42:00
 #
 cat <<EOF
 
@@ -2548,7 +2548,7 @@ am_version="$am__api_version";
 
 
 SM_VERS='8.14.1';
-SM_DATE='2007-05-21 20:45:00';
+SM_DATE='2007-10-04 21:42:00';
 SM_MINVERS='8.7.6';
 SM_MAXVERS='9.0.0';
 SM_CPYRT='2007';
@@ -4909,6 +4909,7 @@ 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
diff --git a/debian/configure.ac b/debian/configure.ac
index 1b72a75..235018f 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 #
-#	$Sendmail: ./configure.ac,v 8.14.1 2007/08/18 04:03:00 cowboy Exp $
+#	$Sendmail: ./configure.ac,v 8.14.1 2007/10/04 21:42:00 cowboy Exp $
 #
 #	Copyright (c) 1998-2007 Richard Nelson.  All Rights Reserved.
 #
@@ -14,7 +14,7 @@
 #------------------------------------------------------------------------------
 define([_SM_CPYRT],  [2007])dnl
 define([_SM_VERS],	[8.14.1])dnl
-define([_SM_DATE],	[2007-05-21 20:45:00])dnl
+define([_SM_DATE],	[2007-10-04 21:42:00])dnl
 define([_SM_MAXVERS],[9.0.0])dnl
 define([_SM_MINVERS],[8.7.6])dnl
 
@@ -382,7 +382,7 @@ sm_libs='';					AC_SUBST(sm_libs)
 sm_editmap_envdef='';		AC_SUBST(sm_editmap_envdef)
 sm_editmap_libs='';			AC_SUBST(sm_editmap_libs)
 # libmilter
-sm_libmilter_envdef='-fPIC';		AC_SUBST(sm_libmilter_envdef)
+sm_libmilter_envdef='-fPIC';	AC_SUBST(sm_libmilter_envdef)
 sm_libmilter_libs='';		AC_SUBST(sm_libmilter_libs)
 sm_libmilter_version=0;		AC_SUBST(sm_libmilter_version)
 # libsm
@@ -633,6 +633,7 @@ 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";
 	sm_libmilter_version=0;
 	v2i 8.14.0;
 	if  test $sm_version_math -ge $sm_version_test; then
diff --git a/debian/control b/debian/control
index bd66aef..37f24c7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Standards-Version: 3.7.2
 Build-Depends-Indep: groff, bsdmainutils
 Build-Depends: make (>> 3.79.1-14), m4, cdbs, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) | linux-kernel-headers, groff, bsdmainutils , libdb4.6-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev
 Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5)
+Homepage: http://www.sendmail.org
 
 Package: sendmail-bin
 Architecture: any
@@ -33,7 +34,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  This package supports REGEX, DB, NIS, NIS+, LDAP, DNS maps,
  and has enabled TCPWrappers, IPv6, LockFile, SMTP AUTH(SASL), STARTTLS(SSL).
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: rmail
 Architecture: any
@@ -47,7 +48,7 @@ Description: MTA->UUCP remote mail handler
  This version comes from the sendmail source package and the only
  change is the call to sendmail (from -obq to -obi).
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: sensible-mda
 Architecture: any
@@ -74,7 +75,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  This package contains libmilter.so
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: libmilter1-dbg
 Architecture: any
@@ -89,7 +90,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  This package contains debugging information for libmilter.so
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: libmilter-dev
 Architecture: any
@@ -107,7 +108,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  The documentation on building a Milter is in the sendmail-doc package.
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: sendmail-doc
 Architecture: all
@@ -128,7 +129,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  .
  Other files include the references for smrsh and libmilter.
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: sendmail
 Architecture: all
@@ -155,7 +156,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  .
  This package is to make installation/upgrading easier (Do NOT delete it)
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: sendmail-base
 Architecture: all
@@ -171,7 +172,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  This package contains the base, architecture independent, portions
  of the sendmail packages.
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
 Package: sendmail-cf
 Architecture: all
@@ -187,5 +188,5 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  This package contains the .m4 (configuration files) for the
  sendmail packages.
  .
- Homepage: http://www.sendmail.org
+Homepage: http://www.sendmail.org
 
diff --git a/debian/local/update_sys.in b/debian/local/update_sys.in
index 977a287..fac690b 100644
--- a/debian/local/update_sys.in
+++ b/debian/local/update_sys.in
@@ -79,17 +79,17 @@ if [ ! -e @localstatedir@/mail ]; then
 	elif [ -d @localstatedir@/spool/mail ]; then
 		mv @localstatedir@/spool/mail @localstatedir@/mail;
 		chown root:root @localstatedir@/mail;
-		chmod 03775 @localstatedir@/mail;
+		chmod 03777 @localstatedir@/mail;
 	else
 		mkdir @localstatedir@/mail;
 		chown root:root @localstatedir@/mail;
-		chmod 03775 @localstatedir@/mail;
+		chmod 03777 @localstatedir@/mail;
 		fi;
 	fi;
 #
 # Make sure the sticky bit is set in pre-existing directories
 if [ -d @localstatedir@/mail ] && [ ! -k @localstatedir@/mail ]; then
-	chmod a+t @localstatedir@/mail;
+	chmod 03777 @localstatedir@/mail;
 	fi;
 if [ -d @localstatedir@/spool/mail ] \
 && [ ! -k @localstatedir@/spool/mail ]; then
@@ -100,7 +100,7 @@ if [ ! -d @localstatedir@/spool/mail ] \
 	ln -sf ../mail @localstatedir@/spool/mail;
 	#mkdir @localstatedir@/spool/mail;
 	#chown root:root @localstatedir@/spool/mail;
-	#chmod 03775 @localstatedir@/spool/mail;
+	#chmod 03777 @localstatedir@/spool/mail;
 	fi;
 
 #------------------------------------------------------------------------------