Date: Wed, 18 Sep 2002 15:45:49 -0600 (MDT) From: Jamie Hermans <jamie@hermans.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/42938: update to mail/p5-Mail-SpamAssassin Message-ID: <20020918214549.A25BA3E1@zinebar.hermans.ca>
next in thread | raw e-mail | index | archive | help
>Number: 42938 >Category: ports >Synopsis: update to mail/p5-Mail-SpamAssassin >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Sep 18 14:50:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Jamie Hermans >Release: FreeBSD 4.6-STABLE i386 >Organization: hermans.ca >Environment: System: FreeBSD zinebar.hermans.ca 4.6-STABLE FreeBSD 4.6-STABLE #1: Tue Jul 23 09:09:16 MDT 2002 root@zinebar.hermans.ca:/usr/obj/usr/src/sys/ZINEBAR i386 >Description: No one else seems to have jumped in to update, and Alan is more than busy with KDE ... so here goes. Hope I'm not stepping on anyone's toes... but I wanted the newest version. * added dependency for p5-HTML-Parser * removed spamproxy stuff * re-diff'ed DCC (Distributed Checksum Clearinghouse) patch against the current version * adjusted pkg-plist accordingly >How-To-Repeat: >Fix: diff -ruN ../p5-Mail-SpamAssassin/Makefile ./Makefile --- ../p5-Mail-SpamAssassin/Makefile Tue Sep 3 12:42:49 2002 +++ ./Makefile Wed Sep 18 14:35:36 2002 @@ -6,7 +6,7 @@ # PORTNAME= Mail-SpamAssassin -PORTVERSION= 2.31 +PORTVERSION= 2.41 PORTREVISION= 2 CATEGORIES= mail perl5 MASTER_SITES= http://spamassassin.org/released/ \ @@ -17,7 +17,8 @@ MAINTAINER= ports@geeksrus.net BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \ - ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools + ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \ + ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser/ RUN_DEPENDS= ${BUILD_DEPENDS} \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \ razor-client:${PORTSDIR}/mail/razor-agents @@ -30,10 +31,9 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \ Mail::SpamAssassin::Conf.3 \ - Mail::SpamAssassin::PersistentAddrList.3 \ - Mail::SpamAssassin::SMTP::SmartHost.3 + Mail::SpamAssassin::PersistentAddrList.3 MAN1PREFIX= ${PREFIX} -MAN1= spamd.1 spamassassin.1 spamc.1 spamproxyd.1 +MAN1= spamd.1 spamassassin.1 spamc.1 DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME} @@ -47,10 +47,9 @@ .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql - ${INSTALL_DATA} ${WRKSRC}/spamproxy/README ${DOCSDIR}/README.spamproxy cd ${WRKSRC} ; ${INSTALL_DATA} \ - Changes README TODO TRADEMARK procmailrc.example sample* \ - spamd/README* spamproxy/README.SmartHost sql/spamassassin.sql \ + Changes README TRADEMARK procmailrc.example sample* \ + spamd/README* sql/spamassassin.sql \ ${DOCSDIR} .endif diff -ruN ../p5-Mail-SpamAssassin/distinfo ./distinfo --- ../p5-Mail-SpamAssassin/distinfo Sun Jul 14 22:40:53 2002 +++ ./distinfo Wed Sep 18 13:57:07 2002 @@ -1 +1 @@ -MD5 (Mail-SpamAssassin-2.31.tar.gz) = a9878b4ea035964c04c4899ee154e222 +MD5 (Mail-SpamAssassin-2.41.tar.gz) = e96b278beecb4b549a79b1497bd354e3 diff -ruN ../p5-Mail-SpamAssassin/files/patch-use_dcc-option ./files/patch-use_dcc-option --- ../p5-Mail-SpamAssassin/files/patch-use_dcc-option Sat Jun 15 03:56:34 2002 +++ ./files/patch-use_dcc-option Wed Sep 18 13:55:14 2002 @@ -1,16 +1,15 @@ -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf.pm Mon Jun 10 00:59:38 2002 -+++ ./lib/Mail/SpamAssassin/Conf.pm Sat Jun 15 01:35:42 2002 -@@ -135,6 +135,8 @@ +diff -ruN ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm +--- ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/Conf.pm Thu Sep 5 11:47:38 2002 ++++ ./lib/Mail/SpamAssassin/Conf.pm Wed Sep 18 13:40:59 2002 +@@ -140,6 +140,7 @@ $self->{allow_user_rules} = 0; $self->{user_rules_to_compile} = 0; - + $self->{fold_headers} = 1; + $self->{use_dcc} = 1; -+ + $self->{dcc_body_max} = 999999; $self->{dcc_fuz1_max} = 999999; - $self->{dcc_fuz2_max} = 999999; -@@ -613,6 +615,16 @@ +@@ -757,6 +758,16 @@ if (/^rbl[-_]timeout\s+(\d+)$/) { $self->{rbl_timeout} = $1+0; next; @@ -26,11 +25,11 @@ + $self->{use_dcc} = $1+0; next; } - =item ok_locales xx [ yy zz ... ] (default: en) -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.pm Wed Jun 12 02:10:43 2002 -+++ ./lib/Mail/SpamAssassin/Dns.pm Sat Jun 15 01:37:22 2002 -@@ -301,6 +301,10 @@ + =item ok_locales xx [ yy zz ... ] (default: all) +diff -ruN ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm +--- ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/Dns.pm Thu Sep 5 06:55:58 2002 ++++ ./lib/Mail/SpamAssassin/Dns.pm Wed Sep 18 13:43:29 2002 +@@ -444,6 +444,10 @@ sub is_dcc_available { my ($self) = @_; @@ -41,7 +40,7 @@ my (@resp); if ($self->{main}->{local_tests_only}) { -@@ -324,6 +328,10 @@ +@@ -473,6 +477,10 @@ sub dcc_lookup { my ($self, $fulltext) = @_; @@ -52,10 +51,10 @@ my $response = undef; my %count; my $left; -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalTests.pm Fri Jun 14 10:21:47 2002 -+++ ./lib/Mail/SpamAssassin/EvalTests.pm Sat Jun 15 01:37:34 2002 -@@ -1430,6 +1430,9 @@ +diff -ruN ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm +--- ../Mail-SpamAssassin-2.41-old/lib/Mail/SpamAssassin/EvalTests.pm Thu Sep 5 06:55:58 2002 ++++ ./lib/Mail/SpamAssassin/EvalTests.pm Wed Sep 18 13:45:26 2002 +@@ -2010,6 +2010,9 @@ sub check_dcc { my ($self, $fulltext) = @_; @@ -65,29 +64,15 @@ return 0 unless ($self->is_dcc_available()); return 0 if ($self->{already_checked_dcc}); -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Reporter.pm Fri Jun 14 11:52:17 2002 -+++ ./lib/Mail/SpamAssassin/Reporter.pm Sat Jun 15 00:56:39 2002 -@@ -147,6 +147,10 @@ - - sub is_dcc_available { - my ($self) = @_; -+ -+ # Added by FreeBSD ports -+ return 0 unless $self->{conf}->{use_dcc}; -+ - my (@resp); - - if ($self->{main}->{local_tests_only}) { -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/rules/10_misc.cf ./rules/10_misc.cf ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/rules/10_misc.cf Thu May 30 19:12:10 2002 -+++ ./rules/10_misc.cf Sat Jun 15 00:56:39 2002 -@@ -102,6 +102,9 @@ +diff -ruN ../Mail-SpamAssassin-2.41-old/rules/10_misc.cf ./rules/10_misc.cf +--- ../Mail-SpamAssassin-2.41-old/rules/10_misc.cf Thu Sep 5 06:55:58 2002 ++++ ./rules/10_misc.cf Wed Sep 18 13:47:09 2002 +@@ -103,6 +103,9 @@ # test, so it is set to "all" so the test will not be used by default. ok_languages all +# Added by FreeBSD ports -+use_dcc 0 ++use_dcc 0 + # Some common prefs settings can be set here, to take effect site-wide # unless the user override them. See the .prefs file for explanations. diff -ruN ../p5-Mail-SpamAssassin/files/spamd.sh ./files/spamd.sh --- ../p5-Mail-SpamAssassin/files/spamd.sh Tue Feb 26 08:06:11 2002 +++ ./files/spamd.sh Wed Sep 18 13:56:34 2002 @@ -10,6 +10,7 @@ [ -x ${PREFIX}/bin/spamd ] && ${PREFIX}/bin/spamd -a -c -d && echo -n ' spamd' ;; stop) + kill `ps ax | grep /usr/local/bin/spamd | grep -v grep | awk '{ print $1 }'` && echo -n ' spamd' ;; *) echo "Usage: `basename $0` {start|stop}" >&2 diff -ruN ../p5-Mail-SpamAssassin/pkg-plist ./pkg-plist --- ../p5-Mail-SpamAssassin/pkg-plist Tue Sep 3 12:42:49 2002 +++ ./pkg-plist Wed Sep 18 15:00:24 2002 @@ -1,7 +1,6 @@ -bin/spamassassin bin/spamc bin/spamd -bin/spamproxyd +bin/spamassassin etc/rc.d/spamd.sh-dist lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin.pm @@ -11,10 +10,13 @@ lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ConfSourceSQL.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DBBasedAddrList.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm +lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMIME.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ExposedMessage.pm +lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/HTML.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm +lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/MailingList.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm @@ -22,25 +24,25 @@ lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PhraseFreqs.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Replier.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm -lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SMTP/SmartHost.pm +lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SHA1.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/TextCat.pm -lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin/SMTP/SmartHost/autosplit.ix %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/Changes %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README -%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.SmartHost %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd-vpopmail -%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamproxy %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.sql -%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TODO %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TRADEMARK %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/procmailrc.example %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-nonspam.txt %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-spam.txt %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/spamassassin.sql share/spamassassin/10_misc.cf +share/spamassassin/20_anti_ratware.cf share/spamassassin/20_body_tests.cf +share/spamassassin/20_compensate.cf share/spamassassin/20_head_tests.cf +share/spamassassin/20_meta_tests.cf +share/spamassassin/20_ratware.cf share/spamassassin/20_uri_tests.cf share/spamassassin/25_body_tests_es.cf share/spamassassin/25_body_tests_pl.cf @@ -58,11 +60,7 @@ share/spamassassin/user_prefs.template %%PORTDOCS%%@dirrm share/doc/p5-Mail-SpamAssassin @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin -@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SMTP @dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin -@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin/SMTP/SmartHost -@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin/SMTP -@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin @dirrm share/spamassassin @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020918214549.A25BA3E1>