From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, T_RP_MATCHES_RCVD shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 12E6B20245 for ; Sun, 11 Jan 2015 04:47:08 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/2] *slrnspool* old gmane archives set Original-To Date: Sun, 11 Jan 2015 04:47:07 +0000 Message-Id: <1420951627-19240-2-git-send-email-e@80x24.org> X-Mailer: git-send-email 2.2.0.35.g882592c In-Reply-To: <1420951627-19240-1-git-send-email-e@80x24.org> References: <1420951627-19240-1-git-send-email-e@80x24.org> List-Id: Apparently it's not a problem with recent archives. --- scripts/import_slrnspool | 11 +++++++---- scripts/slrnspool2maildir | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/scripts/import_slrnspool b/scripts/import_slrnspool index fec7ebf..ea7a97b 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 12510a3..0831397 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 -- EW