use Email::Filter;
use Email::LocalDelivery;
sub usage { "Usage:\n".join('',grep(/\t/, `head -n 10 $0`)) }
+my $exit = 0;
+my $sighandler = sub { $exit = 1 };
+$SIG{INT} = $sighandler;
+$SIG{TERM} = $sighandler;
my $spool = shift @ARGV or die usage();
my $recipient = $ENV{ORIGINAL_RECIPIENT};
defined $recipient or die usage();
-my @mda = qw(public-inbox-mda);
my $config = PublicInbox::Config->new;
my $cfg = $config->lookup($recipient);
defined $cfg or exit(1);
-use Data::Dumper; print STDERR Dumper($cfg);
+my @mda;
+if ($ENV{'FILTER'}) {
+ @mda = qw(public-inbox-mda);
+} else {
+ @mda = (qw(ssoma-mda -1), $cfg->{mainrepo});
+}
sub get_min {
my ($cfg) = @_;
- $cfg->{importslrnspoolstate} || 1
+ $cfg->{importslrnspoolstate} || 0;
}
sub set_min {
my $max_gap = 10000;
my $max = $n + $max_gap;
-for (; $n < $max; $n++) {
+for (; $exit == 0 && $n < $max; $n++) {
my $fn = "$spool/$n";
print STDERR $fn, "\n";
open(my $fh, '<', $fn) or next;
my $s = $f->simple;
# gmane rewrites Received headers, which increases spamminess
- my @h = $s->header('Original-Received');
- if (@h) {
- $s->header_set('Received', @h);
- $s->header_set('Original-Received');
+ # Some older archives set Original-To
+ foreach my $x (qw(Received To)) {
+ my @h = $s->header("Original-$x");
+ if (@h) {
+ $s->header_set($x, @h);
+ $s->header_set("Original-$x");
+ }
}
# triggers for the SA HEADER_SPAM rule