diff options
-rwxr-xr-x | scripts/import_slrnspool | 11 | ||||
-rwxr-xr-x | scripts/slrnspool2maildir | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/scripts/import_slrnspool b/scripts/import_slrnspool index fec7ebf1..ea7a97bf 100755 --- a/scripts/import_slrnspool +++ b/scripts/import_slrnspool @@ -50,10 +50,13 @@ for (; $n < $max; $n++) { 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 diff --git a/scripts/slrnspool2maildir b/scripts/slrnspool2maildir index 12510a32..08313973 100755 --- a/scripts/slrnspool2maildir +++ b/scripts/slrnspool2maildir @@ -27,10 +27,13 @@ foreach my $n (grep(/\d+\z/, glob("$spool/*"))) { 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 |