summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Echolot/Config.pm4
-rw-r--r--Echolot/Tools.pm25
-rw-r--r--NEWS5
-rw-r--r--README4
4 files changed, 22 insertions, 16 deletions
diff --git a/Echolot/Config.pm b/Echolot/Config.pm
index 4d2f07a..b651d81 100644
--- a/Echolot/Config.pm
+++ b/Echolot/Config.pm
@@ -1,7 +1,7 @@
package Echolot::Config;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Config.pm,v 1.21 2002/07/10 17:58:05 weasel Exp $
+# $Id: Config.pm,v 1.22 2002/07/10 21:46:28 weasel Exp $
#
=pod
@@ -62,7 +62,7 @@ sub init($) {
hash_len => 8,
addresses_default_ttl => 5, # getkeyconf seconds (days)
check_resurrection_ttl => 8, # check_resurrection seconds (weeks)
- smarthost => 'localhost',
+ sendmail => '/usr/sbin/sendmail',
mailindir => 'mail',
mailerrordir => 'mail-errors',
fetch_new => 1,
diff --git a/Echolot/Tools.pm b/Echolot/Tools.pm
index 448b198..17a5980 100644
--- a/Echolot/Tools.pm
+++ b/Echolot/Tools.pm
@@ -1,7 +1,7 @@
package Echolot::Tools;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Tools.pm,v 1.3 2002/06/18 17:20:34 weasel Exp $
+# $Id: Tools.pm,v 1.4 2002/07/10 21:46:28 weasel Exp $
#
=pod
@@ -19,7 +19,6 @@ use strict;
use warnings;
use Carp qw{cluck};
use Digest::MD5 qw{};
-use Mail::Internet;
sub hash($) {
my ($data) = @_;
@@ -117,17 +116,19 @@ sub send_message(%) {
};
$args{'Subject'} = 'none' unless (defined $args{'Subject'});
- my $head = new Mail::Header;
- $head->add ( 'To', $args{'To'} );
- $head->add ( 'From', $args{'From'} );
- $head->add ( 'Subject', $args{'Subject'} );
-
- my @lines = map { $_."\n" } split (/\r?\n/, $args{'Body'});
- my $mail = new Mail::Internet (
- Header => $head,
- Body => \@lines );
+ open(SENDMAIL, '|'.Echolot::Config::get()->{'sendmail'}.' -f '.$args{'From'}.' -t')
+ or cluck("Cannot run sendmail: $!"),
+ return 0;
+ printf SENDMAIL "From: %s\n", $args{'From'};
+ printf SENDMAIL "To: %s\n", $args{'To'};
+ printf SENDMAIL "Subject: %s\n", $args{'Subject'};
+ printf SENDMAIL "\n";
+ for my $line (@lines) {
+ print SENDMAIL $line;
+ };
+ close SENDMAIL;
- $mail->smtpsend( Host => Echolot::Config::get()->{'smarthost'} );
+ return 1;
};
1;
diff --git a/NEWS b/NEWS
index b3fa378..4f4d3ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Changes in version
+ * Did away with Mail::Internet. Using local sendmail binary only.
+ This also means the smarthost config option is obsolete and there
+ is a sendmail config option now.
+
Changes in version 2.0beta5 - 2002-07-10
* Thesaurus filenames changed from nn-foo to nn.foo.
Use the change-thesaurus-filenames script in the tools
diff --git a/README b/README
index 07c144c..5ca3da6 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.12 2002/07/10 13:04:06 weasel Exp $
+$Id: README,v 1.13 2002/07/10 21:46:28 weasel Exp $
Echolot is a Pinger for anonymous remailers.
@@ -24,8 +24,8 @@ REQUIREMENTS
in general:
Data::Dumper (should be part of perl-base)
Digest::MD5
- Mail::Internet
HTML::Template
+ a local Mail Transfer Agent
for type1 pings
GnuPG (1.0.7)
GnuPG::Interface (0.33)