From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 13 20:20:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 732791065677 for ; Thu, 13 Aug 2009 20:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 50F588FC5B for ; Thu, 13 Aug 2009 20:20:02 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n7DKK10e014710 for ; Thu, 13 Aug 2009 20:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n7DKK1GE014709; Thu, 13 Aug 2009 20:20:01 GMT (envelope-from gnats) Resent-Date: Thu, 13 Aug 2009 20:20:01 GMT Resent-Message-Id: <200908132020.n7DKK1GE014709@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, Mike Jakubik Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD175106566B for ; Thu, 13 Aug 2009 20:12:00 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id AC6728FC63 for ; Thu, 13 Aug 2009 20:12:00 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n7DKC0HW076192 for ; Thu, 13 Aug 2009 20:12:00 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n7DKC07G076191; Thu, 13 Aug 2009 20:12:00 GMT (envelope-from nobody) Message-Id: <200908132012.n7DKC07G076191@www.freebsd.org> Date: Thu, 13 Aug 2009 20:12:00 GMT From: Mike Jakubik To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/137747: [patch] Upgrade mail/mailscanner to 4.78.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2009 20:20:02 -0000 >Number: 137747 >Category: ports >Synopsis: [patch] Upgrade mail/mailscanner to 4.78.9 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Aug 13 20:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Mike Jakubik >Release: 7.2-STABLE >Organization: >Environment: FreeBSD dev.local 7.2-STABLE FreeBSD 7.2-STABLE #0: Thu Jun 11 15:47:52 EDT 2009 root@dev.local:/usr/obj/usr/src/sys/DEV amd64 >Description: This patch updates mailscanner to the latest version. >How-To-Repeat: >Fix: diff -urN mailscanner.orig/Makefile mailscanner/Makefile --- mailscanner.orig/Makefile 2009-04-30 09:34:40.000000000 -0400 +++ mailscanner/Makefile 2009-08-13 15:24:44.000000000 -0400 @@ -6,7 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.75.11 +PORTVERSION= 4.78.9 CATEGORIES= mail MASTER_SITES= http://www.mailscanner.info/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} @@ -55,7 +55,8 @@ PATCHLEVEL= 1 -USE_PERL5= yes +USE_PERL5= 5.10.0+ +USE_PERL5_REASON=This port does not work with the default port version of perl, which is 5.8.9. Please install perl 5.10.0+ WRKSRC= ${WRKDIR}/${PORTNAME}-install-${PORTVERSION} SUB_FILES= pkg-message @@ -106,6 +107,7 @@ DOC_FILES= INSTALL.FreeBSD INSTALL.OpenBSD README ETC_FILES= MailScanner.conf filename.rules.conf \ + archives.filename.rules.conf archives.filetype.rules.conf \ filetype.rules.conf spam.assassin.prefs.conf \ spam.lists.conf virus.scanners.conf \ phishing.safe.sites.conf \ @@ -164,6 +166,10 @@ ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \ + ${WRKSRC}/bin/update_bad_phishing_emails + ${PERL} -pi -e \ + 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ + s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \ ${WRKSRC}/bin/update_phishing_sites ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ @@ -241,6 +247,8 @@ ${PREFIX}/libexec/MailScanner/clean.quarantine ${INSTALL_SCRIPT} ${WRKSRC}/bin/mailscanner_create_locks \ ${PREFIX}/libexec/MailScanner/mailscanner_create_locks + ${INSTALL_SCRIPT} ${WRKSRC}/bin/update_bad_phishing_emails \ + ${PREFIX}/libexec/MailScanner/update_bad_phishing_emails ${INSTALL_SCRIPT} ${WRKSRC}/bin/update_phishing_sites \ ${PREFIX}/libexec/MailScanner/update_phishing_sites ${INSTALL_SCRIPT} ${WRKSRC}/bin/update_bad_phishing_sites \ diff -urN mailscanner.orig/distinfo mailscanner/distinfo --- mailscanner.orig/distinfo 2009-04-30 09:34:40.000000000 -0400 +++ mailscanner/distinfo 2009-08-13 15:24:35.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (MailScanner-install-4.75.11-1.tar.gz) = d380ffefc721980cf6753e2e8a9b0575 -SHA256 (MailScanner-install-4.75.11-1.tar.gz) = 18c79d1170d68091bc82e48037440dd9db7881ad93dfb7643d588166257816f2 -SIZE (MailScanner-install-4.75.11-1.tar.gz) = 8429830 +MD5 (MailScanner-install-4.78.9-1.tar.gz) = 264b1b7cbb37117aced6f450d48a03d7 +SHA256 (MailScanner-install-4.78.9-1.tar.gz) = c389948605544d418c1a022d4a179430464840e5597ef13a4c11d1c7819ea0db +SIZE (MailScanner-install-4.78.9-1.tar.gz) = 9111014 diff -urN mailscanner.orig/pkg-plist mailscanner/pkg-plist --- mailscanner.orig/pkg-plist 2009-04-30 09:34:40.000000000 -0400 +++ mailscanner/pkg-plist 2009-08-11 13:57:51.000000000 -0400 @@ -1,4 +1,6 @@ @comment $FreeBSD: ports/mail/mailscanner/pkg-plist,v 1.39 2009/04/30 13:34:40 pav Exp $ +etc/MailScanner/archives.filename.rules.conf.sample +etc/MailScanner/archives.filetype.rules.conf.sample etc/MailScanner/country.domains.conf.sample etc/MailScanner/MailScanner.conf.sample etc/MailScanner/filename.rules.conf.sample @@ -32,7 +34,9 @@ lib/MailScanner/MailScanner/CustomFunctions/Ruleset-from-Function.pm lib/MailScanner/MailScanner/Exim.pm lib/MailScanner/MailScanner/EximDiskStore.pm +lib/MailScanner/MailScanner/FileInto.pm lib/MailScanner/MailScanner/GenericSpam.pm +lib/MailScanner/MailScanner/LinksDump.pm lib/MailScanner/MailScanner/Lock.pm lib/MailScanner/MailScanner/Log.pm lib/MailScanner/MailScanner/MCP.pm @@ -55,6 +59,7 @@ lib/MailScanner/MailScanner/SweepViruses.pm lib/MailScanner/MailScanner/SystemDefs.pm lib/MailScanner/MailScanner/TNEF.pm +lib/MailScanner/MailScanner/Unzip.pm lib/MailScanner/MailScanner/WorkArea.pm lib/MailScanner/MailScanner/ZMDiskStore.pm lib/MailScanner/MailScanner/ZMailer.pm @@ -62,6 +67,7 @@ libexec/MailScanner/clean.SA.cache libexec/MailScanner/clean.quarantine libexec/MailScanner/mailscanner_create_locks +libexec/MailScanner/update_bad_phishing_emails libexec/MailScanner/update_phishing_sites libexec/MailScanner/update_bad_phishing_sites libexec/MailScanner/update_bad_phishing_sites.cron >Release-Note: >Audit-Trail: >Unformatted: