* Thomas Arendsen Hein <tho...@intevation.de> [20100204 12:36]:
> https://issues.kolab.org/merge32 contains a patch (also attached to
> this mail) that we use with amavisd-new 2.5.x since 2007, it still
> applies to amavisd-new 2.6.4

It seems the mailing list eats attachments, so again inline
(and of course still downloadable at above URL):

diff -urN amavisd-new-2.5.1.orig/amavisd amavisd-new-2.5.1/amavisd
--- amavisd-new-2.5.1.orig/amavisd      2007-05-31 14:10:01.000000000 +0200
+++ amavisd-new-2.5.1/amavisd   2007-06-06 16:33:54.000000000 +0200
@@ -9854,7 +9854,10 @@
       if ($subject_tag ne '') {
         if (defined $msginfo->orig_header_fields->{'subject'}) {
           $hdr_edits->edit_header('Subject',
-                    sub { $_[1]=~/^([ \t]?)(.*)\z/s; ' '.$subject_tag.$2 });
+                    sub { $_[1]=~/^([ \t]?)(.*)\z/s;
+                          my $subj = $2;
+                          $subj=~s/\Q$subject_tag\E//sg;
+                          ' '.$subject_tag.$subj });
         } else {  # no Subject header field present, insert one
           $subject_tag =~ s/[ \t]+\z//;  # trim
           $hdr_edits->append_header('Subject', $subject_tag);

-- 
tho...@intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
AMaViS-user mailing list
AMaViS-user@lists.sourceforge.net 
https://lists.sourceforge.net/lists/listinfo/amavis-user 
 AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3 
 AMaViS-HowTos:http://www.amavis.org/howto/ 

Reply via email to