From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 15 20:20:31 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B7D716A4F9 for ; Wed, 15 Dec 2004 20:20:31 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6AE743D2D for ; Wed, 15 Dec 2004 20:20:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBFKKUxU067859 for ; Wed, 15 Dec 2004 20:20:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBFKKUJ5067858; Wed, 15 Dec 2004 20:20:30 GMT (envelope-from gnats) Resent-Date: Wed, 15 Dec 2004 20:20:30 GMT Resent-Message-Id: <200412152020.iBFKKUJ5067858@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jan-Peter Koopmann Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8529F16A4CE for ; Wed, 15 Dec 2004 20:12:51 +0000 (GMT) Received: from mail.seceidos.de (mail.seceidos.de [213.157.28.234]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42C1F43D5C for ; Wed, 15 Dec 2004 20:12:50 +0000 (GMT) root=freebsd-gnats-submit=freebsd.org=7d45f6c3b4adf33f63274392d7377e7a5e58050b@seceidos.de) Message-Id: <200412152012.iBFKCjoH035548@services.intern.seceidos.de> Date: Wed, 15 Dec 2004 21:12:45 +0100 (CET) From: Jan-Peter Koopmann To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/75127: [MAINTAINER] mail/MailScanner: update to 4.36.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 20:20:31 -0000 >Number: 75127 >Category: ports >Synopsis: [MAINTAINER] mail/MailScanner: update to 4.36.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Dec 15 20:20:30 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Jan-Peter Koopmann >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD services.intern.seceidos.de 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Jan 5 10:56:46 CET >Description: - Update to 4.36.4 Removed file(s): - files/patch-lib:MailScanner:Message.pm ChangeLog: * New Features and Improvements * - Improved URL trimming in phishing net. - Various improvements and fixes in phishing net. - Added support for RedHat Enterprise Linux 4. - Added check for Password-Protected Archives setting when using clamavmodule. - Added support for "fast" parameter to all installation scripts. This reduces all waits to 1 second, greatly speeds installation! - Improved logging when there are too many attachments. - Added message ID to log of phishing attempts. - Added autoupdater for Panda. - Added %variables% to text and HTML report messages, so the email "signature" added to the end of each report is customised centrally from MailScanner.conf. This currently uses %org-long-name% and %web-site%. - Added upgrade_languages_conf script to automate upgrading of the languages.conf file in whatever translation directory you use. * Fixes * - Fixed outstanding problem in bitdefender-autoupdate, so that it works properly on new installations. - Fixed logging problem with phishing net on a few malformed messages. - Removed /var/tmp files from MailScanner-MIME-Base64 rpm build. - Fixed problem in Vexira parser. - Fixed problem where All-Viruses would cause every problem to be silent. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- MailScanner-4.36.4.patch begins here --- diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/Makefile /server-root/ports/mail/mailscanner/Makefile --- /server-root/ports/mail/mailscanner.orig/Makefile Wed Nov 10 11:44:48 2004 +++ /server-root/ports/mail/mailscanner/Makefile Wed Dec 15 21:05:48 2004 @@ -6,7 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.35.11 +PORTVERSION= 4.36.4 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} @@ -208,6 +208,18 @@ else \ ${ECHO} "Changes in MailScanner.conf found. Please look at \ ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \ + fi + # Upgrading langauages.conf... Please wait... ATTENTION: English version only! + @${WRKSRC}/bin/upgrade_languages_conf \ + ${DATADIR}/reports/en/languages.conf \ + ${DATADIR}/reports/en/languages.conf.sample > \ + ${DATADIR}/reports/en/languages.conf.new.${PORTVERSION} \ + 2> /dev/null + @if diff -b -B -q ${DATADIR}/reports/en/languages.conf \ + ${DATADIR}/reports/en/languages.conf.new.${PORTVERSION} ; \ + then ${ECHO} "No changes in languages.conf found" ; \ + ${RM} ${DATADIR}/reports/en/languages.conf.new.${PORTVERSION} ; \ + else ${CP} ${DATADIR}/reports/en/languages.conf.new.${PORTVERSION} ${DATADIR}/reports/en/languages.conf ; \ fi .endif @${SED} -e 's,%%PREFIX%%,${PREFIX},' pkg-message > ${PKGMESSAGE} diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/distinfo /server-root/ports/mail/mailscanner/distinfo --- /server-root/ports/mail/mailscanner.orig/distinfo Wed Nov 10 11:44:48 2004 +++ /server-root/ports/mail/mailscanner/distinfo Wed Dec 15 20:28:15 2004 @@ -1,2 +1,2 @@ -MD5 (MailScanner-install-4.35.11-1.tar.gz) = 2ce8d93b6526c33791ad696a7e61cc7d -SIZE (MailScanner-install-4.35.11-1.tar.gz) = 5508189 +MD5 (MailScanner-install-4.36.4-1.tar.gz) = 322f1b5d8f7e5f0f0bbf53046f1d2a20 +SIZE (MailScanner-install-4.36.4-1.tar.gz) = 5622620 diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8 /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8 --- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8 Mon Nov 1 21:10:10 2004 +++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8 Wed Dec 15 20:34:18 2004 @@ -1,8 +1,8 @@ ---- ../MailScanner-install-4.35.9.orig/docs/man/MailScanner.8 Mon Nov 1 18:03:10 2004 -+++ docs/man/MailScanner.8 Mon Nov 1 18:03:23 2004 +--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.8 Wed Dec 15 20:31:43 2004 ++++ docs/man/MailScanner.8 Wed Dec 15 20:32:20 2004 @@ -1,4 +1,4 @@ -.TH "MailScanner" "8" "4.34.8" "Julian Field" "Mail" -+.TH "MailScanner" "8" "4.35.9" "Julian Field" "Mail" ++.TH "MailScanner" "8" "4.36.4" "Julian Field" "Mail" .SH "NAME" .LP MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8.html /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8.html --- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8.html Mon Nov 1 21:10:10 2004 +++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8.html Wed Dec 15 20:34:18 2004 @@ -1,5 +1,5 @@ ---- ../MailScanner-install-4.35.9.orig/docs/man/MailScanner.8.html Mon Nov 1 18:03:10 2004 -+++ docs/man/MailScanner.8.html Mon Nov 1 18:03:28 2004 +--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.8.html Wed Dec 15 20:31:43 2004 ++++ docs/man/MailScanner.8.html Wed Dec 15 20:32:06 2004 @@ -1,5 +1,5 @@ - diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5 /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 --- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5 Mon Nov 1 21:10:10 2004 +++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 Wed Dec 15 20:34:18 2004 @@ -1,8 +1,8 @@ ---- ../MailScanner-install-4.35.9.orig/docs/man/MailScanner.conf.5 Mon Nov 1 18:03:10 2004 -+++ docs/man/MailScanner.conf.5 Mon Nov 1 18:03:31 2004 +--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.conf.5 Wed Dec 15 20:31:43 2004 ++++ docs/man/MailScanner.conf.5 Wed Dec 15 20:32:29 2004 @@ -1,4 +1,4 @@ -.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail" -+.TH "MailScanner.conf" "5" "4.35.9" "Julian Field" "Mail" ++.TH "MailScanner.conf" "5" "4.36.4" "Julian Field" "Mail" .SH "NAME" .LP MailScanner.conf \- Main configuration for MailScanner diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5.html /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html --- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5.html Mon Nov 1 21:10:10 2004 +++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html Wed Dec 15 20:34:18 2004 @@ -1,5 +1,5 @@ ---- ../MailScanner-install-4.35.9.orig/docs/man/MailScanner.conf.5.html Mon Nov 1 18:03:10 2004 -+++ docs/man/MailScanner.conf.5.html Mon Nov 1 18:03:33 2004 +--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.conf.5.html Wed Dec 15 20:31:43 2004 ++++ docs/man/MailScanner.conf.5.html Wed Dec 15 20:32:12 2004 @@ -1,5 +1,5 @@ - diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-lib:MailScanner:Message.pm /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:Message.pm --- /server-root/ports/mail/mailscanner.orig/files/patch-lib:MailScanner:Message.pm Wed Nov 10 11:44:48 2004 +++ /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:Message.pm Thu Jan 1 01:00:00 1970 @@ -1,24 +0,0 @@ ---- ../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
and

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"; diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/pkg-message /server-root/ports/mail/mailscanner/pkg-message --- /server-root/ports/mail/mailscanner.orig/pkg-message Mon Nov 1 21:10:10 2004 +++ /server-root/ports/mail/mailscanner/pkg-message Wed Dec 15 21:07:36 2004 @@ -31,6 +31,10 @@ to update your virus-wrappers, autoupdates, reports and languages.conf + The english languages.conf is updated automatically. For all + other versions use the update_languages_conf tool found + in the work directory of this port. + Sophos users: Please take a look at the Sophos install script %%PREFIX%%/share/doc/MailScanner/Sophos.install.freebsd diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/pkg-plist /server-root/ports/mail/mailscanner/pkg-plist --- /server-root/ports/mail/mailscanner.orig/pkg-plist Mon Nov 1 21:10:10 2004 +++ /server-root/ports/mail/mailscanner/pkg-plist Wed Dec 15 20:45:42 2004 @@ -80,6 +80,7 @@ libexec/MailScanner/norman-autoupdate.sample libexec/MailScanner/norman-wrapper.sample libexec/MailScanner/panda-wrapper.sample +libexec/MailScanner/panda-autoupdate.sample libexec/MailScanner/rav-autoupdate.sample libexec/MailScanner/rav-wrapper.sample libexec/MailScanner/sophos-autoupdate.sample @@ -524,6 +525,7 @@ %%PORTDOCS%%%%DOCSDIR%%/poweredby.transtec.gif %%PORTDOCS%%%%DOCSDIR%%/phishing.html %%PORTDOCS%%%%DOCSDIR%%/phishing.jpg +%%PORTDOCS%%%%DOCSDIR%%/phishing2.jpg %%PORTDOCS%%%%DOCSDIR%%/pressreleases.html %%PORTDOCS%%%%DOCSDIR%%/presentations.html %%PORTDOCS%%%%DOCSDIR%%/press.html --- MailScanner-4.36.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: