From: don <>
Date: Wed, 19 Oct 2005 08:22:14 +0000 (-0800)
Subject: [project @ 2005-10-19 01:22:13 by don]
X-Git-Tag: release/2.6.0~637
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b3c9deaaab461952096cafa9cf28ef346217035a;p=debbugs.git

[project @ 2005-10-19 01:22:13 by don]
* Allow X-debbugs-* to be set in pseudo headers (closes: #179340)
 * Obey X-Debbugs-No-Ack in control@ messages (Closes: #201825)
 * Allow forwarded to be set at submit@ time (Closes: #128320)
---

diff --git a/debian/changelog b/debian/changelog
index 54065af7..ad86ab5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -91,7 +91,10 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Add rudimentary Test::More modules for testing Debbugs::Mime and
       Debbugs::Mail. These are currently not called as part of the build
       process.
-
+    - Allow X-debbugs-* to be set in pseudo headers. (closes: #179340)
+    - Obey X-Debbugs-No-Ack in control@ messages. (closes: #201825)
+    - Allow forwarded: to be set at submit@ time. (closes: #128320)
+  
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
 
 debbugs (2.4.1) unstable; urgency=low
diff --git a/scripts/process.in b/scripts/process.in
index 11d5b469..1373aa3d 100755
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.106 2005/10/06 03:46:13 ajt Exp $
+# $Id: process.in,v 1.107 2005/10/19 01:22:14 don Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -147,6 +147,10 @@ for my $phline (@bodylines)
     print DEBUG ">$fn~$fv<\n";
 }
 
+# Allow pseudo headers to set x-debbugs- stuff [#179340]
+for my $key (grep /X-Debbugs-.*/i, keys %pheader) {
+     $header{$key} = $pheader{$key} if not exists $header{$key};
+}
 
 $fwd .= join("\n",@msg[$i..$#msg]);
 
@@ -595,6 +599,9 @@ END
     if (defined($pheader{owner})) {
         $data->{owner}= $pheader{owner};
     }
+    if (defined($pheader{forwarded})) {
+	$data->{'forwarded-to'} = $pheader{forwarded};
+    }
     &filelock("nextnumber.lock");
     open(N,"nextnumber") || &quit("nextnumber: read: $!");
     $v=<N>; $v =~ s/\n$// || &quit("nextnumber bad format");
diff --git a/scripts/service.in b/scripts/service.in
index 35d49461..6dee299a 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.117 2005/10/09 14:17:41 ajt Exp $
+# $Id: service.in,v 1.118 2005/10/19 01:22:14 don Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -1109,7 +1109,7 @@ close(AP) || &quit("open db-h/-1.log: $!");
 &unfilelock;
 utime(time,time,"db-h");
 
-&sendmailmessage($reply,$replyto,@maintccaddrs,@bcc);
+&sendmailmessage($reply,exists $header{'x-debbugs-no-ack'}?():$replyto,@maintccaddrs,@bcc);
 
 unlink("incoming/P$nn") || &quit("unlinking incoming/P$nn: $!");