head 1.10; access; symbols pkgsrc-2013Q2:1.10.0.34 pkgsrc-2013Q2-base:1.10 pkgsrc-2012Q4:1.10.0.32 pkgsrc-2012Q4-base:1.10 pkgsrc-2011Q4:1.10.0.30 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q2:1.10.0.28 pkgsrc-2011Q2-base:1.10 pkgsrc-2009Q4:1.10.0.26 pkgsrc-2009Q4-base:1.10 pkgsrc-2008Q4:1.10.0.24 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.22 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.20 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.18 pkgsrc-2008Q2-base:1.10 pkgsrc-2008Q1:1.10.0.16 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.14 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.12 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.10 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.10.0.8 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.10.0.6 pkgsrc-2006Q4-base:1.10 pkgsrc-2006Q3:1.10.0.4 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.2 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.9.0.2 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.7.0.2 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.6.0.16 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3; locks; strict; comment @# @; 1.10 date 2006.05.26.20.53.00; author heinz; state dead; branches; next 1.9; 1.9 date 2006.03.24.19.46.10; author heinz; state Exp; branches 1.9.2.1; next 1.8; 1.8 date 2006.03.13.21.11.57; author heinz; state Exp; branches; next 1.7; 1.7 date 2005.11.13.22.48.32; author heinz; state Exp; branches; next 1.6; 1.6 date 2003.11.03.00.56.26; author heinz; state dead; branches; next 1.5; 1.5 date 2003.05.22.11.41.03; author abs; state Exp; branches; next 1.4; 1.4 date 2003.04.15.00.02.25; author heinz; state dead; branches; next 1.3; 1.3 date 2002.11.06.21.51.26; author heinz; state Exp; branches; next 1.2; 1.2 date 2002.10.20.20.09.05; author heinz; state Exp; branches; next 1.1; 1.1 date 2002.10.08.00.49.22; author heinz; state Exp; branches; next ; 1.9.2.1 date 2006.06.07.21.28.47; author salo; state dead; branches; next ; desc @@ 1.10 log @Updated to version 3.1.2. Pkgsrc changes: - The updates for rule files go into $VARBASE/spamassassin/. - This above directory and the directory sa-update-keys for the GPG keys are now handled automatically by OWN_DIRS. - The growing number of *.pre files are managed in a loop in the Makefile. They are no longer contained in the static PLIST. - Removed some unnecessary trailing slashes. - Patching init.pre in order to disable the SPF plugin broke the spf.t test. This is now fixed, although in a rather ugly way :-/. - patch-ab no longer needs to use BSD_INSTALL_DATA_DIR because we create the directories through INSTALLATION_DIRS. - patch-ad and patch-az were removed (changes integrated upstream). - patch-bb fixes a small documentation error. - Fixed some warnings by pkglint about the SUBST framework in Makefile and options.mk. Relevant changes since version 3.1.1: ===================================== - bug 4802: implement DKIM plugin, including whitelist_from_dkim support - bug 3838: work around Perl bug causing captured RE variables to become tainted -- thanks to Mark Martinec for pointing out the bug with Perl itself - bug 4850: re-enable the Razor2 plugin by default due to a service policy change - bug 4826: Razor2 plugin needs to load Mail::SpamAssassin::Timeout module - bug 4827: M::SA::first_existing_path() would return the last array entry passed in if none of the paths were found. Now return undef instead and handle the error when it happens. - bug 4813: generally open RE causes sendmail received header get read in as qmail in error - bug 4839: Logger.pm converts control chars including tab into underscores which confuses a bunch of users when checking debug output. Convert tab into space instead, etc. - bug 4884: if a null message is passed in, there are several variables which end up undefined causing warnings. fake an empty message if no input is given. - bug 4793: when replacing tags in a message (_TAG_), leave the tags that don't exist alone instead of just removing them - bug 4861, 4760: handle dccifd and dccproc failover properly, backport relays_internal and relays_external code, backport bug 4760 fix so that it's not possible to be in internal_networks without being in trusted_networks as well - bug 4901: deal more properly with failures in bgsend(). also, use the proper variable to show when errors occur. - bug 4867: fetchmail changed header formats at some point making Received parsing fail in certain conditions - bug 4699: use M::SA::Timeout for spamd copy_config call and allow for empty $@@ values - bug 3754: if there's a problem opening a file via sa-learn or spamassassin, return an error exit value. @ text @$NetBSD: patch-ad,v 1.9 2006/03/24 19:46:10 heinz Exp $ --- spamd/netbsd-rc-script.sh.orig 2006-03-10 20:30:23.000000000 +0100 +++ spamd/netbsd-rc-script.sh @@@@ -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 @@@@ -36,3 +40,4 @@@@ sig_reload="HUP" -# default values, may be overridden on NetBSD by setting them in /etc/rc.conf +# default values, may be overridden on NetBSD/DragonFlyBSD by setting them +# in /etc/rc.conf spamd_flags=${spamd_flags-"-H -c"} @@@@ -41,6 +46,7 @@@@ spamd_fdlimit=${spamd_fdlimit-"128"} -OPSYS=@@OPSYS@@ # set during package build -INTERPRETER_SUPPORT=@@INTERPRETER_SUPPORT@@ # set during package build +# both set during package build +OPSYS=@@OPSYS@@ +INTERPRETER_SUPPORT=@@INTERPRETER_SUPPORT@@ -# A default limit of 64 (at least on NetBSD) may be too low for many +# A default limit of 64 on NetBSD may be too low for many # people (eg with addional RBL rules) @@@@ -98,3 +104,3 @@@@ spamd_reload() -if [ "${OPSYS}" = "NetBSD" ]; then +if [ "${OPSYS}" = "NetBSD" -o "${OPSYS}" = "DragonFly" ]; then if checkyesno INTERPRETER_SUPPORT; then @@@@ -112,3 +118,3 @@@@ if [ "${OPSYS}" = "NetBSD" ]; then -else # not NetBSD +else # not NetBSD or DragonFlyBSD @ 1.9 log @Fixed one forgotten case of variable with underscore. This fixes PR pkg/33139 by Ben Colver. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.8 2006/03/13 21:11:57 heinz Exp $ @ 1.9.2.1 log @Pullup ticket 1693 - requested by heinz security update for spamassassin Revisions pulled up: - pkgsrc/mail/spamassassin/Makefile 1.71, 1.72 - pkgsrc/mail/spamassassin/PLIST 1.19 - pkgsrc/mail/spamassassin/distinfo 1.37, 1.38 - pkgsrc/mail/spamassassin/options.mk 1.6 - pkgsrc/mail/spamassassin/patches/patch-ab 1.12 - pkgsrc/mail/spamassassin/patches/patch-ad removed - pkgsrc/mail/spamassassin/patches/patch-az removed Module Name: pkgsrc Committed By: heinz Date: Fri May 26 20:53:00 UTC 2006 Modified Files: pkgsrc/mail/spamassassin: Makefile PLIST distinfo options.mk pkgsrc/mail/spamassassin/patches: patch-ab Added Files: pkgsrc/mail/spamassassin/patches: patch-bb Removed Files: pkgsrc/mail/spamassassin/patches: patch-ad patch-az Log Message: Updated to version 3.1.2. Pkgsrc changes: - The updates for rule files go into $VARBASE/spamassassin/. - This above directory and the directory sa-update-keys for the GPG keys are now handled automatically by OWN_DIRS. - The growing number of *.pre files are managed in a loop in the Makefile. They are no longer contained in the static PLIST. - Removed some unnecessary trailing slashes. - Patching init.pre in order to disable the SPF plugin broke the spf.t test. This is now fixed, although in a rather ugly way :-/. - patch-ab no longer needs to use BSD_INSTALL_DATA_DIR because we create the directories through INSTALLATION_DIRS. - patch-ad and patch-az were removed (changes integrated upstream). - patch-bb fixes a small documentation error. - Fixed some warnings by pkglint about the SUBST framework in Makefile and options.mk. Relevant changes since version 3.1.1: ===================================== - bug 4802: implement DKIM plugin, including whitelist_from_dkim support - bug 3838: work around Perl bug causing captured RE variables to become tainted -- thanks to Mark Martinec for pointing out the bug with Perl itself - bug 4850: re-enable the Razor2 plugin by default due to a service policy change - bug 4826: Razor2 plugin needs to load Mail::SpamAssassin::Timeout module - bug 4827: M::SA::first_existing_path() would return the last array entry passed in if none of the paths were found. Now return undef instead and handle the error when it happens. - bug 4813: generally open RE causes sendmail received header get read in as qmail in error - bug 4839: Logger.pm converts control chars including tab into underscores which confuses a bunch of users when checking debug output. Convert tab into space instead, etc. - bug 4884: if a null message is passed in, there are several variables which end up undefined causing warnings. fake an empty message if no input is given. - bug 4793: when replacing tags in a message (_TAG_), leave the tags that don't exist alone instead of just removing them - bug 4861, 4760: handle dccifd and dccproc failover properly, backport relays_internal and relays_external code, backport bug 4760 fix so that it's not possible to be in internal_networks without being in trusted_networks as well - bug 4901: deal more properly with failures in bgsend(). also, use the proper variable to show when errors occur. - bug 4867: fetchmail changed header formats at some point making Received parsing fail in certain conditions - bug 4699: use M::SA::Timeout for spamd copy_config call and allow for empty $@@ values - bug 3754: if there's a problem opening a file via sa-learn or spamassassin, return an error exit value. --- Module Name: pkgsrc Committed By: heinz Date: Mon Jun 5 23:01:01 UTC 2006 Modified Files: pkgsrc/mail/spamassassin: Makefile distinfo Removed Files: pkgsrc/mail/spamassassin/patches: patch-bb Log Message: Updated to version 3.1.3. Pkgsrc changes: - patch-bb for no longer necessary (integrated upstream). Changes since version 3.1.2: ============================ - bug 4926: given a certain set of parameters to spamd and a specially formatted input message, users could cause spamd to execute arbitrary commands as the spamd user - bug 4932: the userstate dir and userprefs file would not be created under certain conditions. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.9 2006/03/24 19:46:10 heinz Exp $ @ 1.8 log @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 @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7 2005/11/13 22:48:32 heinz Exp $ d34 1 a34 1 @@@@ -98,4 +104,4 @@@@ spamd_reload() a36 1 - if checkyesno INTERPRETER_SUPPORT; then d38 1 a38 2 + if checkyesno _INTERPRETER_SUPPORT; then : # support for 'command_interpreter' was added in NetBSD 1.6 @ 1.7 log @Updated to version 3.1.0. Pkgsrc changes: - p5-Storable is no longer a necessary. - Let DragonFlyBSD also use the rc.d script (patch-ad). - Sa-update needs p5-libwww (for LWP::UserAgent, HTTP::Date), p5-Archive-Tar and p5-IO-Zlib. - Many of the plugins are available as pkgsrc packages (p5-Mail-SPF-Query, p5-IP-Country, p5-Net-Ident, ...) but are not required. - Renamed some options to follow the naming conventions described in the pkgsrc guide. - Removed patch-ax again; it is already incorporated in 3.1.0. - Reworked DESCR to use less than 25 lines. - Removed SPAMASSASSIN_VERSION for clarity of DISTNAME and PKGNAME. - Prepended variables internal to the package with an underscore. - Rearranged MAKE_PARAMS alphabetically. - Simplified some internal variables (concatenation instead of substitution: _EGDIR, _DOCDIR,...) - Loop variables use all lower-case now. - Added a rule to lower score for mail from pkgsrc-bugs in netbsd_lists.cf. - The test t/spf.t (fails for SPF_HELO_*) has a know problem (SA Bug 4685). Relevant changes since version 3.0.4: ===================================== - Apache preforking algorithm adopted; number of spamd child processes is now scaled, according to demand. This provides better VM behaviour when not under peak load. - Inclusion of sa-update script which will allow for updates of rules and scores in between code releases. - added PostgreSQL, MySQL 4.1+, and local SDBM file Bayes storage modules. SQL storage is now recommended for Bayes, instead of DB_File. NDBM_File support has been dropped due to a major bug in that module. - detect legitimate SMTP AUTH submission, to avoid false positives on Dynablock-style rules. - new Advance Fee Fraud (419 scam) rules. - removed use of the Storable module, due to several reported hangs on SMP Linux machines. - Converted several rule/engine components into Plugins such as: AccessDB, AWL, Pyzor, Razor2, DCC, Bayes AutoLearn Determination, etc. - new plugins: DomainKeys (off by default), MIMEHeader: a new plugin to perform tests against header in internal MIME structure, ReplaceTags: plugin by Felix Bauer to support fuzzy text matching, WhiteListSubject: plugin added to support user whitelists by Subject header. - TextCat language guesser moved to a plugin. (This means "ok_languages" is no longer part of the core engine by default.) - Razor: disable Razor2 support by default per our policy, since the service is not free for non-personal use. It's trivial to reenable. - DCC: disable DCC for similar reasons, due to new license terms. - Net::DNS bug: high load caused answer packets to be mixed up and delivered as answers to the wrong request, causing false positives. worked around. - DNSBL lookups and other DNS operations are now more efficient, by using a custom single-socket event-based model instead of Net::DNS. - add support for accreditation services, including Habeas v2. - better URI parsing -- many evasion tricks now caught. - URIBL lookups are prioritized based on the location in the message the URI was found. - mass-check now supports reusing realtime DNSBL hit results, and sample-based Bayes autolearning emulation, to reduce complexity. - sa-learn, spamassassin and mass-check now have optional progress bars. - modify header ordering for DomainKeys compatibility, by placing markup headers at the top of the message instead at the bottom of the list. - spamd/spamc now support remote Bayes training, and reporting spam. - spamc now supports reading its flags from a configuration file using the -F switch, contributed by John Madden. - added SPF-based whitelisting. - Polish rules contributed by Radoslaw Stachowiak. - many rule changes and additions. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- spamd/netbsd-rc-script.sh.orig Sat Oct 23 01:39:18 2004 d5 8 a12 3 @@@@ -9,7 +9,7 @@@@ # @@PREFIX@@/share/doc/spamassassin/spamd/README.spamd # especially the section about security. d17 1 a17 5 # REQUIRE: LOGIN # BEFORE: mail @@@@ -34,15 +34,17 @@@@ command_args="-d -r ${pidfile}" extra_commands="reload" sig_reload="HUP" d23 1 a23 2 spamd=${spamd:-NO} spamd_fdlimit=${spamd_fdlimit-"128"} d29 1 a29 1 +_INTERPRETER_SUPPORT=@@_INTERPRETER_SUPPORT@@ d34 1 a34 5 SOFT_FDLIMIT=`ulimit -S -n` HARD_FDLIMIT=`ulimit -H -n` @@@@ -96,8 +98,8 @@@@ spamd_reload() kill -${sig_reload} ${the_spamd_pid} } d41 1 a41 5 else start_cmd="spamd_start" @@@@ -110,7 +112,7 @@@@ if [ "${OPSYS}" = "NetBSD" ]; then load_rc_config $name run_rc_command "$1" a45 2 if [ -f ${pidfile} ]; then the_spamd_pid=`head -1 ${pidfile}` @ 1.6 log @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 @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2003/05/22 11:41:03 abs Exp $ d3 35 a37 233 --- configure.orig 2003-03-28 21:25:56.000000000 +0000 +++ configure @@@@ -1,19 +1,11 @@@@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.54. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@@@ -22,11 +14,13 @@@@ fi if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@@"}'='"$@@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@@@ -34,34 +28,39 @@@@ else as_unset=false fi -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi # Name of the executable. -as_me=`(basename "$0") 2>/dev/null || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@@@ -72,6 +71,7 @@@@ echo X/"$0" | /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@@@ -85,7 +85,7 @@@@ if test "${PATH_SEPARATOR+set}" != set; echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: @@@@ -138,6 +138,8 @@@@ do as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@@"} @@@@ -210,6 +212,12 @@@@ else fi rm -f conf$$ conf$$.exe conf$$.file +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + as_mkdir_p=false +fi + as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@@@ -226,7 +234,7 @@@@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } +$as_unset CDPATH # Name of the host. @@@@ -240,6 +248,7 @@@@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= MFLAGS= @@@@ -296,6 +305,8 @@@@ ac_includes_default="\ # include #endif" +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SSLLIBS CCDLFLAGS LDDLFLAGS HAVE_SHUT_RD LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@@@ -719,6 +730,9 @@@@ if test ! -r $srcdir/$ac_unique_file; th { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@@@ -819,6 +833,11 @@@@ if test -n "$ac_init_help"; then cat <<\_ACEOF +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-ssl build spamc with ssl support (default is NO) + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@@@ -867,7 +886,7 @@@@ esac # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@@@ -907,7 +926,7 @@@@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was +generated by GNU Autoconf 2.54. Invocation command line was $ $0 $@@ @@@@ -973,12 +992,9 @@@@ do *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - esac + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. + ac_sep=" " done # When interrupted or exit'd, cleanup temporary files, and complete @@@@ -990,6 +1006,7 @@@@ trap 'exit_status=$? # Save into config.log some information that might help in debugging. { echo + cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## @@@@ -1012,6 +1029,35 @@@@ _ASBOX esac; a38 1123 echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + if test -s confdefs.h; then cat <<\_ASBOX ## ----------- ## @@@@ -1019,7 +1065,7 @@@@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h + sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && @@@@ -1177,7 +1223,15 @@@@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers config.h" +# Check whether --enable-ssl or --disable-ssl was given. +if test "${enable_ssl+set}" = set; then + enableval="$enable_ssl" + with_ssl=${enableval:-no} +else + with_ssl=${enableval:-no} +fi; + + ac_config_headers="$ac_config_headers config.h" if test -f Makefile.PL -a ! -f Makefile ; then @@@@ -1388,9 +1442,7 @@@@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$as_dir/$ac_word" ${1+"$@@"} - shift - ac_cv_prog_CC="$@@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@@" fi fi fi @@@@ -1523,12 +1575,6 @@@@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -1557,11 +1603,10 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= -for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; @@@@ -1575,8 +1620,10 @@@@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +check \`config.log' for details." >&5 +echo "$as_me: error: C compiler cannot create executables +check \`config.log' for details." >&2;} { (exit 77); exit 77; }; } fi @@@@ -1633,9 +1680,10 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@@@ -1664,12 +1712,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -1686,7 +1728,7 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@@@ -1714,12 +1756,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -1768,12 +1804,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -1819,6 +1849,97 @@@@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@@@ -1854,12 +1975,6 @@@@ do #include "confdefs.h" #include $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -1891,12 +2006,6 @@@@ rm -f conftest.$ac_objext conftest.$ac_e #line $LINENO "configure" #include "confdefs.h" $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -1981,7 +2090,7 @@@@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@@@ -2014,7 +2123,7 @@@@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@@@ -2072,7 +2181,7 @@@@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@@@ -2105,7 +2214,7 @@@@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@@@ -2148,6 +2257,21 @@@@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then @@@@ -2165,7 +2289,7 @@@@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@@@ -2196,7 +2320,7 @@@@ if test $ac_cv_header_stdc = yes; then _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@@@ -2214,7 +2338,7 @@@@ if test $ac_cv_header_stdc = yes; then _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@@@ -2273,7 +2397,7 @@@@ cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@@@ -2404,7 +2528,7 @@@@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@@@ -2522,7 +2646,7 @@@@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@@@ -2639,7 +2763,7 @@@@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@@@ -2699,103 +2823,6 @@@@ fi done -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then @@@@ -2805,12 +2832,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -2904,12 +2925,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -2962,12 +2977,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3023,7 +3032,7 @@@@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then + $EGREP "uid_t" >/dev/null 2>&1; then ac_cv_type_uid_t=yes else ac_cv_type_uid_t=no @@@@ -3055,12 +3064,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3117,12 +3120,6 @@@@ else #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3181,12 +3178,6 @@@@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char socket (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3227,8 +3218,8 @@@@ _ACEOF fi - -echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5 +if test $with_ssl = yes ; then + echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5 echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6 if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@@@ -3246,12 +3237,6 @@@@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char CRYPTO_lock (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3284,16 +3269,10 @@@@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5 echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6 if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCRYPTO 1 -_ACEOF - - LIBS="-lcrypto $LIBS" - + SSLLIBS="-lcrypto $SSLLIBS" fi - -echo "$as_me:$LINENO: checking for SSL_CTX_free in -lssl" >&5 + echo "$as_me:$LINENO: checking for SSL_CTX_free in -lssl" >&5 echo $ECHO_N "checking for SSL_CTX_free in -lssl... $ECHO_C" >&6 if test "${ac_cv_lib_ssl_SSL_CTX_free+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@@@ -3311,12 +3290,6 @@@@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char SSL_CTX_free (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3349,14 +3322,12 @@@@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_free" >&5 echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_free" >&6 if test $ac_cv_lib_ssl_SSL_CTX_free = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSSL 1 -_ACEOF - - LIBS="-lssl $LIBS" - + SSLLIBS="-lssl $SSLLIBS" fi +else + SSLLIBS="" +fi echo "$as_me:$LINENO: checking for connect in -linet" >&5 echo $ECHO_N "checking for connect in -linet... $ECHO_C" >&6 @@@@ -3376,12 +3347,6 @@@@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char connect (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3441,12 +3406,6 @@@@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char t_accept (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3506,12 +3465,6 @@@@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3582,12 +3535,6 @@@@ extern "C" char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3646,12 +3593,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3701,12 +3642,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3757,12 +3692,6 @@@@ else #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3804,12 +3733,6 @@@@ else #line $LINENO "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3867,12 +3790,6 @@@@ else #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3925,12 +3842,6 @@@@ else #include #endif #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@@@ -3978,7 +3889,8 @@@@ LDDLFLAGS=`perl -e 'use Config; print $C -ac_config_files="$ac_config_files binaries.mk" + + ac_config_files="$ac_config_files binaries.mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@@@ -3990,7 +3902,7 @@@@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@@@ -4056,6 +3968,21 @@@@ fi DEFS=-DHAVE_CONFIG_H +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@@@ -4074,7 +4001,6 @@@@ SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@@@ -4083,11 +4009,13 @@@@ cat >>$CONFIG_STATUS <<\_ACEOF if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@@"}'='"$@@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@@@ -4095,34 +4023,39 @@@@ else as_unset=false fi -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi # Name of the executable. -as_me=`(basename "$0") 2>/dev/null || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@@@ -4133,6 +4066,7 @@@@ echo X/"$0" | /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@@@ -4146,7 +4080,7 @@@@ if test "${PATH_SEPARATOR+set}" != set; echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: @@@@ -4200,6 +4134,8 @@@@ do as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@@"} @@@@ -4273,6 +4209,12 @@@@ else fi rm -f conf$$ conf$$.exe conf$$.file +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + as_mkdir_p=false +fi + as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@@@ -4289,7 +4231,7 @@@@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } +$as_unset CDPATH exec 6>&1 @@@@ -4306,7 +4248,7 @@@@ _ASBOX cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was +generated by GNU Autoconf 2.54. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@@@ -4365,7 +4307,7 @@@@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.53, +configured by $0, generated by GNU Autoconf 2.54, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@@@ -4385,17 +4327,20 @@@@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. _ACEOF cat >>$CONFIG_STATUS <<_ACEOF @@@@ -4418,12 +4363,12 @@@@ Try \`$0 --help' for more information." --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; # This is an error. @@@@ -4541,9 +4486,13 @@@@ s,@@ac_ct_CC@@,$ac_ct_CC,;t t s,@@EXEEXT@@,$EXEEXT,;t t s,@@OBJEXT@@,$OBJEXT,;t t s,@@CPP@@,$CPP,;t t +s,@@EGREP@@,$EGREP,;t t +s,@@SSLLIBS@@,$SSLLIBS,;t t s,@@CCDLFLAGS@@,$CCDLFLAGS,;t t s,@@LDDLFLAGS@@,$LDDLFLAGS,;t t s,@@HAVE_SHUT_RD@@,$HAVE_SHUT_RD,;t t +s,@@LIBOBJS@@,$LIBOBJS,;t t +s,@@LTLIBOBJS@@,$LTLIBOBJS,;t t CEOF _ACEOF @@@@ -4614,25 +4563,30 @@@@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } ac_builddir=. @@@@ -4662,7 +4616,7 @@@@ esac # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` d40 10 a49 16 @@@@ -4847,7 +4801,7 @@@@ _ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@@@ -4871,7 +4825,7 @@@@ do mv conftest.tail conftest.defines done rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS +echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS d51 2 a52 48 # Break up conftest.undefs because some shells have a limit on the size @@@@ -4927,25 +4881,30 @@@@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } d54 2 a55 2 rm -f $ac_file mv $tmp/config.h $ac_file @ 1.5 log @Update spamassassin to 2.55 Many small changes since 2.53, but difficult to pick out anything significant. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @ Update to version 2.53. This also closes PR pkg/21114 (thanks to Todd Vierling for dynamic PLIST) Most serious bugs since release of SA 2.50 fixed (hence the 'long' delay for the Pkgsrc package). Dependence on procmail removed. You still need a mail delivery agent but procmail is only a recommendation, not a prerequisite. Runs on Solaris (somewhat tested on Solaris 8, feedback welcome). Includes some SSL support for spamc/spamd. Not yet recommended due to lurking bug(s) (SA bugzilla ID 1751). Uses Perl module DB_File now instead of NDBM_File. This changes the name and format of the auto-whitelist database ('auto-whitelist' instead of 'auto-whitelist.db' on NetBSD). ! This release adds/changes/removes configuration options, PLEASE use ! ! 'perldoc Mail::SpamAssassin::Conf' and make sure your mail ! ! configuration still works as expected. ! ========================================================================== Changes since 2.52: - corruption of Bayes db where nspam/nham was getting zeroed, fixed. - Bayes now has much lower lock timeouts for opportunistic expiry and auto-learning, to avoid overloading busy servers with an expiry run. (This may result in occasional "lock failed" messages in the syslog while you're doing manual sa-learn ops, but those are not serious; it just means that an auto-learn could not take place because the dbs were opened by you in another process.) - NDBM_File does not provide an EXISTS method, worked around. - BSMTP support (spamc -B) fixed. - Bayes allowed the user to 'forget' messages they hadn't learned. - sa-learn broken when installed in a non-standard location. - spamc was failing to dump message if out of memory. - add-all-addrs-to-blacklist was a no-op, fixed. - syslog-socket support was broken, fixed. - sslspamc compilation fixed. - SIGCHLD handling in spamd was causing an ugly warning on Red Hat 8. - user_prefs were left world-writable after auto-whitelist use. - Razor was zeroing %ENV; protected against this. - some test failures on 5.005 and with Razor fixed; some tests were also still using the user's Bayes dbs. - Windows portability fix in new Bayes journal code. - dialup_codes now a privileged setting. - clean PATH env variable immediately upon spamd start; fixed problem with taint mode failures when getting hostname in Perl 5.005. - NetBSD: fixed SSL support, spamd start script. - single-Received-header mails were not getting DNSBL checks. - some doco fixes. Changes since 2.51: - bug 1664: expiry imposed way too much load when a single site-wide Bayes db was used, fixed - bug 1672: a typo in a backported patch for 2.51 caused Bayes to sometimes not unlock the db, fixed - INSTALL now strongly recommends using DB_File - some NetBSD support fixes - bug 1601: option --syslog-socket wasn't implemented - bug 1260: corrected description of --nocreate-prefs option Changes since 2.50: - Bayes locking and concurrency issues fixed - Bayes expiration was not working; fixed - spamd was not enabling Bayes after auto-learning without restart; fixed - safer way to attach spams, for broken mail clients, using 'report_safe 2' - a few doco cleanups Main changes since 2.4x: - Bayesian filtering, using a Bayesian-style form of probability-analysis classification. This uses an algorithm based on the one detailed in Paul Graham's 'A Plan For Spam' paper, along with aspects taken from Graham Robinson's work, and the chi-combining technique developed by the SpamBayes project. - Auto-learning. This trains the Bayesian filter automatically, based on the results from traditional SpamAssassin diagnosis. It uses a set of heuristics and separate thresholds to ensure (as much as is possible) that it trains on guaranteed non-spam and spam. Old, unused tokens are automatically expired. - much-improved rule set. A whole new set of rules based on Message-Id analysis is now in place, which accurately detects forged headers from a wide range of spamware. Many inaccurate rules have been dropped. HTML tests much improved, with a set to detect image-only spam. - new default format for detected-spam messages; the message is encapsulated as a MIME part, with a preview and the spam report in the main part of the message. - Score sets. Based on whether you are using just SpamAssassin rules, adding network tests, and using a trained Bayesian database, SpamAssassin will use a set of scores appropriately to gain the maximum degree of accuracy. - Italian, Polish, Spanish, French and German rule sets and translations. - Much improved reliability with spamd. The problems with signals have been cleared up thanks to a pipe-based child tracking system, and all spamd-hanging bugs reported have proved unreproducable. - Unicode problems with Red Hat 8 and perl 5.8 fixed. Works on Perl 5.005, 5.6.x, and 5.8.x. - Taint-safe. SpamAssassin runs with perl's taint-checking enabled for better security. - Razor 1 support is now officially deprecated. - "spamc -c" was not working, fixed. This fix required increasing the revision of the spamd protocol; only difference is that now more than one protocol header can appear in the reply from spamd. - all fixes from 2.44 included. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2002/11/06 21:51:26 heinz Exp $ d3 7 a9 5 --- spamd/netbsd-rc-script.sh.orig Thu Sep 26 12:50:26 2002 +++ spamd/netbsd-rc-script.sh @@@@ -1,2 +1,2 @@@@ -#! /bin/sh +#!@@RCD_SCRIPTS_SHELL@@ d11 25 a35 10 @@@@ -13,2 +13,3 @@@@ # BEFORE: mail +# KEYWORD: shutdown @@@@ -34,6 +35,6 @@@@ # default values, may be overridden by setting them in /etc/rc.conf -spamd_flags="-H -c -a" -spamd=NO +spamd_flags=${spamd_flags-"-H -c -a"} +spamd=${spamd:-NO} d37 7 a43 2 -INTERPRETER_SUPPORT=@@INTERPRETER_SUPPORT@@ +INTERPRETER_SUPPORT=@@INTERPRETER_SUPPORT@@ # set during package build d45 1384 @ 1.3 log @Changed the rc.d script to account for different behaviour of load_rc_config in NetBSD 1.6. This resolves PR pkg/18928 by Frank Cusack (fcusack at fcusack com). The rc.d script is now called on 'shutdown'. Included fixes from SA CVS repository (2002-10-21) to minimize impact of Razor2 on the environment vector, especially PATH. Bumped PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to 2.43 Item 1) was already provided by 'inofficial' patch-af for 2.42 (now removed). Two new patches (-ag and -ah) from the SpamAssassin-current repository work around a roblem with razor2 timeouts. Logo 'ninjabutton.png' is now in the correct html directory. Official changes: 1) AWL change reverted; instead of decreasing the AWL bias gradually to allow frequently-seen addresses to get into the "nonspam" area, it now behaves like 2.31 did, in that the AWL simply represents the long-term average score from that correspondent. 2) core-dump bug in spamd worked around, _except for the "-m" switch_. The "-m" switch relies on signal handling in the Perl interpreter, which seems to have some bugs we cannot work around reliably on some platforms, so its use is no longer recommended. 3) some portability fixes for SunOS. @ text @d9 14 @ 1.1 log @Update to 2.42. Uses buildlink2 and module.mk. Some perl scripts for rule developers (in PREFIX/share/doc/spamassassin/{masses,tools}/) and a small SpamAssassin logo (PREFIX/share/doc/spamassassin/html/) are now included. New netbsd_lists.cf file to reduce false positives on NetBSD lists (so far, only some rules for netbsd-bugs). Changes: - bug fixes - new, better scores (intensive testing was done to improve on 2.40 and 2.41) - netbsd rc.d script works now with NetBSD 1.5 and 1.6 - management of addresses in the automatic whitlist now easier with dedicated options (--add-addr-to-whitelist, --remove-addr-from-whitelist) @ text @@