- disable header rewriting

Changed files:
    amavis-ng-courier.patch -> 1.4

diff --git a/amavis-ng-courier.patch b/amavis-ng-courier.patch
index 0d59f9db68accb1d5ab08a333d7822ca4f756ec6..adef4e5bc09a727e93d1cede0af9a5b245c08502 100644 (file)
--- a/amavis-ng-courier.patch
+++ b/amavis-ng-courier.patch
@@ -1,6 +1,6 @@
 diff -Nur old/AMAVIS/MTA/Courier.pm new/AMAVIS/MTA/Courier.pm
 --- old/AMAVIS/MTA/Courier.pm  2003-03-17 23:04:11.000000000 +0000
-+++ new/AMAVIS/MTA/Courier.pm  2004-07-15 16:22:43.000000000 +0000
++++ new/AMAVIS/MTA/Courier.pm  2004-07-25 21:50:53.000000000 +0000
 @@ -97,7 +97,7 @@
    my $message_id;
    while (1) {
@@ -10,35 +10,6 @@ diff -Nur old/AMAVIS/MTA/Courier.pm new/AMAVIS/MTA/Courier.pm
        if (++$i > 10) {
        return 0;
        }
-@@ -174,19 +174,16 @@
-   my $args = shift;
-   writelog($args,LOG_INFO, __PACKAGE__.": Accepting message");
- 
--  #TODO Courier filters cannot rewrite MIME messages, we'd like
--  #to be able to add a header or something to this message but
--  #we can't.(yet). Sorry
--  
-   ##Rewrite the message in the queue if we need to add a header
--  #if ($cfg_x_header) {
--  #  my $queuefile = IO::File->new("+>$$args{'messagefile'}");
--  #  print $queuefile "$cfg_x_header_tag: $cfg_x_header_line\n";
--  #  while (my $line=$$args{'filehandle'}->getline()) {
--  #    print $queuefile $line;
--  #  }
--  #  close($queuefile);
--  #}
-+  if ($cfg_x_header) {
-+    my $queuefile = IO::File->new("+>$$args{'messagefile'}");
-+    print $queuefile "$cfg_x_header_tag: $cfg_x_header_line\n";
-+    while (my $line=$$args{'filehandle'}->getline()) {
-+      print $queuefile $line;
-+    }
-+    print STDOUT $queuefile;
-+    close($queuefile);
-+  }
- 
-   $$args{'status'} = 'accept';
-   
 diff -Nur old/doc/amavis-ng.texi new/doc/amavis-ng.texi
 --- old/doc/amavis-ng.texi     2003-04-14 15:18:47.000000000 +0000
 +++ new/doc/amavis-ng.texi     2004-07-23 12:07:46.000000000 +0000
@@ -93,15 +64,3 @@ diff -Nur old/doc/amavis-ng.texi new/doc/amavis-ng.texi
  
  Reload the perlfilter and start the virus filter with the commands:
  
-diff -Nur old/etc/amavis.conf new/etc/amavis.conf
---- old/etc/amavis.conf        2003-04-08 14:09:56.000000000 +0000
-+++ new/etc/amavis.conf        2004-07-15 16:20:34.000000000 +0000
-@@ -54,7 +54,7 @@
- ; notifiers=Sender, Recipients, Admin
- 
- ;; What should be inserted into the message's headers if it is let
--;; through? This does not work for the Milter or Courier interfaces.
-+;; through? This does not work for the Milter interface.
- 
- ; x-header = true
- ; x-header-tag = X-Scanned-By