Phishing net improvement I get an error when I try to run the patch
Carinus Carelse
carinus.carelse at MRC.AC.ZA
Tue Nov 9 16:14:42 GMT 2004
I am installing the patch on MailScanner-4.31.6. On Solaris 9.
Carinus
Error Message
Looks like a unified context diff.
Hunk #1 failed at line 4043.
Hunk #2 failed at line 4055.
2 out of 2 hunks failed: saving rejects to ./Message.pm.rej
done
Message.pm.rej file
**************
*** 4043,4048 ****
$squashedtext =~ s#%([0-9a-f][0-9a-f])#chr(hex('0x' . $1))#gei; #
Unescape
$squashedtext =~ s/\s+//g; # Remove any whitespace
$squashedtext =~ s/\\/\//g;
#print STDERR "Text = \"$text\"\n";
#print STDERR "1SquashedText = \"$squashedtext\"\n";
#print STDERR "1LinkURL = \"$DisarmLinkURL\"\n";
--- 4043,4050 ----
$squashedtext =~ s#%([0-9a-f][0-9a-f])#chr(hex('0x' . $1))#gei; #
Unescape
$squashedtext =~ s/\s+//g; # Remove any whitespace
$squashedtext =~ s/\\/\//g;
+ $squashedtext =~ s/(\<\/?[^>]*\>)*//ig; # Remove tags
+ #$squashedtext =~ s/^(\<\/?(br|p|ul)\>)*//ig; # Remove leading br,
p, ul tags
#print STDERR "Text = \"$text\"\n";
#print STDERR "1SquashedText = \"$squashedtext\"\n";
#print STDERR "1LinkURL = \"$DisarmLinkURL\"\n";
***************
*** 4055,4063 ****
$linkurl =~ s/\%a0//g;
$linkurl =~ s#%([0-9a-f][0-9a-f])#chr(hex('0x' . $1))#gei; #
Unescape
$linkurl =~ s/\s+//; # Remove any whitespace
$linkurl =~ s/^(https?|ftp):\/\///;
$linkurl =~ s/\/.*$//; # Only compare up to the first '/'
(hostname only)
- $linkurl =~ s/\<\/?(br|p)\>$//i; # Remove trailing <br> and <p>
tags
$linkurl =~ s/\/$//; # LinkURL is trimmed -- note
#print STDERR "2SquashedText = \"$squashedtext\"\n";
#print STDERR "2LinkURL = \"$linkurl\"\n";
--- 4057,4067 ----
$linkurl =~ s/\%a0//g;
$linkurl =~ s#%([0-9a-f][0-9a-f])#chr(hex('0x' . $1))#gei; #
Unescape
$linkurl =~ s/\s+//; # Remove any whitespace
+ #$linkurl =~ s/(\<\/?[^>]*\>)*//ig; # Remove tags
+ #$linkurl =~ s/^(\<\/?(br|p|ul)\>)*//ig; # Remove leading br, p,
ul tags
$linkurl =~ s/^(https?|ftp):\/\///;
$linkurl =~ s/\/.*$//; # Only compare up to the first '/'
(hostname only)
+ $linkurl =~ s/(\<\/?(br|p|ul)\>)*$//ig; # Remove trailing br, p,
ul tags
$linkurl =~ s/\/$//; # LinkURL is trimmed -- note
#print STDERR "2SquashedText = \"$squashedtext\"\n";
#print STDERR "2LinkURL = \"$linkurl\"\n";
------------------------ MailScanner list ------------------------ To
unsubscribe, email jiscmail at jiscmail.ac.uk with the words:
'leave mailscanner' in the body of the email.
Before posting, read the MAQ (http://www.mailscanner.biz/maq/)
and the archives (http://www.jiscmail.ac.uk/lists/mailscanner.html).
More information about the MailScanner
mailing list