[dak/security] Quiet perl warnings. Ganneff: this means changing config - I tried to stay away from that the first time around, since I wanted to ignore some values that no longer matter, but now I'm reusing them so we don't get 'variable only used once' warnings.

[Stephen Gran <steve@lobefin.net>]

---
 tools/debianqueued-0.9/config       |    2 +-
 tools/debianqueued-0.9/debianqueued |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config
index bc43245..f2daa77 100644
--- a/tools/debianqueued-0.9/config
+++ b/tools/debianqueued-0.9/config
@@ -73,7 +73,7 @@ $scp       = "/usr/bin/scp";
 $ssh_agent = "/usr/bin/ssh-agent";
 $ssh_add   = "/usr/bin/ssh-add";
 $md5sum    = "/usr/bin/md5sum";
-$mail      = "/usr/bin/mail";
+$mail      = "/usr/sbin/sendmail";
 $mkfifo    = "/usr/bin/mkfifo";
 $tar       = "/bin/tar"; # must be GNU tar!
 $gzip      = "/bin/gzip";
diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index c4dec40..c2f282d 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -276,6 +276,7 @@ $junk = $conf::no_changes_timeout;
 $junk = @conf::nonus_packages;
 $junk = @conf::test_binaries;
 $junk = @conf::maintainer_mail;
+$junk = $conf::mail ||= '/usr/sbin/sendmail';
 $conf::target = "localhost" if $conf::upload_method eq "copy";
 package main;
 
@@ -2090,7 +2091,6 @@ sub init_mail(;$) {
 # then send out
 #
 sub finish_mail() {
-	local( *MAIL );
 
 	debug( "No mail for $main::mail_addr" )
 		if $main::mail_addr && !$main::mail_text;
@@ -2127,7 +2127,10 @@ sub send_mail($$$) {
 	my $package = keys %main::packages ? join(' ', keys %main::packages) : "";
 
 	use Email::Send;
-	$Email::Send::Sendmail::SENDMAIL = '/usr/sbin/sendmail';
+
+        unless (defined($Email::Send::Sendmail::SENDMAIL)) {
+		$Email::Send::Sendmail::SENDMAIL = $conf::mail;
+	}
 
 	my $message = <<__MESSAGE__;
 To: $addr
-- 
1.5.6.5