Imported Debian patch 8.14.3-6debian/8.14.3-6

6 files changed, 18 insertions, 5 deletions

diff --git a/debian/build/autoconf.mk b/debian/build/autoconf.mk
index 9e62798..56c631c 100644
--- a/debian/build/autoconf.mk
+++ b/debian/build/autoconf.mk
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # vim: syntax=make
 #
-# $Sendmail: autoconf.mk,v 8.14.3 2008-07-15 15:26:59 cowboy Exp $
+# $Sendmail: autoconf.mk,v 8.14.3 2008-12-05 19:32:15 cowboy Exp $
 #
 # Copyright (c) 1998-2008 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> 2008-07-15 15:26:59 (-0700)
+# Richard Nelson <cowboy@debian.org> 2008-12-05 19:32:15 (-0800)
 #------------------------------------------------------------------------------
 #SHELL := /bin/sh -x
 
diff --git a/debian/changelog b/debian/changelog
index 1a83e66..6fea8a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sendmail (8.14.3-6) unstable; urgency=high
+
+  * Properly support GSSAPI auth (keep KRB5_KTNAME)
+  * Correct crontab entries for queue aging (-s <time>, not 0)
+  * Enable milter processing of rejected recipients
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Fri, 17 Oct 2008 23:35:00 -0000
+
 sendmail (8.14.3-5) unstable; urgency=high
 
   * Sendmail uses the same filemode for pid/hoststat/dead.letter/etc
diff --git a/debian/configure b/debian/configure
index c161d6b..6c4ffd2 100644
--- a/debian/configure
+++ b/debian/configure
@@ -4752,6 +4752,7 @@ if test "$sm_version_major" = "8.14"; then
 	sm_ffr="$sm_ffr -D_FFR_MAIL_MACRO";
 	sm_m4_ffr="$sm_m4_ffr define(\`_FFR_MAIL_MACRO')";
 	sm_ffr="$sm_ffr -D_FFR_QUEUEDELAY=1";
+	sm_ffr="$sm_ffr -D_FFR_BADRCPT_SHUTDOWN";
 elif test "$sm_version_major" = "8.13"; then
 	sm_ffr="$sm_ffr -D_FFR_SKIP_DOMAINS";
 	sm_mapdef="$sm_mapdef -DSOCKETMAP";
diff --git a/debian/configure.ac b/debian/configure.ac
index 8b730b7..5f7a8ce 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -477,6 +477,7 @@ if test "$sm_version_major" = "8.14"; then
 	sm_ffr="$sm_ffr -D_FFR_MAIL_MACRO";
 	sm_m4_ffr="$sm_m4_ffr [define(\`_FFR_MAIL_MACRO')]";
 	sm_ffr="$sm_ffr -D_FFR_QUEUEDELAY=1";
+	sm_ffr="$sm_ffr -D_FFR_BADRCPT_SHUTDOWN";
 elif test "$sm_version_major" = "8.13"; then
 	sm_ffr="$sm_ffr -D_FFR_SKIP_DOMAINS";
 	sm_mapdef="$sm_mapdef -DSOCKETMAP";
diff --git a/debian/local/update_conf.in b/debian/local/update_conf.in
index c6b2ff9..efd0b1d 100644
--- a/debian/local/update_conf.in
+++ b/debian/local/update_conf.in
@@ -186,6 +186,7 @@ sub sm2cron_time {
 
 	my ($sm)	= @_;
 	my $seconds = 0;
+	my $elapsed = 0;
 	my $randstart = '00';
 	if ($sm eq '') {
 		if ( $main::opt_test ) {
@@ -214,6 +215,7 @@ sub sm2cron_time {
 	         + ($hour   * 60 * 60)
 	         + ($minute * 60)
 	         + $second;
+	$elapsed = $seconds;
 	$month   = $seconds / (4 * 7 * 24 * 60 * 60);
 	$seconds = $seconds % (4 * 7 * 24 * 60 * 60);
 	$week    = $seconds / (7 * 24 * 60 * 60);
@@ -293,7 +295,7 @@ sub sm2cron_time {
 	if ( $main::opt_test ) {
 		print "$cron = sm2cron_time($sm);\n";
 		};
-	return ($cron, $seconds);	
+	return ($cron, $elapsed);	
 	};
 
 #
diff --git a/debian/patches/8.14/8.14.3/kerberos.patch b/debian/patches/8.14/8.14.3/kerberos.patch
index 969a0f6..59cb0e7 100644
--- a/debian/patches/8.14/8.14.3/kerberos.patch
+++ b/debian/patches/8.14/8.14.3/kerberos.patch
@@ -7,7 +7,7 @@ Prereq:  8.1141
 --- ./debian/conf.c	Mon May 26 20:02:22 2008
 ***************
 *** 3891,3896 ****
---- 3891,3902 ----
+--- 3891,3903 ----
   vendor_post_defaults(e)
   	ENVELOPE *e;
   {
@@ -15,7 +15,8 @@ Prereq:  8.1141
 + 	 * Kerberos V support
 + 	 */
 + 	sm_setuserenv("KRB5CCNAME", NULL);
-+ 	sm_setuserenv("KRB5KTNAME", NULL);
++ 	sm_setuserenv("KRB5_KTNAME", NULL);
++ 	sm_setuserenv("KRB5_CONFIG", NULL);
 + 
   #ifdef __QNX__
   	/* Makes sure the SOCK environment variable remains */