From 5a93a371c0c14c494f28c226d3be1ff6b0aff367 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 9 Jul 2017 17:49:46 -0700
Subject: [PATCH] strip out Mail-Followup-To

---
 debian/changelog | 1 +
 scripts/process  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 775e876..41458cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,7 @@ debbugs (2.6.0~exp1) UNRELEASED; urgency=low
   * Add envelope_from configuration variable so sites can set a valid return
     path if the sendmail default is wrong. (Closes: #719205)
   * Fix links to merged and blocked bugs. (Closes: #539691)
+  * Strip out Mail-Followup-To: (Closes: #798092)
 
   [ Niels Thykier ]
   * quitcgi() now returns 400/500 status codes instead of 200 (Closes: #584922)
diff --git a/scripts/process b/scripts/process
index 95d933d..228d28a 100755
--- a/scripts/process
+++ b/scripts/process
@@ -180,8 +180,8 @@ for my $hdr (@headerlines) {
     $_ = $hdr;
     s/\n\s/ /g;
     finish() if m/^x-loop: (\S+)$/i && $1 eq "$gMaintainerEmail";
-    my $ins = !m/^subject:/i && !m/^reply-to:/i && !m/^return-path:/i
-           && !m/^From / && !m/^X-Debbugs-/i;
+    my $ins = !m/^(?:(?:subject|reply-to|return-path|mail-followup-to):
+		 |From\s|X-Debbugs-)/xi;
     $fwd .= encode_utf8($hdr)."\n" if $ins;
     # print {$debugfh} ">$_<\n";
     if (s/^(\S+):\s*//) {
-- 
2.39.2