pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/spamassassin Updated to version 3.1.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e90694f78407
branches: trunk
changeset: 509713:e90694f78407
user: heinz <heinz%pkgsrc.org@localhost>
date: Mon Mar 13 21:11:57 2006 +0000
description:
Updated to version 3.1.1.
Pkgsrc changes:
- Generic option "online-tests" replaces "spamassassin-test-net".
- Removed underscore from package-internal variables (pkglint
complained).
- patch-ay disables the SPF plugin to avoid confusing warnings in the log
files.
- patch-az fixes http://issues.apache.org/SpamAssassin/show_bug.cgi?id=4826.
Relevant changes since version 3.1.0:
=====================================
- better validate a number of different configuration options
- support new Mail::DomainKeys API, which changed incompatibly between
0.18 and 0.80 without warning
- more properly handle new Received header formats
- bug 4788: backport sa-update from 3.2 along with the local_state_dir
code, etc.
- bug 4760: strictly validate trusted/internal network configurations
- bug 4696: consolidated fixes for timeout bugs
- bug 3710: add timeout to connect so spamc -t works
- bug 4363: if a message uses CRLF for line endings, use it for header
rewrites as well
- bug 4748: add ExpressionEngine and Google redirector patterns
- bug 3815: add _RELAYCOUNTRY_ tag so that the RelayCountry plugin can
put in the list of countries relayed through
- bug 4090: x86_64 platforms (linux specifically) have an issue compiling
libspamc.so causing RPM build failures
- bug 4791: fix issue where perl would throw a UTF-8 warning for certain
messages
- bugs 4606, 4609: Adjust MIME parsing limits
- bug 4780: fix IP_ADDRESS & LOCALHOST regexes to correctly parse IPv6
addresses
- bug 4728: DUL rules should only use the last external IP, not all but
the first of the external IPs
- bug 4700: certain privileged configuration settings can inject code,
due to a bad fix for bug 3846. Back that out
diffstat:
mail/spamassassin/Makefile | 77 ++++++++++++++++++-------------------
mail/spamassassin/PLIST | 3 +-
mail/spamassassin/distinfo | 12 +++--
mail/spamassassin/options.mk | 35 ++++++++--------
mail/spamassassin/patches/patch-ad | 40 +++++++------------
mail/spamassassin/patches/patch-ay | 14 ++++++
mail/spamassassin/patches/patch-az | 12 +++++
7 files changed, 106 insertions(+), 87 deletions(-)
diffs (truncated from 381 to 300 lines):
diff -r cfec26c05b55 -r e90694f78407 mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile Mon Mar 13 20:55:42 2006 +0000
+++ b/mail/spamassassin/Makefile Mon Mar 13 21:11:57 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2006/02/05 23:09:58 joerg Exp $
+# $NetBSD: Makefile,v 1.69 2006/03/13 21:11:57 heinz Exp $
-DISTNAME= Mail-SpamAssassin-3.1.0
-PKGNAME= spamassassin-3.1.0
-PKGREVISION= 3
+DISTNAME= Mail-SpamAssassin-3.1.1
+PKGNAME= spamassassin-3.1.1
SVR4_PKGNAME= sa
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
@@ -56,7 +55,7 @@
REPLACE_PERL= masses/parse-rules-for-masses
MAKE_PARAMS+= CONTACT_ADDRESS=${SPAMASSASSIN_CONTACT_ADDRESS:Q}
-MAKE_PARAMS+= DEFRULESDIR="${_RULESDIR}"
+MAKE_PARAMS+= DEFRULESDIR="${RULESDIR}"
MAKE_PARAMS+= LOCALRULESDIR="${PKG_SYSCONFDIR}"
MAKE_PARAMS+= PERL_BIN="${PERL5}"
MAKE_PARAMS+= SYSCONFDIR="${PKG_SYSCONFDIR}"
@@ -64,21 +63,21 @@
RCD_SCRIPTS= spamd
RCD_SCRIPT_SRC.spamd= ${WRKSRC}/spamd/netbsd-rc-script.sh
-_EG_SUBDIR= share/examples/spamassassin
-_EGDIR= ${PREFIX}/${_EG_SUBDIR}
-_DOC_SUBDIR= share/doc/spamassassin
-_DOCDIR= ${PREFIX}/${_DOC_SUBDIR}
-_RULE_SUBDIR= share/spamassassin
-_RULESDIR= ${PREFIX}/${_RULE_SUBDIR}
+EG_SUBDIR= share/examples/spamassassin
+EGDIR= ${PREFIX}/${EG_SUBDIR}
+DOC_SUBDIR= share/doc/spamassassin
+DOCDIR= ${PREFIX}/${DOC_SUBDIR}
+RULE_SUBDIR= share/spamassassin
+RULESDIR= ${PREFIX}/${RULE_SUBDIR}
-CONF_FILES+= ${_EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \
- ${_EGDIR}/init.pre ${PKG_SYSCONFDIR}/init.pre \
- ${_EGDIR}/v310.pre ${PKG_SYSCONFDIR}/v310.pre \
- ${_RULESDIR}/user_prefs.template \
+CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \
+ ${EGDIR}/init.pre ${PKG_SYSCONFDIR}/init.pre \
+ ${EGDIR}/v310.pre ${PKG_SYSCONFDIR}/v310.pre \
+ ${RULESDIR}/user_prefs.template \
${PKG_SYSCONFDIR}/user_prefs.template
-INSTALLATION_DIRS+= ${_EG_SUBDIR} ${_DOC_SUBDIR} ${_DOC_SUBDIR}/spamc\
- ${_DOC_SUBDIR}/spamd
+INSTALLATION_DIRS+= ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamc\
+ ${DOC_SUBDIR}/spamd
SUBST_CLASSES+= sa2 sa3
@@ -103,14 +102,14 @@
.if (${OPSYS} == "NetBSD") || (${OPSYS} == "DragonFly")
# the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later
. if (${OPSYS} == "NetBSD") && !empty(OS_VERSION:M1.[0-5]*)
-_INTERPRETER_SUPPORT= NO
+INTERPRETER_SUPPORT= NO
. else
-_INTERPRETER_SUPPORT= YES
+INTERPRETER_SUPPORT= YES
. endif
.endif
# These variables are substituted in netbsd-rc-script.sh.
-FILES_SUBST+= _INTERPRETER_SUPPORT=${_INTERPRETER_SUPPORT:Q}
+FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT:Q}
FILES_SUBST+= OPSYS=${OPSYS:Q}
post-extract:
@@ -130,18 +129,18 @@
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}
+ @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
+ @${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
.endfor
.for f in STATISTICS-set0.txt STATISTICS-set1.txt STATISTICS-set2.txt \
STATISTICS-set3.txt
- @${INSTALL_DATA} ${WRKSRC}/rules/${f} ${_DOCDIR}/
- @${ECHO} "${_DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
+ @${INSTALL_DATA} ${WRKSRC}/rules/${f} ${DOCDIR}/
+ @${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
.endfor
.for dir in masses sql ldap tools
@cd ${WRKSRC}; \
for d in `${FIND} ${dir} -type d -print`; do \
- ${INSTALL_DATA_DIR} ${_DOCDIR}/$$d; \
+ ${INSTALL_DATA_DIR} ${DOCDIR}/$$d; \
done; \
for f in `${FIND} ${dir} -type f -print`; do \
if ${TEST} -x $$f ; then \
@@ -149,30 +148,30 @@
> $${f}.fixed && \
${MV} $${f}.fixed $$f && \
${CHMOD} +x $$f && \
- ${INSTALL_SCRIPT} $$f ${_DOCDIR}/$$f; \
+ ${INSTALL_SCRIPT} $$f ${DOCDIR}/$$f; \
else \
- ${INSTALL_DATA} $$f ${_DOCDIR}/$$f; \
+ ${INSTALL_DATA} $$f ${DOCDIR}/$$f; \
fi; \
- ${ECHO} "${_DOC_SUBDIR}/$$f" >> ${PLIST_ADD}; \
+ ${ECHO} "${DOC_SUBDIR}/$$f" >> ${PLIST_ADD}; \
done; \
{ for d in `${FIND} ${dir} -type d -print`; do \
- ${ECHO} "@dirrm ${_DOC_SUBDIR}/$$d"; \
+ ${ECHO} "@dirrm ${DOC_SUBDIR}/$$d"; \
done; } | ${SORT} -r >> ${PLIST_ADD};
.endfor
@cd ${WRKSRC}/rules; \
for f in [0-9]*.cf; do \
- ${ECHO} "${_RULE_SUBDIR}/$$f" >> ${PLIST_ADD}; \
+ ${ECHO} "${RULE_SUBDIR}/$$f" >> ${PLIST_ADD}; \
done
- @${ECHO} "@dirrm ${_RULE_SUBDIR}" >> ${PLIST_ADD}
+ @${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/v310.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}/*
+ @${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${EGDIR}/
+ @${INSTALL_DATA} ${WRKSRC}/rules/init.pre ${EGDIR}/
+ @${INSTALL_DATA} ${WRKSRC}/rules/v310.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"; \
done; } | ${SORT} -r >> ${PLIST_ADD};
diff -r cfec26c05b55 -r e90694f78407 mail/spamassassin/PLIST
--- a/mail/spamassassin/PLIST Mon Mar 13 20:55:42 2006 +0000
+++ b/mail/spamassassin/PLIST Mon Mar 13 21:11:57 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2005/11/13 22:48:32 heinz Exp $
+@comment $NetBSD: PLIST,v 1.18 2006/03/13 21:11:57 heinz Exp $
@comment Most of this PLIST is auto-generated; see Makefile.
share/examples/rc.d/spamd
share/examples/spamassassin/init.pre
@@ -7,5 +7,6 @@
share/examples/spamassassin/procmailrc.example
share/examples/spamassassin/v310.pre
share/spamassassin/languages
+share/spamassassin/sa-update-pubkey.txt
share/spamassassin/triplets.txt
share/spamassassin/user_prefs.template
diff -r cfec26c05b55 -r e90694f78407 mail/spamassassin/distinfo
--- a/mail/spamassassin/distinfo Mon Mar 13 20:55:42 2006 +0000
+++ b/mail/spamassassin/distinfo Mon Mar 13 21:11:57 2006 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.34 2005/11/22 13:03:22 rillig Exp $
+$NetBSD: distinfo,v 1.35 2006/03/13 21:11:57 heinz Exp $
-SHA1 (Mail-SpamAssassin-3.1.0.tar.gz) = d887cbae5962cb03e45aaf71cd93881a27cccc99
-RMD160 (Mail-SpamAssassin-3.1.0.tar.gz) = 20dc1b8befcc72545b6136e58a9fcce143480ccd
-Size (Mail-SpamAssassin-3.1.0.tar.gz) = 1185499 bytes
+SHA1 (Mail-SpamAssassin-3.1.1.tar.gz) = cda06e3d38d831521c59e50ec024e468b76035cb
+RMD160 (Mail-SpamAssassin-3.1.1.tar.gz) = 35e3ff6f8396a9057d9f12acf62a304410d60096
+Size (Mail-SpamAssassin-3.1.1.tar.gz) = 1129275 bytes
SHA1 (patch-ab) = e1cebc78255d3a72b75b2494f6539957742b0cea
-SHA1 (patch-ad) = 1949ac07780ed2c10cdff77ce2ac9982d18a9559
+SHA1 (patch-ad) = 11c1af471e1215b489749648657e2252af828b5d
SHA1 (patch-ae) = 1461b24978c75c394c607ae1d49cb49dd086b563
SHA1 (patch-aq) = 495a3ac94a05129520e5d7018fdd56b6dad3c951
+SHA1 (patch-ay) = 7d805e7ef86e279a19e7d3d2f03e2227624317f8
+SHA1 (patch-az) = c3ebb9a7ef3e4324d312c1c0d6e3342dea058ca7
diff -r cfec26c05b55 -r e90694f78407 mail/spamassassin/options.mk
--- a/mail/spamassassin/options.mk Mon Mar 13 20:55:42 2006 +0000
+++ b/mail/spamassassin/options.mk Mon Mar 13 21:11:57 2006 +0000
@@ -1,20 +1,21 @@
-# $NetBSD: options.mk,v 1.4 2005/11/13 22:48:32 heinz Exp $
+# $NetBSD: options.mk,v 1.5 2006/03/13 21:11:57 heinz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin
PKG_SUPPORTED_OPTIONS= \
+ online-tests \
spamassassin-perl-warnings \
spamassassin-taint-checks \
spamassassin-test-awl-sql \
spamassassin-test-bayes-sql \
- spamassassin-test-net \
spamassassin-test-prefork \
ssl
PKG_OPTIONS_LEGACY_OPTS+= \
awl-sql-tests:spamassassin-test-awl-sql \
bayes-sql-tests:spamassassin-test-bayes-sql \
- net-tests:spamassassin-test-net \
+ net-tests:online-tests \
perl-taint-checks:spamassassin-taint-checks \
- perl-warnings:spamassassin-perl-warnings
+ perl-warnings:spamassassin-perl-warnings \
+ spamassassin-test-net:online-tests
#
# Default options
@@ -31,10 +32,10 @@
SUBST_STAGE.satests= post-configure
SUBST_FILES.satests= t/config
SUBST_SED.satests= \
- -e s!awl_sql_tests=n!awl_sql_tests=${_AWL_SQL_TEST}! \
- -e s!bayes_sql_tests=n!bayes_sql_tests=${_BAYES_SQL_TEST}! \
- -e s!run_net_tests=n!run_net_tests=${_NET_TEST}! \
- -e s!prefork_stress_test=n!prefork_stress_test=${_PREFORK_TEST}!
+ -e s!awl_sql_tests=n!awl_sql_tests=${AWL_SQL_TEST}! \
+ -e s!bayes_sql_tests=n!bayes_sql_tests=${BAYES_SQL_TEST}! \
+ -e s!run_net_tests=n!run_net_tests=${NET_TEST}! \
+ -e s!prefork_stress_test=n!prefork_stress_test=${PREFORK_TEST}!
#
# Enable tests of the SQL storage module for the automatic whitelist
@@ -42,9 +43,9 @@
# configuration during 'configure' phase.
#
.if !empty(PKG_OPTIONS:Mspamassassin-test-awl-sql)
-_AWL_SQL_TEST=y
+AWL_SQL_TEST=y
.else
-_AWL_SQL_TEST=n
+AWL_SQL_TEST=n
.endif
#
@@ -53,18 +54,18 @@
# configuration during 'configure' phase.
#
.if !empty(PKG_OPTIONS:Mspamassassin-test-bayes-sql)
-_BAYES_SQL_TEST=y
+BAYES_SQL_TEST=y
.else
-_BAYES_SQL_TEST=n
+BAYES_SQL_TEST=n
.endif
#
# Enable Internet based tests during 'make test' (Razor, Pyzor, etc.)
#
-.if !empty(PKG_OPTIONS:Mspamassassin-test-net)
-_NET_TEST=y
+.if !empty(PKG_OPTIONS:Monline-tests)
+NET_TEST=y
.else
-_NET_TEST=n
+NET_TEST=n
.endif
#
@@ -90,9 +91,9 @@
# string 'spam child' in their process title).
#
.if !empty(PKG_OPTIONS:Mspamassassin-test-prefork)
-_PREFORK_TEST=y
+PREFORK_TEST=y
.else
-_PREFORK_TEST=n
+PREFORK_TEST=n
.endif
#
diff -r cfec26c05b55 -r e90694f78407 mail/spamassassin/patches/patch-ad
--- a/mail/spamassassin/patches/patch-ad Mon Mar 13 20:55:42 2006 +0000
+++ b/mail/spamassassin/patches/patch-ad Mon Mar 13 21:11:57 2006 +0000
@@ -1,55 +1,45 @@
-$NetBSD: patch-ad,v 1.7 2005/11/13 22:48:32 heinz Exp $
+$NetBSD: patch-ad,v 1.8 2006/03/13 21:11:57 heinz Exp $
---- spamd/netbsd-rc-script.sh.orig Sat Oct 23 01:39:18 2004
+--- spamd/netbsd-rc-script.sh.orig 2006-03-10 20:30:23.000000000 +0100
+++ spamd/netbsd-rc-script.sh
-@@ -9,7 +9,7 @@
- # @PREFIX@/share/doc/spamassassin/spamd/README.spamd
- # especially the section about security.
+@@ -4,2 +4,6 @@
+ #
++# Start script for 'spamd' installed by the pkgsrc package collection
++# running on *BSD, MacOS X, Solaris, Linux, and various other U*IX-like
++# systems.
++#
+ # The 'spamd' daemon checks emails provided by the 'spamc' client for signs
+@@ -11,3 +15,3 @@
-## only for NetBSD
+## only for DragonFlyBSD/NetBSD
# PROVIDE: spamd
- # REQUIRE: LOGIN
- # BEFORE: mail
Home |
Main Index |
Thread Index |
Old Index