diff options
author | vs <vs@FreeBSD.org> | 2004-11-10 18:44:48 +0800 |
---|---|---|
committer | vs <vs@FreeBSD.org> | 2004-11-10 18:44:48 +0800 |
commit | 4f6d9f3883bf6af9873496cc22c198558d8ebf73 (patch) | |
tree | ddf304484da310d4261070c030acd5d8fbe6a3d3 | |
parent | e1dda459b7d901ff44af89e107586de6d6be2395 (diff) | |
download | freebsd-ports-gnome-4f6d9f3883bf6af9873496cc22c198558d8ebf73.tar.gz freebsd-ports-gnome-4f6d9f3883bf6af9873496cc22c198558d8ebf73.tar.zst freebsd-ports-gnome-4f6d9f3883bf6af9873496cc22c198558d8ebf73.zip |
Update to 4.35.11:
Improvement to Phishing-Mail Detection
PR: ports/73762
Submitted by: maintainer
-rw-r--r-- | mail/mailscanner/Makefile | 2 | ||||
-rw-r--r-- | mail/mailscanner/distinfo | 4 | ||||
-rw-r--r-- | mail/mailscanner/files/patch-lib:MailScanner:Message.pm | 24 |
3 files changed, 27 insertions, 3 deletions
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index ea335a94bc40..d3c217396ee2 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -6,7 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.35.9 +PORTVERSION= 4.35.11 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo index 7347b345ee9a..7af63d1a4fdd 100644 --- a/mail/mailscanner/distinfo +++ b/mail/mailscanner/distinfo @@ -1,2 +1,2 @@ -MD5 (MailScanner-install-4.35.9-1.tar.gz) = 4e3a0739cec1cc0bd94e24fb8ac558db -SIZE (MailScanner-install-4.35.9-1.tar.gz) = 5480916 +MD5 (MailScanner-install-4.35.11-1.tar.gz) = 2ce8d93b6526c33791ad696a7e61cc7d +SIZE (MailScanner-install-4.35.11-1.tar.gz) = 5508189 diff --git a/mail/mailscanner/files/patch-lib:MailScanner:Message.pm b/mail/mailscanner/files/patch-lib:MailScanner:Message.pm new file mode 100644 index 000000000000..9d2c9bf41290 --- /dev/null +++ b/mail/mailscanner/files/patch-lib:MailScanner:Message.pm @@ -0,0 +1,24 @@ +--- ../MailScanner-install-4.35.11.orig/lib/MailScanner/Message.pm Wed Nov 10 08:31:01 2004 ++++ lib/MailScanner/Message.pm Wed Nov 10 08:33:19 2004 +@@ -4043,6 +4043,8 @@ + $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,9 +4057,11 @@ + $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)\>$//i; # Remove trailing <br> and <p> tags ++ $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"; |