pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/spamassassin Update to version 3.0.0. Tested on N...
details: https://anonhg.NetBSD.org/pkgsrc/rev/031ce66013d3
branches: trunk
changeset: 481769:031ce66013d3
user: heinz <heinz%pkgsrc.org@localhost>
date: Tue Oct 12 00:11:10 2004 +0000
description:
Update to version 3.0.0. Tested on NetBSD 1.6.2, Solaris 9 and Debian
3.0.
Important changes since 2.64 (for details see the file 'Changes')
- support for sender authentication using the Sender Policy Framework
(SPF)
- checking for web links of known spam advertisers (SURBL)
- modular plugin architecture
- improved SQL database support for storing user data in server
installations
- improved email classification
- SpamAssassin is now part of the Apache Foundation
diffstat:
mail/spamassassin/DEINSTALL | 17 -----
mail/spamassassin/MESSAGE | 23 ++----
mail/spamassassin/Makefile | 121 +++++++++++++-----------------------
mail/spamassassin/PLIST | 6 +-
mail/spamassassin/distinfo | 17 ++--
mail/spamassassin/options.mk | 88 ++++++++++++++++++++++++++
mail/spamassassin/patches/patch-ab | 117 +++++++++++++++++++++--------------
mail/spamassassin/patches/patch-ae | 46 +++----------
mail/spamassassin/patches/patch-ak | 14 ----
mail/spamassassin/patches/patch-al | 14 ----
mail/spamassassin/patches/patch-aq | 16 ++--
mail/spamassassin/patches/patch-au | 29 ++++++++
mail/spamassassin/patches/patch-av | 29 ++++++++
mail/spamassassin/patches/patch-aw | 14 ++++
14 files changed, 315 insertions(+), 236 deletions(-)
diffs (truncated from 772 to 300 lines):
diff -r 4665aae3fb41 -r 031ce66013d3 mail/spamassassin/DEINSTALL
--- a/mail/spamassassin/DEINSTALL Mon Oct 11 23:46:15 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2003/11/03 00:56:25 heinz Exp $
-
-case ${STAGE} in
-DEINSTALL)
- ${CAT} << EOF
-===========================================================================
-Note:
-
- If you intend to upgrade your SpamAssassin installation, it is a good
- idea to run 'sa-learn --rebuild' for every Bayes database *prior* to
- deinstalling this package. This will incorporate any pending changes in
- your Bayes journal file into the database.
-
-===========================================================================
-EOF
- ;;
-esac
diff -r 4665aae3fb41 -r 031ce66013d3 mail/spamassassin/MESSAGE
--- a/mail/spamassassin/MESSAGE Mon Oct 11 23:46:15 2004 +0000
+++ b/mail/spamassassin/MESSAGE Tue Oct 12 00:11:10 2004 +0000
@@ -1,20 +1,13 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.8 2003/12/27 19:16:04 heinz Exp $
+$NetBSD: MESSAGE,v 1.9 2004/10/12 00:11:10 heinz Exp $
-SA 2.6x uses a new format for the Bayes database. *Before* deinstalling
-SA 2.5x, make sure you ran 'sa-learn --rebuild' for every Bayes database.
-
-If you're running Razor please use at least p5-razor-agents-2.22nb2
-which contains some fixes from the SpamAssassin team to improve behaviour
-in Perl taint mode.
+If you upgrade from an earlier version please take a look at the file
+UPGRADE in
-Some configuration options were changed (see Mail::SpamAssassin::Conf).
-Please check that your existing mail configuration still works.
+ ${PREFIX}/share/doc/spamassassin/
-More information can be found in the man pages for 'spamassassin',
-'sa-learn', 'spamc' and 'spamd', with 'perldoc Mail::SpamAssassin::Conf'
-and in
-
- ${PREFIX}/share/doc/spamassassin/
-
+Some configuration options were changed; for more information see
+'perldoc Mail::SpamAssassin::Conf' and the man pages for 'spamassassin',
+'spamd' and 'sa-learn'. Please check that your existing mail configuration
+still works.
===========================================================================
diff -r 4665aae3fb41 -r 031ce66013d3 mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile Mon Oct 11 23:46:15 2004 +0000
+++ b/mail/spamassassin/Makefile Tue Oct 12 00:11:10 2004 +0000
@@ -1,48 +1,37 @@
-# $NetBSD: Makefile,v 1.48 2004/10/03 00:12:54 tv Exp $
+# $NetBSD: Makefile,v 1.49 2004/10/12 00:11:10 heinz Exp $
DISTNAME= Mail-SpamAssassin-${SPAMASSASSIN_VERSION}
PKGNAME= spamassassin-${SPAMASSASSIN_VERSION}
-PKGREVISION= #1
+PKGREVISION= # empty
SVR4_PKGNAME= sa
-CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} \
- http://old.spamassassin.org/released/
+CATEGORIES= mail perl5
+MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/} \
+ http://spamassassin.apache.org/released/
MAINTAINER= heinz%NetBSD.org@localhost
-HOMEPAGE= http://www.spamassassin.org/
+HOMEPAGE= http://spamassassin.apache.org/
COMMENT= Mail filter to identify spam
-CONFLICTS= p5-Mail-SpamAssassin-[1-9]*
-
-SPAMASSASSIN_VERSION= 2.64
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
.include "../../mk/bsd.prefs.mk"
-PERL5_REQD+= 5.6.0 # MakeMaker >= 5.45 needed
-
-DEPENDS+= p5-Net-DNS>=0.29:../../net/p5-Net-DNS
-DEPENDS+= p5-HTML-Parser>=3.29:../../www/p5-HTML-Parser
+DEPENDS+= p5-Net-DNS>=0.34:../../net/p5-Net-DNS
+DEPENDS+= p5-HTML-Parser>=3.31:../../www/p5-HTML-Parser
DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
-DEPENDS+= p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
-.if ${OPSYS} == "SunOS"
+DEPENDS+= {p5-MIME-Base64>=2.11,perl{,-thread}>=5.8.0}:../../converters/p5-MIME-Base64
+DEPENDS+= {p5-Storable-[0-9]*,perl{,-thread}>=5.8.0}:../../devel/p5-Storable
+.if ${OPSYS} != "NetBSD"
DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File
.endif
-SPAMASSASSIN_USE_SSL?= YES
+CONFLICTS= p5-Mail-SpamAssassin-[1-9]*
+
+PKG_INSTALLATION_TYPES= overwrite pkgviews
-.if !empty(SPAMASSASSIN_USE_SSL:M[yY][eE][sS])
-. include "../../security/openssl/buildlink3.mk"
-DEPENDS+= p5-IO-Socket-SSL>=0.92:../../security/p5-IO-Socket-SSL
-CONFIGURE_ARGS+= --enable-ssl
-MAKE_PARAMS= ENABLE_SSL=yes
-SA_SSLCERTS= ${SSLCERTS}
-.else
-CONFIGURE_ARGS+= --disable-ssl
-MAKE_PARAMS= ENABLE_SSL=no
-SA_SSLCERTS= '$$LOCAL_RULES_DIR/certs'
-.endif
+SPAMASSASSIN_VERSION= 3.0.0
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
+
+PERL5_REQD+= 5.6.1 # MakeMaker >= 5.45 needed
USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
@@ -50,35 +39,26 @@
# Set contact address (e-mail, URL, ...) for use in spam report messages
# See "perldoc Mail::SpamAssassin::Conf" for option "report_contact"
-SPAMASSASSIN_CONTACT_ADDRESS?= 'the administrator of that system'
-
-# Use "NO" to turn off warnings and taint checks in spamd/spamassassin
-SPAMASSASSIN_PERL_WARNINGS?= YES
-SPAMASSASSIN_PERL_TAINT_CHECKS?= YES
+SPAMASSASSIN_CONTACT_ADDRESS?= postmaster
-# Enable test for Razor during 'make test'?
-SPAMASSASSIN_RAZOR_TESTS?= YES
+.include "options.mk"
-BUILD_DEFS+= SPAMASSASSIN_USE_SSL
BUILD_DEFS+= SPAMASSASSIN_CONTACT_ADDRESS
-BUILD_DEFS+= SPAMASSASSIN_PERL_WARNINGS
-BUILD_DEFS+= SPAMASSASSIN_PERL_TAINT_CHECKS
PLIST_ADD= ${WRKSRC}/.PLIST_ADD
PLIST_SRC= ${PKGDIR}/PLIST ${PLIST_ADD}
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Mail/SpamAssassin/.packlist
GNU_CONFIGURE= YES
-CONFIGURE_DIRS= ${WRKSRC}/spamd
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_DIRS= ${WRKSRC}/spamc
PERL5_CONFIGURE= NO # we need the default "do-configure" target
PERL5_CONFIGURE_DIRS= ${WRKSRC}
MAKE_PARAMS+= SYSCONFDIR="${PKG_SYSCONFDIR}"
MAKE_PARAMS+= LOCALRULESDIR="${PKG_SYSCONFDIR}"
MAKE_PARAMS+= DEFRULESDIR="${RULESDIR}"
-MAKE_PARAMS+= RUN_RAZOR_TESTS="${SPAMASSASSIN_RAZOR_TESTS}"
-MAKE_PARAMS+= PERL_WARN="${SPAMASSASSIN_PERL_WARNINGS}"
-MAKE_PARAMS+= PERL_TAINT="${SPAMASSASSIN_PERL_TAINT_CHECKS}"
+MAKE_PARAMS+= CONTACT_ADDRESS=${SPAMASSASSIN_CONTACT_ADDRESS:Q}
RCD_SCRIPTS= spamd
RCD_SCRIPT_SRC.spamd= ${WRKSRC}/spamd/netbsd-rc-script.sh
@@ -87,22 +67,19 @@
EG_SUBDIR= ${EGDIR:S,^${PREFIX}/,,}
DOCDIR= ${PREFIX}/share/doc/spamassassin
DOC_SUBDIR= ${DOCDIR:S,^${PREFIX}/,,}
-HTMLDIR= ${PREFIX}/share/doc/html/spamassassin
-HTML_SUBDIR= ${HTMLDIR:S,^${PREFIX}/,,}
RULESDIR= ${PREFIX}/share/spamassassin
RULE_SUBDIR= ${RULESDIR:S,^${PREFIX}/,,}
CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \
+ ${EGDIR}/init.pre ${PKG_SYSCONFDIR}/init.pre \
${RULESDIR}/user_prefs.template \
${PKG_SYSCONFDIR}/user_prefs.template
SUPPORT_FILES_PERMS+= ${EGDIR}/netbsd_lists.cf \
${PKG_SYSCONFDIR}/netbsd_lists.cf ${SHAREOWN} \
${SHAREGRP} ${SHAREMODE}
-INSTALLATION_DIRS+= ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamd \
- ${HTML_SUBDIR}
-
-DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
+INSTALLATION_DIRS+= ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamc \
+ ${DOC_SUBDIR}/spamd
SUBST_CLASSES+= sa1 sa2 sa3
@@ -113,15 +90,16 @@
SUBST_STAGE.sa2= post-patch
SUBST_FILES.sa2= README spamd/spamd.raw
SUBST_SED.sa2= -e s!@@PREFIX@@!${PREFIX}!g \
- -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g \
- -e s!@SA_SSLCERTS@!${SA_SSLCERTS}!g
+ -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
SUBST_STAGE.sa3= post-patch
-SUBST_FILES.sa3= INSTALL USAGE lib/Mail/SpamAssassin/Conf.pm \
- spamd/README.spamd spamd/README.spamd-vpopmail \
- sql/README
+SUBST_FILES.sa3= INSTALL UPGRADE USAGE ldap/README \
+ spamc/README.qmail \
+ lib/Mail/SpamAssassin/Conf.pm spamd/README \
+ spamd/README.vpopmail sql/README sql/README.awl
SUBST_SED.sa3= -e s!/usr/share!${PREFIX}/share!g \
-e s!/usr/bin!${PREFIX}/bin!g \
+ -e s!/usr/local/bin!${PREFIX}/bin!g \
-e s!/usr/lib!${PREFIX}/lib!g \
-e s!/etc/mail/spamassassin!${PKG_SYSCONFDIR}!g
@@ -140,24 +118,19 @@
post-extract:
@# correct bad SA permissions
- @${CHMOD} a-x ${WRKSRC}/License
- @${CHMOD} a-x ${WRKSRC}/lib/Mail/SpamAssassin/*.pm
- @${CHMOD} a-x ${WRKSRC}/rules/20_uri_tests.cf
- @${CHMOD} a+x ${WRKSRC}/masses/uniq-scores
- @${CHMOD} a+x ${WRKSRC}/tools/translation_prep.pl
+ @${CHMOD} a+x ${WRKSRC}/tools/convert_awl_dbm_to_sql
pre-configure: perl5-configure
-
-pre-install:
- ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+ @# GNU configure needs version.h -> create it
+ @cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl
post-install:
@${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
- @ # ninja image is in the static PLIST
- @${INSTALL_DATA} ${WRKSRC}/ninjabutton.png ${HTMLDIR}/
-.for f in CONTRIB_CERT COPYRIGHT INSTALL License README TRADEMARK USAGE \
- sample-nonspam.txt sample-spam.txt spamd/README.spamd \
- spamd/README.spamd-vpopmail
+.for f in INSTALL LICENSE README TRADEMARK UPGRADE USAGE \
+ CREDITS PACKAGING STATUS BUGS Changes \
+ spamc/README.qmail \
+ sample-nonspam.txt sample-spam.txt spamd/README \
+ spamd/README.vpopmail
@${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}/$f
@${ECHO} "${DOC_SUBDIR}/$f" >> ${PLIST_ADD}
.endfor
@@ -166,17 +139,12 @@
@${INSTALL_DATA} ${WRKSRC}/rules/$f ${DOCDIR}/
@${ECHO} "${DOC_SUBDIR}/$f" >> ${PLIST_ADD}
.endfor
-.for DIR in masses qmail sql tools
+.for DIR in masses sql ldap tools
@cd ${WRKSRC}; \
for d in `${FIND} ${DIR} -type d -print`; do \
${INSTALL_DATA_DIR} ${DOCDIR}/$$d; \
done; \
for f in `${FIND} ${DIR} -type f -print`; do \
- if ${TEST} -f $$f; then \
- : ; \
- else \
- continue; \
- fi; \
if ${TEST} -x $$f ; then \
${SED} -e "1s,#!.*/bin/perl,#!${PERL5}," < $$f \
> $${f}.fixed && \
@@ -199,13 +167,14 @@
@${ECHO} "@dirrm ${RULE_SUBDIR}" >> ${PLIST_ADD}
@# examples are in the static PLIST
@${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${EGDIR}/
+ @${INSTALL_DATA} ${WRKSRC}/rules/init.pre ${EGDIR}/
@${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${EGDIR}/
@${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${EGDIR}/
@${CHOWN} ${SHAREOWN} ${RULESDIR}/*
@${CHGRP} ${SHAREGRP} ${RULESDIR}/*
@${CHMOD} a=r ${RULESDIR}/*
- @{ for d in ${INSTALLATION_DIRS}; do \
- ${ECHO} "@dirrm $$d"; \
+ @{ for d in ${INSTALLATION_DIRS}; do \
+ ${ECHO} "@dirrm $$d"; \
done; } | ${SORT} -r >> ${PLIST_ADD};
.include "../../lang/perl5/module.mk"
diff -r 4665aae3fb41 -r 031ce66013d3 mail/spamassassin/PLIST
--- a/mail/spamassassin/PLIST Mon Oct 11 23:46:15 2004 +0000
+++ b/mail/spamassassin/PLIST Tue Oct 12 00:11:10 2004 +0000
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.14 2004/04/23 22:07:55 reed Exp $
+@comment $NetBSD: PLIST,v 1.15 2004/10/12 00:11:10 heinz Exp $
@comment Most of this PLIST is auto-generated; see Makefile.
-share/doc/html/spamassassin/ninjabutton.png
-@comment @dirrm share/doc/html/spamassassin
+share/examples/spamassassin/init.pre
share/examples/spamassassin/local.cf
share/examples/spamassassin/netbsd_lists.cf
share/examples/spamassassin/procmailrc.example
share/spamassassin/languages
share/spamassassin/triplets.txt
share/spamassassin/user_prefs.template
-@comment @dirrm share/examples/spamassassin
diff -r 4665aae3fb41 -r 031ce66013d3 mail/spamassassin/distinfo
Home |
Main Index |
Thread Index |
Old Index