[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

spamassassin 3.0-cvs test ..



putting this out for anyone that wants to try out spamassassin 3.0-cvs..
it appears to work fine, from the light testing that i've done (running
it on my account, processing 3000+ mails/day.)

distinfo may need to be updated by the time that people get around to
trying this, as it is a constantly changing target. tarball is updated
nightly from their subversion repository.

--ben
diff -x CVS ../mail/p5-Mail-SpamAssassin/Makefile p5-Mail-SpamAssassin/Makefile
--- ../mail/p5-Mail-SpamAssassin/Makefile	Wed Jan 21 16:50:13 2004
+++ p5-Mail-SpamAssassin/Makefile	Tue Apr 13 13:51:35 2004
@@ -2,8 +2,8 @@
 
 COMMENT=		"mailfilter to identify and mark spam"
 
-DISTNAME=		Mail-SpamAssassin-2.63
-PKGNAME=		p5-${DISTNAME}
+DISTNAME=		Mail-SpamAssassin-3.000000-cvs
+PKGNAME=		p5-Mail-SpamAssassin-3.0-cvs
 CATEGORIES=		mail perl5
 
 MAINTAINER=		Ben Lovett <ben_(_at_)_tilderoot_(_dot_)_com>
@@ -16,7 +16,7 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${HOMEPAGE}released/ \
+MASTER_SITES=		${HOMEPAGE}devel/ \
 			${MASTER_SITE_PERL_CPAN:=Mail/}
 
 BUILD_DEPENDS=		:p5-HTML-Parser-*:www/p5-HTML-Parser
@@ -26,10 +26,12 @@
 MAKE_ENV+=		CC="${CC}"
 
 CONFIGURE_STYLE=	perl
-CONFIGURE_ARGS+=	RUN_RAZOR_TESTS="no" \
+CONFIGURE_ARGS+=	RUN_NET_TESTS="no" \
 			SYSCONFDIR=${SYSCONFDIR} \
 			CONTACT_ADDRESS="the administrator of that system"
 
+WRKDIST=		${WRKDIR}/Mail-SpamAssassin-3.000000
+
 CONFDIR=		${SYSCONFDIR}/mail/spamassassin
 RULES_DIR=		${PREFIX}/share/spamassassin
 SAMPLE_CONFDIR=		${PREFIX}/share/examples/SpamAssassin
@@ -37,8 +39,8 @@
 SUBST_VARS=		CONFDIR SAMPLE_CONFDIR
 
 FAKE_FLAGS=		${DESTDIRNAME}=${WRKINST} \
-			PKG_DEF_RULES_DIR=${WRKINST}${RULES_DIR} \
-			PKG_LOCAL_RULES_DIR=${WRKINST}${SAMPLE_CONFDIR}
+			DEFRULESDIR=${WRKINST}${RULES_DIR} \
+			LOCALRULESDIR=${WRKINST}${SAMPLE_CONFDIR}
 
 # regress insists on creating files in $HOME
 PORTHOME=		${WRKDIR}/temp-home
@@ -57,7 +59,7 @@
 	${INSTALL_DATA} ${FAQS} ${PREFIX}/share/doc/SpamAssassin
 	cd ${WRKSRC} && ${INSTALL_DATA} ${LOCALCF} ${SAMPLE_CONFDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/SpamAssassin
-	cd ${WRKSRC} && pod2man --section=1 spamd/spamc.pod > \
+	cd ${WRKSRC} && pod2man --section=1 spamc/spamc.pod > \
 	    ${PREFIX}/man/man1/spamc.1
 	cd ${WRKSRC} && pod2man --section=8 spamd/spamd > \
 	    ${PREFIX}/man/man8/spamd.8
diff -x CVS ../mail/p5-Mail-SpamAssassin/distinfo p5-Mail-SpamAssassin/distinfo
--- ../mail/p5-Mail-SpamAssassin/distinfo	Wed Jan 21 16:50:14 2004
+++ p5-Mail-SpamAssassin/distinfo	Sat Apr 17 22:15:58 2004
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-2.63.tar.gz) = fc5a8e69ef2355c30c7b71877ac58d57
-RMD160 (Mail-SpamAssassin-2.63.tar.gz) = edbaef2d865bd6c0a7e20290f9cb11f0025db7f7
-SHA1 (Mail-SpamAssassin-2.63.tar.gz) = 6bab68dfd6a5238fc84360ce08249657bed4bab3
+MD5 (Mail-SpamAssassin-3.000000-cvs.tar.gz) = 820cdb021b41e87f6152f7a54f31e00d
+RMD160 (Mail-SpamAssassin-3.000000-cvs.tar.gz) = 2b38d0c2a5b971bcec7e9ef047716a1f83399a26
+SHA1 (Mail-SpamAssassin-3.000000-cvs.tar.gz) = 03f98ed229d4a3d71c090ef1399180cb72294026
diff -x CVS ../mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL p5-Mail-SpamAssassin/patches/patch-Makefile_PL
--- ../mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL	Fri Dec 26 20:17:01 2003
+++ p5-Mail-SpamAssassin/patches/patch-Makefile_PL	Tue Apr 13 13:42:23 2004
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_PL,v 1.1 2003/12/27 04:17:01 brad Exp $
---- Makefile.PL.orig	Thu Nov 13 11:55:46 2003
-+++ Makefile.PL	Thu Nov 13 11:55:55 2003
-@@ -760,7 +760,7 @@
+--- Makefile.PL.orig	2004-04-13 13:39:29.000000000 -0700
++++ Makefile.PL	2004-04-13 13:40:00.000000000 -0700
+@@ -835,7 +835,7 @@ sub MY::install {
  
    foreach (@code) {
      # Add our install targets as a dependency to all top-level install targets
@@ -10,15 +10,18 @@
  
      # Now do the DESTDIR hack, if necessary.
      next if !$mm_needs_destdir;
-@@ -962,11 +962,6 @@
+@@ -1066,14 +1066,6 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+ 	$(MAKE_SPAMC_OLD)
+ 	$(CHMOD) $(PERM_RWX) $@
  
- spamd/binaries.mk: spamd/configure
- 	cd spamd; ./configure --prefix="$(I_PREFIX)" --sysconfdir="$(I_SYSCONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)"
 -
 -conf__install:
 -	-$(MKPATH) $(B_CONFDIR)
 -	$(PERL) -MFile::Spec -MFile::Copy \
 -	  -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf};"
- 
+-	$(PERL) -MFile::Spec -MFile::Copy \
+-	  -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre};"
+-
  data__install:
  	-$(MKPATH) $(B_DATADIR)
+ 	$(PERL) -e "map unlink, <$(B_DATADIR)/*>"
diff -x CVS ../mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_pm p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_pm
--- ../mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_pm	Fri Aug  1 04:25:50 2003
+++ p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_pm	Tue Apr 13 13:42:22 2004
@@ -1,10 +1,10 @@
---- lib/Mail/SpamAssassin.pm.orig	2003-05-20 08:05:55.000000000 +0200
-+++ lib/Mail/SpamAssassin.pm	2003-07-31 22:58:06.000000000 +0200
-@@ -142,6 +142,7 @@ $HOME_URL = "http://spamassassin.org/";;
-         '/etc/mail/spamassassin/user_prefs.template',
-         '/usr/local/share/spamassassin/user_prefs.template',
-         '/usr/share/spamassassin/user_prefs.template',
-+        './rules/user_prefs.template',
+--- lib/Mail/SpamAssassin.pm.orig	2004-04-13 13:40:40.000000000 -0700
++++ lib/Mail/SpamAssassin.pm	2004-04-13 13:41:19.000000000 -0700
+@@ -147,6 +147,7 @@ $HOME_URL = "http://spamassassin.org/";;
+   '/etc/mail/spamassassin/user_prefs.template',
+   '/usr/local/share/spamassassin/user_prefs.template',
+   '/usr/share/spamassassin/user_prefs.template',
++  './rules/user_prefs.template',
  );
  
  @default_userprefs_path = (
diff -x CVS ../mail/p5-Mail-SpamAssassin/patches/patch-spamc_spamc_pod p5-Mail-SpamAssassin/patches/patch-spamc_spamc_pod
--- ../mail/p5-Mail-SpamAssassin/patches/patch-spamc_spamc_pod	Wed Dec 31 16:00:00 1969
+++ p5-Mail-SpamAssassin/patches/patch-spamc_spamc_pod	Tue Apr 13 13:42:22 2004
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- spamc/spamc.pod.orig	2004-04-13 13:41:57.000000000 -0700
++++ spamc/spamc.pod	2004-04-13 13:42:15.000000000 -0700
+@@ -165,7 +165,7 @@ distribution for more details.
+ 
+ =head1 SEE ALSO
+ 
+-spamd(1)
++spamd(8)
+ spamassassin(1)
+ Mail::SpamAssassin(3)
+ 
diff -x CVS ../mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamc_pod p5-Mail-SpamAssassin/patches/patch-spamd_spamc_pod
--- ../mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamc_pod	Fri May 23 16:36:31 2003
+++ p5-Mail-SpamAssassin/patches/patch-spamd_spamc_pod	Wed Dec 31 16:00:00 1969
@@ -1,12 +0,0 @@
-$OpenBSD: patch-spamd_spamc_pod,v 1.2 2003/05/23 23:36:31 brad Exp $
---- spamd/spamc.pod.orig	Mon May 12 15:15:36 2003
-+++ spamd/spamc.pod	Thu May 22 09:31:18 2003
-@@ -150,7 +150,7 @@ distribution for more details.
- 
- =head1 SEE ALSO
- 
--spamd(1)
-+spamd(8)
- spamassassin(1)
- Mail::SpamAssassin(3)
- 
diff -x CVS ../mail/p5-Mail-SpamAssassin/pkg/PLIST p5-Mail-SpamAssassin/pkg/PLIST
--- ../mail/p5-Mail-SpamAssassin/pkg/PLIST	Fri Dec 26 20:17:01 2003
+++ p5-Mail-SpamAssassin/pkg/PLIST	Tue Apr 13 14:01:27 2004
@@ -5,37 +5,44 @@
 bin/spamd
 ${P5SITE}/Mail/SpamAssassin.pm
 ${P5SITE}/Mail/SpamAssassin/ArchiveIterator.pm
-${P5SITE}/Mail/SpamAssassin/AuditMessage.pm
 ${P5SITE}/Mail/SpamAssassin/AutoWhitelist.pm
 ${P5SITE}/Mail/SpamAssassin/Bayes.pm
 ${P5SITE}/Mail/SpamAssassin/BayesStore.pm
-${P5SITE}/Mail/SpamAssassin/CmdLearn.pm
+${P5SITE}/Mail/SpamAssassin/BayesStore/DBM.pm
+${P5SITE}/Mail/SpamAssassin/BayesStore/SQL.pm
 ${P5SITE}/Mail/SpamAssassin/Conf.pm
-${P5SITE}/Mail/SpamAssassin/ConfSourceSQL.pm
+${P5SITE}/Mail/SpamAssassin/Conf/LDAP.pm
+${P5SITE}/Mail/SpamAssassin/Conf/SQL.pm
+${P5SITE}/Mail/SpamAssassin/Constants.pm
 ${P5SITE}/Mail/SpamAssassin/DBBasedAddrList.pm
 ${P5SITE}/Mail/SpamAssassin/Dns.pm
-${P5SITE}/Mail/SpamAssassin/EncappedMIME.pm
-${P5SITE}/Mail/SpamAssassin/EncappedMessage.pm
 ${P5SITE}/Mail/SpamAssassin/EvalTests.pm
 ${P5SITE}/Mail/SpamAssassin/HTML.pm
 ${P5SITE}/Mail/SpamAssassin/Locales.pm
 ${P5SITE}/Mail/SpamAssassin/Locker.pm
+${P5SITE}/Mail/SpamAssassin/Locker/Unix.pm
+${P5SITE}/Mail/SpamAssassin/Locker/Win32.pm
 ${P5SITE}/Mail/SpamAssassin/MailingList.pm
 ${P5SITE}/Mail/SpamAssassin/Message.pm
+${P5SITE}/Mail/SpamAssassin/Message/Metadata.pm
+${P5SITE}/Mail/SpamAssassin/Message/Node.pm
 ${P5SITE}/Mail/SpamAssassin/NetSet.pm
-${P5SITE}/Mail/SpamAssassin/NoMailAudit.pm
 ${P5SITE}/Mail/SpamAssassin/PerMsgLearner.pm
 ${P5SITE}/Mail/SpamAssassin/PerMsgStatus.pm
 ${P5SITE}/Mail/SpamAssassin/PersistentAddrList.pm
-${P5SITE}/Mail/SpamAssassin/PhraseFreqs.pm
+${P5SITE}/Mail/SpamAssassin/Plugin.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/Hashcash.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/RelayCountry.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/SPF.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/Test.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+${P5SITE}/Mail/SpamAssassin/PluginHandler.pm
 ${P5SITE}/Mail/SpamAssassin/Received.pm
-${P5SITE}/Mail/SpamAssassin/Replier.pm
 ${P5SITE}/Mail/SpamAssassin/Reporter.pm
 ${P5SITE}/Mail/SpamAssassin/SHA1.pm
+${P5SITE}/Mail/SpamAssassin/SQLBasedAddrList.pm
 ${P5SITE}/Mail/SpamAssassin/TextCat.pm
-${P5SITE}/Mail/SpamAssassin/UnixLocker.pm
 ${P5SITE}/Mail/SpamAssassin/Util.pm
-${P5SITE}/Mail/SpamAssassin/Win32Locker.pm
 @comment ${P5ARCH}/auto/Mail/SpamAssassin/.packlist
 man/man1/sa-learn.1
 man/man1/spamassassin.1
@@ -44,11 +51,24 @@
 man/man3p/Mail::SpamAssassin.3p
 man/man3p/Mail::SpamAssassin::AutoWhitelist.3p
 man/man3p/Mail::SpamAssassin::Bayes.3p
+man/man3p/Mail::SpamAssassin::BayesStore.3p
+man/man3p/Mail::SpamAssassin::BayesStore::SQL.3p
 man/man3p/Mail::SpamAssassin::Conf.3p
-man/man3p/Mail::SpamAssassin::ConfSourceSQL.3p
+man/man3p/Mail::SpamAssassin::Conf::LDAP.3p
+man/man3p/Mail::SpamAssassin::Conf::SQL.3p
+man/man3p/Mail::SpamAssassin::Message.3p
+man/man3p/Mail::SpamAssassin::Message::Metadata.3p
+man/man3p/Mail::SpamAssassin::Message::Node.3p
 man/man3p/Mail::SpamAssassin::PerMsgLearner.3p
 man/man3p/Mail::SpamAssassin::PerMsgStatus.3p
 man/man3p/Mail::SpamAssassin::PersistentAddrList.3p
+man/man3p/Mail::SpamAssassin::Plugin.3p
+man/man3p/Mail::SpamAssassin::Plugin::Hashcash.3p
+man/man3p/Mail::SpamAssassin::Plugin::RelayCountry.3p
+man/man3p/Mail::SpamAssassin::Plugin::SPF.3p
+man/man3p/Mail::SpamAssassin::Plugin::URIDNSBL.3p
+man/man3p/Mail::SpamAssassin::PluginHandler.3p
+man/man3p/Mail::SpamAssassin::SQLBasedAddrList.3p
 man/man8/spamd.8
 share/doc/SpamAssassin/OpenBSD-SpamAssassin-mini-howto.html
 share/doc/SpamAssassin/README
@@ -61,6 +81,7 @@
 share/spamassassin/20_body_tests.cf
 share/spamassassin/20_compensate.cf
 share/spamassassin/20_dnsbl_tests.cf
+share/spamassassin/20_drugs.cf
 share/spamassassin/20_fake_helo_tests.cf
 share/spamassassin/20_head_tests.cf
 share/spamassassin/20_html_tests.cf
@@ -71,15 +92,12 @@
 share/spamassassin/20_uri_tests.cf
 share/spamassassin/23_bayes.cf
 share/spamassassin/25_body_tests_es.cf
-share/spamassassin/25_body_tests_pl.cf
-share/spamassassin/25_head_tests_es.cf
-share/spamassassin/25_head_tests_pl.cf
+share/spamassassin/25_hashcash.cf
+share/spamassassin/25_spf.cf
+share/spamassassin/25_uribl.cf
 share/spamassassin/30_text_de.cf
-share/spamassassin/30_text_es.cf
 share/spamassassin/30_text_fr.cf
-share/spamassassin/30_text_it.cf
 share/spamassassin/30_text_pl.cf
-share/spamassassin/30_text_sk.cf
 share/spamassassin/50_scores.cf
 share/spamassassin/60_whitelist.cf
 share/spamassassin/languages