[PATCH 1/2] import_slrnspool: fix off-by-one error

[PATCH 1/2] import_slrnspool: fix off-by-one error

[Eric Wong]

We start with zero and only store the next valid ID.
---
 scripts/import_slrnspool | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/import_slrnspool b/scripts/import_slrnspool
index 560c08c..fec7ebf 100755
--- a/scripts/import_slrnspool
+++ b/scripts/import_slrnspool
@@ -25,7 +25,7 @@ use Data::Dumper; print STDERR Dumper($cfg);
 
 sub get_min {
 	my ($cfg) = @_;
-	$cfg->{importslrnspoolstate} || 1
+	$cfg->{importslrnspoolstate} || 0;
 }
 
 sub set_min {
-- 
EW

[PATCH 2/2] *slrnspool* old gmane archives set Original-To

[Eric Wong]

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