25f347a546
Pkgsrc changes: - Added security/gnupg as a required package. Without it, sa-update does not work. - Added requirement for p5-INET6 which may be needed for IPv6 nameservers. Until now, this only worked because p5-Net-DNS already pulled in this package. - New option "inet6" (enabled by default) for switching off the requirement for p5-INET6. - Got rid of some backslashes in options.mk - patch-ba and patch-bc correct discrepancies between the man page and the code. Additionally, they adapt hard-coded paths to the actual installation. Submitted upstream. Relevant changes since version 3.2.1: ===================================== 3.2.3 is a major bug-fix release. Summary of changes: - bug 5574: fix new setuid code to work with perl 5.6.1, and to support DCC and Pyzor in all releases of perl - bug 5107: change default 'user_scores_ldap_username' to be the null string, allowing anonymous binding; fix 'schema' syntax error in LDAP config support - zeroing an 'eval' rule's score did not stop it running. fix, thanks to Richard Birkett <richard+spamassassin at musicbox.net> - bug 5571: allow for new message ID format we have seen from Vista or Windows 2003 Server MAPI to avoid false positives - bug 5397: RDNS_DYNAMIC should never fire on a PTR with 'static' in it; thanks to Martin Blapp <mbr at freebsd.org>. bug 5563: RDNS_DYNAMIC rules use order-dependent fields where it is unsafe to depend on this, fix. bug 5564: __RDNS_DYNAMIC_IPADDR does not hit all of its test patterns, fix. - bug 5475: fix FORGED_MUA_AOL_FROM to allow <*@{aol,cs}.*> addresses instead of just <*@{aol,cs}.com> 3.2.2 is a minor bug-fix release. Summary of changes: - bug 5548: Certain mail input can take a long time to scan with 100% CPU utilisation, due to backtracking in a rule's regexp. fix - bugs 5510, 5518, 5529: fix 'make test' when running as root, needed for CPAN - bug 5419: kill -HUP of pidof spamd causes the ps name to change from spamd to perl. fixed - bug 5535: 'make test' errors in Windows caused by nonportable use of getpwuid - bug 5462: multiple DNS records for a host name should allow use of spamd -H for load balancing installs to work - bugs 5509, 5511: fix network lookup timeouts, where lookups were being lost once a timeout was hit; also fix code to match documentation on rbl_timeout's scaling and minimum duration of 1 second; and attempt to collect already-received DNS responses when the timeout is reached; improve related debugging output. Thanks to Mark Martinec - bugs 5412, 5478, 5522: Fix problems using the spamc -x option with certain other options; 'spamc -x -R' always returned 0, instead of the exit code, on error. Bug 5478: in addition, 'spamc -x -e /command' would still run the command, even if errors meant that the filtered text would be unavailable, which contradicted -x. - bug 5445: body eval tests defined in user_rules cause ugly 'Subroutine _eval_tests_type11_prineg400_set3 redefined' warnings - bug 5355: add in new entries for RegistrarBoundaries - bug 5515: libsslspamc.so & libsslspamc.so can not build without -fPIC, but we were picking up the wrong CFLAGS to do this. - bug 5501: zero score for FH_HAS_XID - bug 5449: allow_user_rules causes sa-compile / Rule2XSBody plugin to emit spurious warnings; fix. also, add a new 'user_conf_parsing_end' plugin hook, which is called after the per-user configuration is parsed - bug 5182: update the sa-learn doc to mention that -u is only usable w/ sql - bug 5534: fix harmless-but-ugly C compiler warning in sa-compile
116 lines
3.1 KiB
Makefile
116 lines
3.1 KiB
Makefile
# $NetBSD: options.mk,v 1.7 2007/08/26 17:26:51 heinz Exp $
|
|
|
|
PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin
|
|
PKG_SUPPORTED_OPTIONS= inet6
|
|
PKG_SUPPORTED_OPTIONS+= online-tests
|
|
PKG_SUPPORTED_OPTIONS+= spamassassin-perl-warnings
|
|
PKG_SUPPORTED_OPTIONS+= spamassassin-taint-checks
|
|
PKG_SUPPORTED_OPTIONS+= spamassassin-test-awl-sql
|
|
PKG_SUPPORTED_OPTIONS+= spamassassin-test-bayes-sql
|
|
PKG_SUPPORTED_OPTIONS+= spamassassin-test-prefork
|
|
PKG_SUPPORTED_OPTIONS+= ssl
|
|
|
|
PKG_OPTIONS_LEGACY_OPTS+= awl-sql-tests:spamassassin-test-awl-sql
|
|
PKG_OPTIONS_LEGACY_OPTS+= bayes-sql-tests:spamassassin-test-bayes-sql
|
|
PKG_OPTIONS_LEGACY_OPTS+= net-tests:online-tests
|
|
PKG_OPTIONS_LEGACY_OPTS+= perl-taint-checks:spamassassin-taint-checks
|
|
PKG_OPTIONS_LEGACY_OPTS+= perl-warnings:spamassassin-perl-warnings
|
|
PKG_OPTIONS_LEGACY_OPTS+= spamassassin-test-net:online-tests
|
|
|
|
#
|
|
# Default options
|
|
#
|
|
PKG_SUGGESTED_OPTIONS= inet6 spamassassin-taint-checks
|
|
PKG_SUGGESTED_OPTIONS+= spamassassin-perl-warnings ssl
|
|
|
|
.include "../../mk/bsd.options.mk"
|
|
|
|
#
|
|
# change t/config according to all the options
|
|
#
|
|
SUBST_CLASSES+= satests
|
|
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}!
|
|
SUBST_SED.satests+= -e s!bayes_sql_tests=n!bayes_sql_tests=${BAYES_SQL_TEST}!
|
|
SUBST_SED.satests+= -e s!run_net_tests=n!run_net_tests=${NET_TEST}!
|
|
SUBST_SED.satests+= -e s!prefork_stress_test=n!prefork_stress_test=${PREFORK_TEST}!
|
|
|
|
#
|
|
# Enable tests of the SQL storage module for the automatic whitelist
|
|
# (AWL). This option enables interactive questions about the database
|
|
# configuration during 'configure' phase.
|
|
#
|
|
.if !empty(PKG_OPTIONS:Mspamassassin-test-awl-sql)
|
|
AWL_SQL_TEST=y
|
|
.else
|
|
AWL_SQL_TEST=n
|
|
.endif
|
|
|
|
#
|
|
# Enable tests of the SQL storage module for Bayes information.
|
|
# This option enables interactive questions about the database
|
|
# configuration during 'configure' phase.
|
|
#
|
|
.if !empty(PKG_OPTIONS:Mspamassassin-test-bayes-sql)
|
|
BAYES_SQL_TEST=y
|
|
.else
|
|
BAYES_SQL_TEST=n
|
|
.endif
|
|
|
|
#
|
|
# Enable Internet based tests during 'make test' (Razor, Pyzor, etc.)
|
|
#
|
|
.if !empty(PKG_OPTIONS:Monline-tests)
|
|
NET_TEST=y
|
|
.else
|
|
NET_TEST=n
|
|
.endif
|
|
|
|
#
|
|
# Enable Perl warnings in spamd and spamassassin
|
|
#
|
|
.if !empty(PKG_OPTIONS:Mspamassassin-perl-warnings)
|
|
MAKE_PARAMS+= PERL_WARN=yes
|
|
.else
|
|
MAKE_PARAMS+= PERL_WARN=no
|
|
.endif
|
|
|
|
#
|
|
# Enable Perl taint checks in spamd and spamassassin to improve security
|
|
#
|
|
.if !empty(PKG_OPTIONS:Mspamassassin-taint-checks)
|
|
MAKE_PARAMS+= PERL_TAINT=yes
|
|
.else
|
|
MAKE_PARAMS+= PERL_TAINT=no
|
|
.endif
|
|
|
|
#
|
|
# Enable spamd prefork stress test (will kill any processes containing the
|
|
# string 'spam child' in their process title).
|
|
#
|
|
.if !empty(PKG_OPTIONS:Mspamassassin-test-prefork)
|
|
PREFORK_TEST=y
|
|
.else
|
|
PREFORK_TEST=n
|
|
.endif
|
|
|
|
#
|
|
# Build spamc and spamd with support for connections over SSL
|
|
#
|
|
.if !empty(PKG_OPTIONS:Mssl)
|
|
. 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
|
|
.else
|
|
CONFIGURE_ARGS+= --disable-ssl
|
|
MAKE_PARAMS+= ENABLE_SSL=no
|
|
.endif
|
|
|
|
#
|
|
# Be prepared for IPv6 nameservers
|
|
#
|
|
.if !empty(PKG_OPTIONS:Minet6)
|
|
DEPENDS+= p5-INET6-[0-9]*:../../net/p5-INET6
|
|
.endif
|