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 2.60 (fixes PR pkg...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2438d83db9a9
branches: trunk
changeset: 463242:2438d83db9a9
user: heinz <heinz%pkgsrc.org@localhost>
date: Mon Nov 03 00:56:25 2003 +0000
description:
Update to version 2.60 (fixes PR pkg/23318):
Summary of changes since 2.5x
-----------------------------------
- spamd supports UNIX-domain sockets
- SSL support for spamc/spamd now usable
- improved Bayes text analysis
- improved expiration of Bayes-DB
- better detection of 'invisible text' and other obfuscation techniques
in HTML
- new RBL (eg SORBS, SpamCop, Osirusoft dropped)
- better handling of RBL timeouts
- support for Razor V1 dropped
- more flexible header and report rewriting
- Perl taint mode enabled by default
- bug fixes
- new rules
diffstat:
mail/spamassassin/DEINSTALL | 17 +
mail/spamassassin/MESSAGE | 25 +-
mail/spamassassin/Makefile | 152 +-
mail/spamassassin/PLIST | 7 +-
mail/spamassassin/distinfo | 27 +-
mail/spamassassin/files/2.60_change_summary | 151 ++
mail/spamassassin/patches/patch-aa | 26 -
mail/spamassassin/patches/patch-ab | 94 +-
mail/spamassassin/patches/patch-ac | 37 -
mail/spamassassin/patches/patch-ad | 1428 ---------------------------
mail/spamassassin/patches/patch-ae | 35 +-
mail/spamassassin/patches/patch-af | 14 -
mail/spamassassin/patches/patch-ag | 14 -
mail/spamassassin/patches/patch-ah | 66 -
mail/spamassassin/patches/patch-ai | 41 -
mail/spamassassin/patches/patch-aj | 16 -
mail/spamassassin/patches/patch-ak | 26 +-
mail/spamassassin/patches/patch-al | 33 +-
mail/spamassassin/patches/patch-am | 21 -
mail/spamassassin/patches/patch-an | 14 -
mail/spamassassin/patches/patch-ao | 17 -
mail/spamassassin/patches/patch-ap | 13 -
mail/spamassassin/patches/patch-aq | 40 +
23 files changed, 443 insertions(+), 1871 deletions(-)
diffs (truncated from 2540 to 300 lines):
diff -r 81cfd8f21a03 -r 2438d83db9a9 mail/spamassassin/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/DEINSTALL Mon Nov 03 00:56:25 2003 +0000
@@ -0,0 +1,17 @@
+# $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 81cfd8f21a03 -r 2438d83db9a9 mail/spamassassin/MESSAGE
--- a/mail/spamassassin/MESSAGE Mon Nov 03 00:36:02 2003 +0000
+++ b/mail/spamassassin/MESSAGE Mon Nov 03 00:56:25 2003 +0000
@@ -1,25 +1,20 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2003/05/22 11:41:02 abs Exp $
+$NetBSD: MESSAGE,v 1.6 2003/11/03 00:56:25 heinz Exp $
-***IMPORTANT***
+ SA 2.60 uses a new format for the Bayes database. *Before* deinstalling
+ SA 2.5x, make sure you ran 'sa-learn --rebuild' for every Bayes database.
- Version 2.53 changed the default tagging behavior. SpamAssassin will now
- create a new report message and attach the original spam message as a
- MIME part (use the "report_safe" option to change this).
+ 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.
Some configuration options were changed (see Mail::SpamAssassin::Conf).
Please check that your existing mail configuration still works.
- On NetBSD, the name of the auto-whitelist database file has changed and
- the auto-whitelist will be created from scratch.
-
- SpamAssassin does NOT deliver mail anymore. You _must_ use some local
- mail delivery agent, eg pkgsrc/mail/procmail.
+ More information can be found in the man pages for 'spamassassin',
+ 'sa-learn', 'spamc' and 'spamd', with 'perldoc Mail::SpamAssassin::Conf'
+ and in
-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/
+ ${PREFIX}/share/doc/spamassassin/
===========================================================================
diff -r 81cfd8f21a03 -r 2438d83db9a9 mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile Mon Nov 03 00:36:02 2003 +0000
+++ b/mail/spamassassin/Makefile Mon Nov 03 00:56:25 2003 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.32 2003/09/13 21:24:23 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2003/11/03 00:56:26 heinz Exp $
-DISTNAME= Mail-SpamAssassin-2.55
-PKGNAME= spamassassin-2.55
-PKGREVISION= 2
+DISTNAME= Mail-SpamAssassin-2.60
+PKGNAME= spamassassin-2.60
+PKGREVISION= # empty
SVR4_PKGNAME= sa
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} \
- http://www.spamassassin.org/released/
+ http://www.spamassassin.org/released/ \
+ http://eu.spamassassin.org/released/
MAINTAINER= heinz-sa%NetBSD.org@localhost
HOMEPAGE= http://www.spamassassin.org/
@@ -16,61 +17,107 @@
.include "../../mk/bsd.prefs.mk"
-BUILDLINK_DEPENDS.perl= perl>=5.6.0
+BUILDLINK_DEPENDS.perl= perl>=5.6.1 # MakeMaker >= 5.45 needed
-DEPENDS+= p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
-DEPENDS+= p5-HTML-Parser>=3.0:../../www/p5-HTML-Parser
+DEPENDS+= p5-Net-DNS>=0.29:../../net/p5-Net-DNS
+DEPENDS+= p5-HTML-Parser>=3.29:../../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-DB_File-[0-9]*:../../databases/p5-DB_File
.endif
-ALL_TARGET= all
-
-SPAMASSASSIN_USE_SSL?= NO
-BUILD_DEFS+= SPAMASSASSIN_USE_SSL
+SPAMASSASSIN_USE_SSL?= YES
.if !empty(SPAMASSASSIN_USE_SSL:M[yY][eE][sS])
. include "../../security/openssl/buildlink2.mk"
DEPENDS+= p5-IO-Socket-SSL>=0.92:../../security/p5-IO-Socket-SSL
CONFIGURE_ARGS+= --enable-ssl
-ALL_TARGET+= spamd/sslspamc
+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
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
PKG_SYSCONFSUBDIR= spamassassin
+# 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
+
+# Enable test for Razor during 'make test'?
+SPAMASSASSIN_RAZOR_TESTS?= YES
+
+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
-PERL5_CONFIGURE= NO
-MAKE_PARAMS= SYSCONFDIR="${PKG_SYSCONFDIR}"
-MAKE_PARAMS+= LOCAL_RULES_DIR="${PKG_SYSCONFDIR}"
-MAKE_PARAMS+= RUN_RAZOR1_TESTS="y" RUN_RAZOR2_TESTS="y"
+CONFIGURE_DIRS= ${WRKSRC}/spamd
+PERL5_CONFIGURE= NO # we need the default "do-configure" target
+PERL5_CONFIGURE_DIRS= ${WRKSRC}
-OWN_DIRS+= ${PKG_SYSCONFDIR}/certs
+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}"
RCD_SCRIPTS= spamd
-RCD_SCRIPT_SRC.spamd= ${WRKDIR}/${DISTNAME}/spamd/netbsd-rc-script.sh
+RCD_SCRIPT_SRC.spamd= ${WRKSRC}/spamd/netbsd-rc-script.sh
EGDIR= ${PREFIX}/share/examples/spamassassin
DOCDIR= ${PREFIX}/share/doc/spamassassin
DOC_SUBDIR= ${DOCDIR:S,^${PREFIX}/,,}
HTMLDIR= ${PREFIX}/share/doc/html/spamassassin
RULESDIR= ${PREFIX}/share/spamassassin
+RULE_SUBDIR= ${RULESDIR:S,^${PREFIX}/,,}
-CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf
-CONF_FILES+= ${PREFIX}/share/spamassassin/user_prefs.template \
- ${PKG_SYSCONFDIR}/user_prefs.template
+CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \
+ ${RULESDIR}/user_prefs.template \
+ ${PKG_SYSCONFDIR}/user_prefs.template
SUPPORT_FILES_PERMS+= ${EGDIR}/netbsd_lists.cf \
- ${PKG_SYSCONFDIR}/netbsd_lists.cf ${SHAREOWN} \
- ${SHAREGRP} ${SHAREMODE}
+ ${PKG_SYSCONFDIR}/netbsd_lists.cf ${SHAREOWN} \
+ ${SHAREGRP} ${SHAREMODE}
+
+OWN_DIRS+= ${EGDIR} ${DOCDIR} ${DOCDIR}/spamd ${HTMLDIR}
+
+DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
+
+SUBST_CLASSES+= sa1 sa2 sa3
+
+SUBST_STAGE.sa1= post-patch
+SUBST_FILES.sa1= Makefile.PL
+SUBST_SED.sa1= -e s!@SA_CONTACT_ADDRESS@!${SPAMASSASSIN_CONTACT_ADDRESS}!
+
+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
+
+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_SED.sa3= -e s!/usr/share!${PREFIX}/share!g \
+ -e s!/usr/bin!${PREFIX}/bin!g \
+ -e s!/usr/lib!${PREFIX}/lib!g \
+ -e s!/etc/mail/spamassassin!${PKG_SYSCONFDIR}!g
.if ${OPSYS} == "NetBSD"
# the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later
@@ -82,8 +129,8 @@
.endif
# These values are substituted into netbsd-rc-script.sh.
-FILES_SUBST+= INTERPRETER_SUPPORT="${INTERPRETER_SUPPORT}"
-FILES_SUBST+= OPSYS="${OPSYS}"
+FILES_SUBST+= INTERPRETER_SUPPORT="${INTERPRETER_SUPPORT}"
+FILES_SUBST+= OPSYS="${OPSYS}"
post-extract:
@# correct bad SA permissions
@@ -93,36 +140,23 @@
@${CHMOD} a+x ${WRKSRC}/masses/uniq-scores
@${CHMOD} a+x ${WRKSRC}/tools/translation_prep.pl
-post-patch:
-.for f in INSTALL README USAGE lib/Mail/SpamAssassin/Conf.pm \
- spamd/README.spamd spamd/README.spamd-vpopmail sql/README
- @${SED} -e "s,/usr/share,${PREFIX}/share,g" \
- -e "s,/usr/bin,${PREFIX}/bin,g" \
- -e "s,/usr/lib,${PREFIX}/lib,g" \
- -e "s,/etc/mail/spamassassin,${PKG_SYSCONFDIR},g" \
- ${WRKSRC}/${f} > ${WRKSRC}/${f}.fixed; \
- ${MV} ${WRKSRC}/${f}.fixed ${WRKSRC}/${f}
-.endfor
-
pre-configure: perl5-configure
-post-build:
- @${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+pre-install:
+ ${FIND} ${WRKSRC} -name "*.orig" -print -o \
+ -name "*.subst.sav" -print | ${XARGS} ${RM} -f
-pre-install:
- @-${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
- @${INSTALL_DATA_DIR} ${EGDIR}
- @${INSTALL_DATA_DIR} ${DOCDIR}/spamd
- @${INSTALL_DATA_DIR} ${HTMLDIR}
- @# ninja image is in the static PLIST
+post-install:
+ @${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
+ @ # ninja image is in the static PLIST
@${INSTALL_DATA} ${WRKSRC}/ninjabutton.png ${HTMLDIR}/
+ @${INSTALL_DATA} ${FILESDIR}/2.60_change_summary ${DOCDIR}/
.for f in CONTRIB_CERT COPYRIGHT INSTALL License README TRADEMARK USAGE \
sample-nonspam.txt sample-spam.txt spamd/README.spamd \
spamd/README.spamd-vpopmail
@${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}/$f
@${ECHO} "${DOC_SUBDIR}/$f" >> ${PLIST_ADD}
.endfor
- @${ECHO} "@dirrm ${DOC_SUBDIR}/spamd" >> ${PLIST_ADD}
.for f in STATISTICS.txt STATISTICS-set1.txt STATISTICS-set2.txt \
STATISTICS-set3.txt
@${INSTALL_DATA} ${WRKSRC}/rules/$f ${DOCDIR}/
@@ -135,45 +169,37 @@
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,/usr/bin/perl,${PERL5}," \
- -e "1s,/usr/local/bin/perl,${PERL5}," \
- $$f > $${f}.fixed; \
- ${MV} $${f}.fixed $$f; \
- ${CHMOD} +x $$f; \
+ ${SED} -e "1s,#!.*/bin/perl,#!${PERL5}," < $$f \
+ > $${f}.fixed && \
+ ${MV} $${f}.fixed $$f && \
+ ${CHMOD} +x $$f && \
${INSTALL_SCRIPT} $$f ${DOCDIR}/$$f; \
else \
${INSTALL_DATA} $$f ${DOCDIR}/$$f; \
fi; \
${ECHO} "${DOC_SUBDIR}/$$f" >> ${PLIST_ADD}; \
done; \
- (for d in `${FIND} ${DIR} -type d -print`; do \
+ { for d in `${FIND} ${DIR} -type d -print`; do \
${ECHO} "@dirrm ${DOC_SUBDIR}/$$d"; \
- done) | ${SORT} -r >> ${PLIST_ADD}
+ done; } | ${SORT} -r >> ${PLIST_ADD};
.endfor
- @${ECHO} "@dirrm ${DOC_SUBDIR}" >> ${PLIST_ADD}
@cd ${WRKSRC}/rules; \
for f in [0-9]*.cf; do \
- ${ECHO} "share/spamassassin/$$f" >> ${PLIST_ADD}; \
+ ${ECHO} "${RULE_SUBDIR}/$$f" >> ${PLIST_ADD}; \
Home |
Main Index |
Thread Index |
Old Index