----- Original Message ----- From: "Simon Byrnand"
Can you do a unified diff (instead of the kind you did) of your latest changes ? Also do you know if there is much difference between SpamCopURI 0.09 and 0.10 in the area you have changed ? (I'm using the latter)
Regards, Simon
See below for unified diff. The changes are to PerMsgStatus.pm a SA module rather than to SpamCopURI. However, the same file has already been changed during SpamCopURI install. The diff assumes the 0.09 install of SpamCopURI has already been done. I'll install 0.10 sometime in the next days and let you know if I find any incompatibilities.
John
--- PerMsgStatus.pm.orig 2004-04-20 08:46:05.000000000 +0200 +++ PerMsgStatus.pm 2004-04-18 14:24:52.000000000 +0200 @@ -44,6 +44,7 @@ use Mail::SpamAssassin::Conf; use Mail::SpamAssassin::Received; use Mail::SpamAssassin::Util; +use HTML::Entities;
use constant HAS_MIME_BASE64 => eval { require MIME::Base64; };
@@ -1776,6 +1777,16 @@ $uri = "${base_uri}$uri"; } } + dbg("Got URI: $uri"); + $uri =~ s/%68/h/g; + $uri =~ s/%74/t/g; + $uri =~ s/%70/p/g; + $uri =~ s/http:/([^/])/http://$1/g; + $uri =~ s/http://http:///http:///g; + $uri =~ s/^http://(?:drs|rd).yahoo.com/[^*]+*(.*)$/$1/g; + $uri =~ s/^http://g.msn.com/[^*]+?http:(.*)$/http:$1/g; + $uri = HTML::Entities::decode($uri); + dbg("URI after filter: $uri");
# warn("Got URI: $uri\n"); push @uris, $uri;