From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 16 Dec 2017 00:37:15 +0000 (-0800)
Subject: fix the received regex in add_return_path
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=0a6b31074ce45aa19c69d9bed15148dd28ac946c

fix the received regex in add_return_path
---

diff --git a/bin/debbugs-spam b/bin/debbugs-spam
index 25ba7c6..37deeb5 100755
--- a/bin/debbugs-spam
+++ b/bin/debbugs-spam
@@ -346,8 +346,8 @@ sub add_return_path {
     ## ", and doesn't have a Return-Path. Fix that up so spamassassin
     ## is happy.
     $message =~
-        s{^(Received: at \S+\ by \S+;[^\n]+\n)(From (\S+) [^\n]+\n)}
-        {${1}Return-Path: $3\n$2};
+        s{^(Received: \(at \S+\) by \S+;[^\n]+\n)(From (\S+) [^\n]+\n)}
+        {${2}Return-Path: $3\n$1};
     return $message;
 }