From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 6 05:25:03 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 CDEAC16B360 for ; Tue, 6 Jun 2006 05:00:38 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 543B743D46 for ; Tue, 6 Jun 2006 05:00:38 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k5650bof092290 for ; Tue, 6 Jun 2006 05:00:38 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5650bw5092289; Tue, 6 Jun 2006 05:00:37 GMT (envelope-from gnats) Resent-Date: Tue, 6 Jun 2006 05:00:37 GMT Resent-Message-Id: <200606060500.k5650bw5092289@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, Yoshito Uchiyama Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 501B916AA4D for ; Tue, 6 Jun 2006 04:28:28 +0000 (UTC) (envelope-from root@mail.intaa.net) Received: from mail.intaa.net (203.143.126.98.user.il24.net [203.143.126.98]) by mx1.FreeBSD.org (Postfix) with ESMTP id C260A43D5D for ; Tue, 6 Jun 2006 04:28:24 +0000 (GMT) (envelope-from root@mail.intaa.net) Received: (qmail 47016 invoked by uid 0); 6 Jun 2006 04:28:23 -0000 Message-Id: <20060606042823.47015.qmail@mail.intaa.net> Date: 6 Jun 2006 04:28:23 -0000 From: Yoshito Uchiyama To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/98574: Update port: mail/p5-Mail-SpamAssassin X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Yoshito Uchiyama List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jun 2006 05:25:09 -0000 >Number: 98574 >Category: ports >Synopsis: Update port: mail/p5-Mail-SpamAssassin >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jun 06 05:00:36 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Yoshito Uchiyama >Release: FreeBSD 6.0-SECURITY i386 >Organization: >Environment: System: FreeBSD baika.intaa.net 6.0-SECURITY FreeBSD 6.0-SECURITY #0: Tue Apr 18 08:56:09 UTC 2006 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update port to SpamAssassin 3.1.3 from 3.1.1 >How-To-Repeat: >Fix: diff -ruN /usr/ports/mail/p5-Mail-SpamAssassin/Makefile /usr/ports/local/p5-Mail-SpamAssassin/Makefile --- /usr/ports/mail/p5-Mail-SpamAssassin/Makefile Tue May 2 14:38:03 2006 +++ /usr/ports/local/p5-Mail-SpamAssassin/Makefile Tue Jun 6 12:20:52 2006 @@ -6,15 +6,15 @@ # PORTNAME= Mail-SpamAssassin -PORTVERSION= 3.1.1 -PORTREVISION= 4 +PORTVERSION= 3.1.3 +PORTREVISION= 0 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan PKGNAMEPREFIX= p5- DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan -MAINTAINER= perl@FreeBSD.org +MAINTAINER= gato@intaa.net COMMENT= A highly efficient mail filter for identifying spam BUILD_DEPENDS= p5-Net-DNS>=0.53:${PORTSDIR}/dns/p5-Net-DNS \ @@ -119,6 +119,7 @@ Mail::SpamAssassin::Plugin::AntiVirus.3 \ Mail::SpamAssassin::Plugin::AutoLearnThreshold.3 \ Mail::SpamAssassin::Plugin::DCC.3 \ + Mail::SpamAssassin::Plugin::DKIM.3 \ Mail::SpamAssassin::Plugin::DomainKeys.3 \ Mail::SpamAssassin::Plugin::Hashcash.3 \ Mail::SpamAssassin::Plugin::MIMEHeader.3 \ @@ -170,14 +171,14 @@ @${FIND} ${WRKSRC} -name \*.orig -delete @${REINPLACE_CMD} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \ -e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' \ - -e 's#B_CONFDIR)/v310.pre#B_CONFDIR)/v310.pre.sample#g' \ + -e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \ -e 's/require DBI/0/' \ ${WRKSRC}/Makefile.PL .if defined(WITH_RAZOR) - ${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre + ${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre .endif .if defined(WITH_DOMAINKEYS) - ${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre + ${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre .endif .if defined(WITH_RELAY_COUNTRY) ${REINPLACE_CMD} -e '/RelayCountry/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre @@ -191,9 +192,9 @@ @[ -f ${PREFIX}/etc/mail/spamassassin/init.pre ] || \ ${CP} ${PREFIX}/etc/mail/spamassassin/init.pre.sample \ ${PREFIX}/etc/mail/spamassassin/init.pre - @[ -f ${PREFIX}/etc/mail/spamassassin/v310.pre ] || \ - ${CP} ${PREFIX}/etc/mail/spamassassin/v310.pre.sample \ - ${PREFIX}/etc/mail/spamassassin/v310.pre + @[ -f ${PREFIX}/etc/mail/spamassassin/v312.pre ] || \ + ${CP} ${PREFIX}/etc/mail/spamassassin/v312.pre.sample \ + ${PREFIX}/etc/mail/spamassassin/v312.pre .if defined(WITH_TOOLS) @${MKDIR} ${DATADIR}/tools @for f in ${WRKSRC}/tools/*; do \ diff -ruN /usr/ports/mail/p5-Mail-SpamAssassin/distinfo /usr/ports/local/p5-Mail-SpamAssassin/distinfo --- /usr/ports/mail/p5-Mail-SpamAssassin/distinfo Sat Mar 18 23:05:27 2006 +++ /usr/ports/local/p5-Mail-SpamAssassin/distinfo Tue Jun 6 12:59:07 2006 @@ -1,3 +1,3 @@ -MD5 (Mail-SpamAssassin-3.1.1.tar.gz) = f7844cbc149de3d7b09a4310f4ab6739 -SHA256 (Mail-SpamAssassin-3.1.1.tar.gz) = e4284c445f8fed11bc82b3900dc4b75eec0d632768c894bf186c3b7e1de63797 -SIZE (Mail-SpamAssassin-3.1.1.tar.gz) = 1129275 +MD5 (Mail-SpamAssassin-3.1.3.tar.gz) = 32ad78f3cdaddb02cdf0f55572604d07 +SHA256 (Mail-SpamAssassin-3.1.3.tar.gz) = 1da55f280e9e8ff0a2fc373b8c610ea3f7eea5303b474e4a42ed554e87ba0e1d +SIZE (Mail-SpamAssassin-3.1.3.tar.gz) = 1134662 diff -ruN /usr/ports/mail/p5-Mail-SpamAssassin/distinfo.ORG /usr/ports/local/p5-Mail-SpamAssassin/distinfo.ORG --- /usr/ports/mail/p5-Mail-SpamAssassin/distinfo.ORG Thu Jan 1 09:00:00 1970 +++ /usr/ports/local/p5-Mail-SpamAssassin/distinfo.ORG Tue Jun 6 05:55:46 2006 @@ -0,0 +1,3 @@ +MD5 (Mail-SpamAssassin-3.1.3.tar.gz) = 32ad78f3cdaddb02cdf0f55572604d07 +#SHA256 (Mail-SpamAssassin-3.1.1.tar.gz) = e4284c445f8fed11bc82b3900dc4b75eec0d632768c894bf186c3b7e1de63797 +#SIZE (Mail-SpamAssassin-3.1.1.tar.gz) = 1129275 diff -ruN /usr/ports/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw /usr/ports/local/p5-Mail-SpamAssassin/files/patch-sa-learn.raw --- /usr/ports/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw Mon Dec 5 09:47:16 2005 +++ /usr/ports/local/p5-Mail-SpamAssassin/files/patch-sa-learn.raw Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ ---- sa-learn.raw.org Tue Sep 13 19:07:32 2005 -+++ sa-learn.raw Sun Dec 4 16:43:52 2005 -@@ -109,6 +109,7 @@ GetOptions( - 'local|L' => \$opt{'local'}, - 'no-sync|nosync' => \$opt{'nosync'}, - 'showdots' => \$opt{'showdots'}, -+ 'quiet' => \$opt{'quiet'}, - 'progress' => \$opt{'progress'}, - 'use-ignores' => \$opt{'use-ignores'}, - 'no-rebuild|norebuild' => sub { $opt{'nosync'} = 1; warn "The --no-rebuild option has been deprecated. Please use --no-sync instead.\n" }, -@@ -409,7 +410,7 @@ eval { - $progress->final() if ($opt{progress} && $progress); - - my $phrase = defined $forget ? "Forgot" : "Learned"; -- print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n"; -+ print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n" if (!$opt{quiet}); - - # If we needed to make a tempfile, go delete it. - if ( defined $tempfile ) { diff -ruN /usr/ports/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw /usr/ports/local/p5-Mail-SpamAssassin/files/patch-spamassassin.raw --- /usr/ports/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw Tue Oct 12 19:42:38 2004 +++ /usr/ports/local/p5-Mail-SpamAssassin/files/patch-spamassassin.raw Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- spamassassin.raw~ Tue Sep 14 01:34:05 2004 -+++ spamassassin.raw Wed Sep 22 18:03:37 2004 -@@ -329,7 +329,7 @@ - # Let folks know how many messages were handled, as long as the handling - # didn't produce output (ala: check, test, or remove_markup ...) - if ( $opt{'report'} || $opt{'revoke'} || $doing_whitelist_operation ) { -- print "$count message(s) examined.\n"; -+ print "$count message(s) examined.\n" unless $opt{'quiet'}; - } - - # if the eval died from something, report it here and return an error. diff -ruN /usr/ports/mail/p5-Mail-SpamAssassin/pkg-plist /usr/ports/local/p5-Mail-SpamAssassin/pkg-plist --- /usr/ports/mail/p5-Mail-SpamAssassin/pkg-plist Wed Mar 29 20:35:41 2006 +++ /usr/ports/local/p5-Mail-SpamAssassin/pkg-plist Tue Jun 6 05:59:55 2006 @@ -9,9 +9,9 @@ @unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi etc/mail/spamassassin/init.pre.sample @exec [ -f %B/init.pre ] || cp %B/%f %B/init.pre -@unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi -etc/mail/spamassassin/v310.pre.sample -@exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre +@unexec if cmp -s %B/v312.pre.sample %B/v312.pre; then rm -f %B/v312.pre; fi +etc/mail/spamassassin/v312.pre.sample +@exec [ -f %B/v312.pre ] || cp %B/%f %B/v312.pre %%SITE_PERL%%/Mail/SpamAssassin.pm %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm %%SITE_PERL%%/Mail/SpamAssassin/AutoWhitelist.pm @@ -59,6 +59,7 @@ %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AntiVirus.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DCC.pm +%%SITE_PERL%%/Mail/SpamAssassin/Plugin/DKIM.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DomainKeys.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Hashcash.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEHeader.pm @@ -106,6 +107,7 @@ %%DATADIR%%/25_body_tests_es.cf %%DATADIR%%/25_body_tests_pl.cf %%DATADIR%%/25_dcc.cf +%%DATADIR%%/25_dkim.cf %%DATADIR%%/25_domainkeys.cf %%DATADIR%%/25_hashcash.cf %%DATADIR%%/25_pyzor.cf @@ -123,6 +125,7 @@ %%DATADIR%%/50_scores.cf %%DATADIR%%/60_awl.cf %%DATADIR%%/60_whitelist.cf +%%DATADIR%%/60_whitelist_dkim.cf %%DATADIR%%/60_whitelist_spf.cf %%DATADIR%%/60_whitelist_subject.cf %%DATADIR%%/languages @@ -130,7 +133,6 @@ %%DATADIR%%/sa-update-pubkey.txt %%DATADIR%%/user_prefs.template %%TOOLS%%%%DATADIR%%/tools/README.speedtest -%%TOOLS%%%%DATADIR%%/tools/bayes_dump_to_trusted_networks %%TOOLS%%%%DATADIR%%/tools/check_whitelist %%TOOLS%%%%DATADIR%%/tools/convert_awl_dbm_to_sql %%TOOLS%%%%DATADIR%%/tools/desc_length.pl >Release-Note: >Audit-Trail: >Unformatted: