t/feed: remove useless $ENV{GIT_DIR} assignment

[public-inbox.git] / scripts / slrnspool2maildir

diff --git a/scripts/slrnspool2maildir b/scripts/slrnspool2maildir
index 12510a327fbbae114abed540ee5797e6eaa4665f..8e444e84d57a2a3db6739b87dec2adde5e679f7e 100755 (executable)
--- a/scripts/slrnspool2maildir
+++ b/scripts/slrnspool2maildir
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # One-off script to convert an slrnpull news spool to Maildir
 =begin usage
@@ -23,14 +23,17 @@ foreach my $sub (qw(cur new tmp)) {
 
 foreach my $n (grep(/\d+\z/, glob("$spool/*"))) {
        if (open my $fh, '<', $n) {
-               my $f = Email::Filter->new(data => eval { local $/; <$fh> });
+               my $f = Email::Filter->new(data => do { local $/; <$fh> });
                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