From e45f22d06e60c45c772997b93937ba62417a95ec Mon Sep 17 00:00:00 2001 From: heinz Date: Mon, 3 Nov 2003 00:56:25 +0000 Subject: 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 --- 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 | 104 +- 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, 448 insertions(+), 1876 deletions(-) create mode 100644 mail/spamassassin/DEINSTALL create mode 100644 mail/spamassassin/files/2.60_change_summary delete mode 100644 mail/spamassassin/patches/patch-aa delete mode 100644 mail/spamassassin/patches/patch-ac delete mode 100644 mail/spamassassin/patches/patch-ad delete mode 100644 mail/spamassassin/patches/patch-af delete mode 100644 mail/spamassassin/patches/patch-ag delete mode 100644 mail/spamassassin/patches/patch-ah delete mode 100644 mail/spamassassin/patches/patch-ai delete mode 100644 mail/spamassassin/patches/patch-aj delete mode 100644 mail/spamassassin/patches/patch-am delete mode 100644 mail/spamassassin/patches/patch-an delete mode 100644 mail/spamassassin/patches/patch-ao delete mode 100644 mail/spamassassin/patches/patch-ap create mode 100644 mail/spamassassin/patches/patch-aq (limited to 'mail/spamassassin') diff --git a/mail/spamassassin/DEINSTALL b/mail/spamassassin/DEINSTALL new file mode 100644 index 00000000000..bb9cd24c212 --- /dev/null +++ b/mail/spamassassin/DEINSTALL @@ -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 --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE index fd2b3b719d9..985ffc3850a 100644 --- a/mail/spamassassin/MESSAGE +++ b/mail/spamassassin/MESSAGE @@ -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. + More information can be found in the man pages for 'spamassassin', + 'sa-learn', 'spamc' and 'spamd', with 'perldoc Mail::SpamAssassin::Conf' + and in - 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 - - ${PREFIX}/share/doc/spamassassin/ + ${PREFIX}/share/doc/spamassassin/ =========================================================================== diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 7871063fbf6..10ad974e1f6 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -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 HOMEPAGE= http://www.spamassassin.org/ @@ -16,61 +17,107 @@ CONFLICTS= p5-Mail-SpamAssassin-[1-9]* .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 @@ INTERPRETER_SUPPORT= YES .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 @@ post-extract: @${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: - @-${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 + ${FIND} ${WRKSRC} -name "*.orig" -print -o \ + -name "*.subst.sav" -print | ${XARGS} ${RM} -f + +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 @@ pre-install: 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}; \ done - @${ECHO} "@dirrm share/spamassassin" >> ${PLIST_ADD} + @${ECHO} "@dirrm ${RULE_SUBDIR}" >> ${PLIST_ADD} @# examples are in the static PLIST @${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${EGDIR}/ @${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${EGDIR}/ @${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${EGDIR}/ - -post-install: @${CHOWN} ${SHAREOWN} ${RULESDIR}/* @${CHGRP} ${SHAREGRP} ${RULESDIR}/* @${CHMOD} a=r ${RULESDIR}/* -.if !empty(SPAMASSASSIN_USE_SSL:M[yY][eE][sS]) - @${INSTALL_PROGRAM} ${WRKSRC}/spamd/sslspamc ${PREFIX}/bin/ - @${ECHO} "bin/sslspamc" >> ${PLIST_ADD} -.endif .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST index bafff96f9c6..8ca1f6d45b9 100644 --- a/mail/spamassassin/PLIST +++ b/mail/spamassassin/PLIST @@ -1,12 +1,13 @@ -@comment $NetBSD: PLIST,v 1.10 2003/04/15 00:02:24 heinz Exp $ +@comment $NetBSD: PLIST,v 1.11 2003/11/03 00:56:26 heinz Exp $ @comment Most of this PLIST is auto-generated; see Makefile. etc/rc.d/spamd share/doc/html/spamassassin/ninjabutton.png -@dirrm share/doc/html/spamassassin +@comment @dirrm share/doc/html/spamassassin +share/doc/spamassassin/2.60_change_summary share/examples/spamassassin/local.cf share/examples/spamassassin/netbsd_lists.cf share/examples/spamassassin/procmailrc.example share/spamassassin/languages share/spamassassin/triplets.txt share/spamassassin/user_prefs.template -@dirrm share/examples/spamassassin +@comment @dirrm share/examples/spamassassin diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index 2825769d47a..8696f863c3e 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,20 +1,9 @@ -$NetBSD: distinfo,v 1.16 2003/09/03 13:08:05 atatat Exp $ +$NetBSD: distinfo,v 1.17 2003/11/03 00:56:26 heinz Exp $ -SHA1 (Mail-SpamAssassin-2.55.tar.gz) = 35aa4f2264694b656154ed5732e4ffecde08c76a -Size (Mail-SpamAssassin-2.55.tar.gz) = 700610 bytes -SHA1 (patch-aa) = e952d36e1ff2963ff1d3240a1bc64df9cc7701d0 -SHA1 (patch-ab) = cec0052f7e3628fea466fe3b3d3bd5035d858598 -SHA1 (patch-ac) = 140bee9b6699e9685436b7e621f965937917587b -SHA1 (patch-ad) = 055d499f89bd5ec7f5c86ce5884c8192df6085f8 -SHA1 (patch-ae) = d0f709a8c664481023be93a874afa4033ed4736c -SHA1 (patch-af) = 1c7a1c1490515c8d9c34c8dfddc3b11d87f4c700 -SHA1 (patch-ag) = 89d0459d2234ed9333ef2e1a31a619a184250f29 -SHA1 (patch-ah) = 810e0eb865774d63181a29ccc031d4c15924b750 -SHA1 (patch-ai) = 736bff61ab2b9a87d36bc69acbc86f33fa4edf0d -SHA1 (patch-aj) = 56f47fc996636114e319e62672cbdd5fa3d6a04d -SHA1 (patch-ak) = b27761cc977c17eb64da216c7927d75fe3f86459 -SHA1 (patch-al) = a5d0512e60e31778d7c93cc6167102eb0ee6cc1d -SHA1 (patch-am) = 77414a49041b8b4763c7789be3a28ce7415ec008 -SHA1 (patch-an) = 2d3fea38aa8fa04aff24b1eed0c61ee16072cd0a -SHA1 (patch-ao) = 6bde456f5fddefc60d4f4e9b61b86d7e7eb3a96f -SHA1 (patch-ap) = 97837a522b94cd365b23ce731d49c4f0aaecbdf2 +SHA1 (Mail-SpamAssassin-2.60.tar.gz) = 5d42b39430da13443dd94e78a2dad6c2b1c7cb5a +Size (Mail-SpamAssassin-2.60.tar.gz) = 963215 bytes +SHA1 (patch-ab) = 9f9d17bd2416584a693ef4757b2211968581983e +SHA1 (patch-ae) = e87cdced71467baccdc1b6b837a350c6fa7e596f +SHA1 (patch-ak) = 1b4669ec7ba136234c7d4be73e7ddfedab523be8 +SHA1 (patch-al) = 75c22289726d3c7e39834cd164ca9f2220969e9e +SHA1 (patch-aq) = c8401a1e609707754b781a98358b2dd93638840e diff --git a/mail/spamassassin/files/2.60_change_summary b/mail/spamassassin/files/2.60_change_summary new file mode 100644 index 00000000000..d722d5c6786 --- /dev/null +++ b/mail/spamassassin/files/2.60_change_summary @@ -0,0 +1,151 @@ +SpamAssassin 2.60 is released! SpamAssassin 2.60 is the first major +update of SpamAssassin since February 2003 (when the 2.50 series was +released). + +SpamAssassin is a mail filter which uses advanced statistical +and heuristic tests to identify spam (also known as unsolicited +commercial/bulk email). + +Downloading +----------- + +Pick it up from: + + http://SpamAssassin.org/released/Mail-SpamAssassin-2.60.tar.gz + http://SpamAssassin.org/released/Mail-SpamAssassin-2.60.tar.bz2 + http://SpamAssassin.org/released/Mail-SpamAssassin-2.60.zip + +md5sum: + bd1607d8fa52ef3f5fdda5e05f971e9d Mail-SpamAssassin-2.60.tar.bz2 + 46d1db67ed1d860ddb136e0beb5f6ac3 Mail-SpamAssassin-2.60.tar.gz + f35b1b558c846a4e7fd7a50a7986cc26 Mail-SpamAssassin-2.60.zip + +sha1sum: + 2b2ee745c4964f27005f2a791f4f4880b13795fa Mail-SpamAssassin-2.60.tar.bz2 + 5d42b39430da13443dd94e78a2dad6c2b1c7cb5a Mail-SpamAssassin-2.60.tar.gz + 7e88af2cb92acb899d772752c1236d50991e80ee Mail-SpamAssassin-2.60.zip + + +The release files also have a .asc accompanying them. The file serves +as an external GPG signature for the given release file. The signing +key is available via the wwwkeys.pgp.net keyserver, as well as +http://www.spamassassin.org/released/GPG-SIGNING-KEY + +The key information is: + +pub 1024D/265FA05B 2003-06-09 SpamAssassin Signing Key + Key fingerprint = 26C9 00A4 6DD4 0CD5 AD24 F6D7 DEE0 1987 265F A05B + +The release will also be available via CPAN within a few days. + + +Important installation notes +---------------------------- + +- Bayes FYI: 2.60 has a new Bayes backend and database format. Your old + database(s) will automatically be upgraded the first time 2.60 tries to + write to the DB, and any journal, if it exists, will be wiped out without + being synced. + + In addition, we have had to drop support for Bayes databases in formats + other than DB_File, due to a large number of serious issues (including + crash and concurrency bugs) with those formats. + + So, what you want to do is something like this: + + - stop running spamassassin/spamd (ie: you don't want it to be running + during the upgrade) + - run "sa-learn --rebuild", this will sync your journal. + - upgrade SA to 2.60 + - install DB_File module if necessary + - if you were using another database module, run "sa-learn --import" + to migrate the data into new DB_File files + - run "sa-learn --rebuild", this will cause the db format to be upgraded + - start running spamassassin/spamd again + + Obviously the steps will be different depending on your environment, + but you get the idea. :) + +- Bayes FYI 2: Because of the new database format, "check_bayes_db" will + no longer function properly. The functionality from that script was + added to sa-learn via the "--dump" parameter. Please see the sa-learn + man/pod documentation for more info. + +- SpamAssassin 2.6x will be the last release supporting perl 5.005, + so it's suggested to upgrade to at least perl 5.6.1 + +- Razor2 isn't fully taint safe. So since SpamAssassin 2.60 enables + taint mode by default, there's a Razor2.patch file which needs to be + applied to Razor2. Documentation exists in the patch file. + + +Summary of major changes since 2.5x +----------------------------------- + +spamd improvements + + - spamd now supports UNIX-domain sockets for low-overhead scanning, thanks + to Steve Friedl for this. This is strongly recommended if you're running + spamc on the same host as the spamd server + +Bayes improvements + + - new tweaks to the Bayes engine: it now breaks down email addresses and URI + elements while learning to use as additional features when testing email + + - new bayes backend, including new database format, ability to learn messages + to the journal, etc. Improved expiration mechanism + +HTML parser improvements + + - HTML::Parser 3.24 or higher is now required + + - major improvements to the HTML engine, including better support for + detecting 'invisible text' and similar obfuscation techniques used in + spam + +DNS blacklist and network testing improvements + + - DNS blacklists (RBLs) overhauled; lots of new lists, including SORBS and + SpamCop; dropped Osirusoft due to their retirement (brought on by a DDOS) + + - RBL timeouts are now handled much more efficiently; if one RBL is taking + much longer than all the others, it will be cut short and ignored + + - the RBL engine improves the extraction and selection of IP addresses + queried by inferring trust relationships between Received headers; trust + can also be manually specified using the new "trusted_networks" option + + - a generalised Received-header parser to more easily detect HELO string + forgery and faked relay lines + + - support for domain-based blacklists and TXT record queries + + - dccifd support added + + - Razor 1 support dropped + +Report improvements + + - to reduce confusion, the default report now includes the hostname of the + machine where SpamAssassin is running and the installer also asks for an + administrative address or URL + + - more flexible header and report rewriting including a simple template + system + +Other changes + + - workaround for red hat kernel with NPTL reporting "application bug" in + spamd due to use of waitpid() when SIGCHLD is set to SIG_IGN + + - taint mode is now enabled by default (for perl versions 5.6.0 and + higher) for extra security + + - Makefile variables were changed to use DESTDIR instead of the various + INST_* variables. Please read the PACKAGING file for more information. + + - Lots of bugs fixed and new rules added. ;) + + - timelog code has been removed + diff --git a/mail/spamassassin/patches/patch-aa b/mail/spamassassin/patches/patch-aa deleted file mode 100644 index 42c7bf5e267..00000000000 --- a/mail/spamassassin/patches/patch-aa +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2003/05/22 11:41:03 abs Exp $ - ---- Makefile.PL.orig 2003-05-20 07:06:16.000000000 +0100 -+++ Makefile.PL -@@ -337,16 +337,17 @@ binaries.mk: configure - ./configure - - inst_cfs: $(PKG_LOCAL_RULES_DIR) $(PKG_LOCAL_RULES_DIR)/local.cf -- $(MKPATH) $(PKG_DEF_RULES_DIR) -+ $(BSD_INSTALL_DATA_DIR) $(PKG_DEF_RULES_DIR) - $(RM_RF) $(PKG_DEF_RULES_DIR)/* - $(PERL) build/preprocessor $(FIXVARS) -Irules -O$(PKG_DEF_RULES_DIR) $(RULES) -- $(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR) -+ @ \# $(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR) - - $(PKG_LOCAL_RULES_DIR): -- $(MKPATH) $@ -+ $(BSD_INSTALL_DATA_DIR) $@ - - $(PKG_LOCAL_RULES_DIR)/local.cf: rules/local.cf -- $(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');" -+ @ \# manage local.cf through pkgsrc .mk files -+ @ \# $(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');" - - text_html_doc: made-doc-stamp - $(NOOP) diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab index 14bd6649442..0a6493c57c0 100644 --- a/mail/spamassassin/patches/patch-ab +++ b/mail/spamassassin/patches/patch-ab @@ -1,26 +1,80 @@ -$NetBSD: patch-ab,v 1.4 2003/05/22 11:41:03 abs Exp $ +$NetBSD: patch-ab,v 1.5 2003/11/03 00:56:26 heinz Exp $ ---- binaries.mk.in.orig 2002-12-19 13:19:08.000000000 +0000 -+++ binaries.mk.in -@@ -4,6 +4,7 @@ CFLAGS = @CFLAGS@ - CCDLFLAGS = @CCDLFLAGS@ - - LIBS = @LIBS@ -+SSLLIBS = @SSLLIBS@ - LDFLAGS = @LDFLAGS@ - LDDLFLAGS = @LDDLFLAGS@ - -@@ -33,11 +34,11 @@ spamd/libspamc$(SHLIBEXT): $(LIBSPAMC_FI - - spamd/sslspamc$(EXE_EXT): $(SPAMC_FILES) $(LIBSPAMC_FILES) - $(CC) $(SSLCFLAGS) $(CFLAGS) $(SPAMC_FILES) $(LIBSPAMC_FILES) \ -- -o $@ $(LDFLAGS) $(LIBS) -+ -o $@ $(LDFLAGS) $(SSLLIBS) $(LIBS) - - spamd/libsslspamc$(SHLIBEXT): $(LIBSPAMC_FILES) - $(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(LIBSPAMC_FILES) \ -- -o $@ $(LDDLFLAGS) $(LIBS) -+ -o $@ $(LDDLFLAGS) $(SSLLIBS) $(LIBS) - - qmail/qmail-spamc: $(QMAIL_SPAMC_FILES) - $(CC) $(CFLAGS) $(QMAIL_SPAMC_FILES) \ +--- Makefile.PL.orig Tue Sep 16 03:05:24 2003 ++++ Makefile.PL +@@ -95,7 +95,7 @@ sub yesno { + + my %opt = ( + 'enable_ssl' => undef, +- 'contact_address' => undef, ++ 'contact_address' => '@SA_CONTACT_ADDRESS@', + 'run_razor_tests' => undef, + 'destdir' => undef, + '__cruft' => undef, +@@ -331,18 +331,20 @@ if (!defined $opt{'contact_address'}) { + } + $makefile{'macro'}{'CONTACT_ADDRESS'} = $opt{'contact_address'}; + +-if (!defined $opt{'run_razor_tests'}) { + my $got_razor2 = eval { require Razor2::Client::Agent }; + + if ($got_razor2) { +- $opt{'run_razor_tests'} = prompt( +- "Run Razor v2 tests (these may fail due to network problems)? (y/n)", +- 'n' +- ); +- print "\n"; ++ if (!defined $opt{'run_razor_tests'}) { ++ $opt{'run_razor_tests'} = prompt( ++ "Run Razor v2 tests (these may fail due to network problems)? (y/n)", ++ 'n' ++ ); ++ print "\n"; ++ } ++ $opt{'run_razor_tests'} = bool($opt{'run_razor_tests'}); ++ $makefile{'macro'}{'TEST_RUN_RAZOR'} = yesno($opt{'run_razor_tests'}); + } +-} +-$opt{'run_razor_tests'} = bool($opt{'run_razor_tests'}); ++ + if ($opt{'run_razor_tests'}) { + open(FLAG, "> t/do_razor2"); + close(FLAG); +@@ -350,7 +352,6 @@ if ($opt{'run_razor_tests'}) { + else { + unlink("t/do_razor2"); + } +-$makefile{'macro'}{'TEST_RUN_RAZOR'} = yesno($opt{'run_razor_tests'}); + + + # Now dump the Makefile +@@ -744,7 +745,7 @@ sub MY::libscan { + return q{} if $path =~ m{ + windows_install| + (^|/)CVS(/|$)| +- [/.](orig|old|rej|diff|patch|bak|backup|my)$ ++ [/.](orig|old|rej|diff|patch|bak|backup|my|subst.sav)$ + }ix; + + clean_MY_globals($self); +@@ -964,15 +965,16 @@ spamd/binaries.mk: spamd/configure + cd spamd; ./configure --prefix="$(I_PREFIX)" --sysconfdir="$(I_SYSCONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)" + + conf__install: +- -$(MKPATH) $(B_CONFDIR) +- $(PERL) -MFile::Spec -MFile::Copy \ ++ -$(BSD_INSTALL_DATA_DIR) $(B_CONFDIR) ++ @ # manage local.cf through pkgsrc .mk files ++ @ # $(PERL) -MFile::Spec -MFile::Copy \ + -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf};" + + data__install: +- -$(MKPATH) $(B_DATADIR) ++ -$(BSD_INSTALL_DATA_DIR) $(B_DATADIR) + $(PERL) -e "map unlink, <$(B_DATADIR)/*>" + $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(RULES) +- $(CHMOD) $(PERM_RWX) $(B_DATADIR) ++ @ # $(CHMOD) $(PERM_RWX) $(B_DATADIR) + + text_html_doc: made-doc-stamp + $(NOOP) diff --git a/mail/spamassassin/patches/patch-ac b/mail/spamassassin/patches/patch-ac deleted file mode 100644 index e5f0aa93879..00000000000 --- a/mail/spamassassin/patches/patch-ac +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2003/05/22 11:41:03 abs Exp $ - ---- configure.in.orig 2003-03-28 21:25:56.000000000 +0000 -+++ configure.in -@@ -1,4 +1,9 @@ - AC_INIT -+AC_ARG_ENABLE(ssl, -+ AC_HELP_STRING([--enable-ssl], -+ [build spamc with ssl support (default is NO)]), -+ [with_ssl=${enableval:-no}], -+ [with_ssl=${enableval:-no}]) - AC_CONFIG_SRCDIR([Makefile.PL]) - AC_CONFIG_HEADER(config.h) - -@@ -41,8 +46,12 @@ fi - dnl ---------------------------------------------------------------------- - - AC_CHECK_LIB(socket, socket) --AC_CHECK_LIB(crypto, CRYPTO_lock) --AC_CHECK_LIB(ssl, SSL_CTX_free,,,-lcrypto) -+if test $with_ssl = yes ; then -+ AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"]) -+ AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto) -+else -+ SSLLIBS="" -+fi - AC_CHECK_LIB(inet, connect) - AC_CHECK_LIB(nsl, t_accept) - AC_CHECK_LIB(dl, dlopen) -@@ -125,6 +134,7 @@ dnl ------------------------------------ - # we cheat, since we *know* we have Perl installed ;) - CCDLFLAGS=`perl -e 'use Config; print $Config::Config{ccdlflags}'` - LDDLFLAGS=`perl -e 'use Config; print $Config::Config{lddlflags}'` -+AC_SUBST(SSLLIBS) - AC_SUBST(CCDLFLAGS) - AC_SUBST(LDDLFLAGS) - AC_SUBST(HAVE_SHUT_RD) diff --git a/mail/spamassassin/patches/patch-ad b/mail/spamassassin/patches/patch-ad deleted file mode 100644 index 3481174fc7a..00000000000 --- a/mail/spamassassin/patches/patch-ad +++ /dev/null @@ -1,1428 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2003/05/22 11:41:03 abs Exp $ - ---- 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; - } - 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` - -@@ -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 - - # 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; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae index 38f75ef572c..ae8ad1be549 100644 --- a/mail/spamassassin/patches/patch-ae +++ b/mail/spamassassin/patches/patch-ae @@ -1,14 +1,27 @@ -$NetBSD: patch-ae,v 1.5 2003/05/22 11:41:03 abs Exp $ +$NetBSD: patch-ae,v 1.6 2003/11/03 00:56:26 heinz Exp $ ---- lib/Mail/SpamAssassin/DBBasedAddrList.pm.orig 2003-03-28 21:26:12.000000000 +0000 -+++ lib/Mail/SpamAssassin/DBBasedAddrList.pm -@@ -5,7 +5,8 @@ use bytes; - use Fcntl; +--- spamd/spamd.raw.orig Thu Sep 11 03:05:22 2003 ++++ spamd/spamd.raw +@@ -207,8 +207,8 @@ if ($opt{'auth-ident'}) { + } - # tell AnyDBM_File to prefer DB_File, if possible. --# BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); } -+# Pkgsrc: enable following line because BayesStore.pm already broke the rule -+BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); } - # off until 3.0; there's lots of existing AWLs out there this breaks. + # Check for server certs +-$opt{'server-key'} ||= "$LOCAL_RULES_DIR/certs/server-key.pem"; +-$opt{'server-cert'} ||= "$LOCAL_RULES_DIR/certs/server-cert.pem"; ++$opt{'server-key'} ||= "@SA_SSLCERTS@/server-key.pem"; ++$opt{'server-cert'} ||= "@SA_SSLCERTS@/server-cert.pem"; + if ($opt{'ssl'}) { + eval { require IO::Socket::SSL }; + die "fatal: SSL encryption requested, but IO::Socket::SSL is unavailable\n" if ($@); +@@ -1221,8 +1221,9 @@ sub restart_handler { + use POSIX 'setsid'; + sub daemonize + { +- # Pretty command line in ps +- $0 = join(' ', $ORIG_ARG0, @ORIG_ARGV) unless($opt{'debug'}); ++ # no pretty 'ps' command line (easier for NetBSD rc script) ++ # # Pretty command line in ps ++ # $0 = join(' ', $ORIG_ARG0, @ORIG_ARGV) unless($opt{'debug'}); - use AnyDBM_File; + # Be a nice daemon and chdir() to the root so we don't block any unmount attempts + chdir '/' or die "Can't chdir to /: $!\n"; diff --git a/mail/spamassassin/patches/patch-af b/mail/spamassassin/patches/patch-af deleted file mode 100644 index 33146a3a576..00000000000 --- a/mail/spamassassin/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-af,v 1.3 2003/05/22 11:41:03 abs Exp $ - ---- spamd/spamd.raw.orig 2003-05-20 07:06:18.000000000 +0100 -+++ spamd/spamd.raw -@@ -1009,7 +1009,8 @@ sub kill_handler - use POSIX 'setsid'; - sub daemonize - { -- $0 = join(' ', $0, @ARGV) unless($opt{'debug'});; # pretty command line in ps -+ # no pretty 'ps' command line (easier for NetBSD rc script) -+ # $0 = join(' ', $0, @ARGV) unless($opt{'debug'});; # pretty command line in ps - chdir '/' or die "Can't chdir to '/': $!"; - $SIG{__WARN__} = sub { logmsg($_[0]); }; - open STDIN,'/dev/null' or die "Can't read '/dev/null': $!"; diff --git a/mail/spamassassin/patches/patch-ag b/mail/spamassassin/patches/patch-ag deleted file mode 100644 index 009b95e6a5d..00000000000 --- a/mail/spamassassin/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2003/05/22 11:41:03 abs Exp $ - ---- tools/check_whitelist.orig 2002-12-19 19:05:01.000000000 +0000 -+++ tools/check_whitelist -@@ -5,7 +5,8 @@ use Fcntl; - - # must match line at top of lib/Mail/SpamAssassin/DBBasedAddrList.pm. - # now off until 3.0 --# BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); } -+# Pkgsrc: enable following line because BayesStore.pm already broke the rule -+BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); } - - use AnyDBM_File ; - use vars qw( %h $k $v ) ; diff --git a/mail/spamassassin/patches/patch-ah b/mail/spamassassin/patches/patch-ah deleted file mode 100644 index 59f81c0708b..00000000000 --- a/mail/spamassassin/patches/patch-ah +++ /dev/null @@ -1,66 +0,0 @@ -$NetBSD: patch-ah,v 1.5 2003/09/03 13:08:05 atatat Exp $ - ---- lib/Mail/SpamAssassin/Conf.pm.orig 2003-09-02 21:35:05.000000000 -0400 -+++ lib/Mail/SpamAssassin/Conf.pm -@@ -115,7 +115,6 @@ sub new { - "dialups.mail-abuse.org." => "127.0.0.3", - # For DUL + other codes, we ignore that it's on DUL - "rbl-plus.mail-abuse.org." => "127.0.0.2", -- "relays.osirusoft.com." => "127.0.0.3", - }; - - $self->{num_check_received} = 2; -@@ -1950,7 +1949,7 @@ Default: - { "dialups.mail-abuse.org." => "127.0.0.3", - # For DUL + other codes, we ignore that it's on DUL - "rbl-plus.mail-abuse.org." => "127.0.0.2", -- "relays.osirusoft.com." => "127.0.0.3" }; -+ }; - - WARNING!!! When passing a reference to a hash, you need to put the whole hash - in one line for the parser to read it correctly (you can check with -@@ -1966,8 +1965,8 @@ on the originating hop - The idea is to not penalize (or penalize less) people who properly relayed - through their ISP's mail server - --Here's an example showing the use of Osirusoft and MAPS DUL, as well as the use --of check_two_rbl_results to compensate for a match in both RBLs: -+Here's an example showing the use of MAPS DUL, as well as the use -+of check_two_rbl_results to compensate for a match in RBLs: - - header RCVD_IN_DUL rbleval:check_rbl('dialup', 'dialups.mail-abuse.org.') - describe RCVD_IN_DUL Received from dialup, see http://www.mail-abuse.org/dul/ -@@ -1977,33 +1976,6 @@ of check_two_rbl_results to compensate f - describe X_RCVD_IN_DUL_FH Received from first hop dialup, see http://www.mail-abuse.org/dul/ - score X_RCVD_IN_DUL_FH -3 - -- header RCVD_IN_OSIRUSOFT_COM rbleval:check_rbl('osirusoft', 'relays.osirusoft.com.') -- describe RCVD_IN_OSIRUSOFT_COM Received via an IP flagged in relays.osirusoft.com -- -- header X_OSIRU_SPAM_SRC rbleval:check_rbl_results_for('osirusoft', '127.0.0.4') -- describe X_OSIRU_SPAM_SRC DNSBL: sender is Confirmed Spam Source, penalizing further -- score X_OSIRU_SPAM_SRC 3.0 -- -- header X_OSIRU_SPAMWARE_SITE rbleval:check_rbl_results_for('osirusoft', '127.0.0.6') -- describe X_OSIRU_SPAMWARE_SITE DNSBL: sender is a Spamware site or vendor, penalizing further -- score X_OSIRU_SPAMWARE_SITE 5.0 -- -- header X_OSIRU_DUL_FH rbleval:check_rbl('osirusoft-dul-firsthop', 'relays.osirusoft.com.') -- describe X_OSIRU_DUL_FH Received from first hop dialup listed in relays.osirusoft.com -- score X_OSIRU_DUL_FH -1.5 -- -- header Z_FUDGE_DUL_MAPS_OSIRU rblreseval:check_two_rbl_results('osirusoft', "127.0.0.3", 'dialup', "127.0.0.3") -- describe Z_FUDGE_DUL_MAPS_OSIRU Do not double penalize for MAPS DUL and Osirusoft DUL -- score Z_FUDGE_DUL_MAPS_OSIRU -2 -- -- header Z_FUDGE_RELAY_OSIRU rblreseval:check_two_rbl_results('osirusoft', "127.0.0.2", 'relay', "127.0.0.2") -- describe Z_FUDGE_RELAY_OSIRU Do not double penalize for being an open relay on Osirusoft and another DNSBL -- score Z_FUDGE_RELAY_OSIRU -2 -- -- header Z_FUDGE_DUL_OSIRU_FH rblreseval:check_two_rbl_results('osirusoft-dul-firsthop', "127.0.0.3", 'dialup-firsthop', "127.0.0.3") -- describe Z_FUDGE_DUL_OSIRU_FH Do not double compensate for MAPS DUL and Osirusoft DUL first hop dialup -- score Z_FUDGE_DUL_OSIRU_FH 1.5 -- - =cut - - if (/^dialup_codes\s+(.*)$/) { diff --git a/mail/spamassassin/patches/patch-ai b/mail/spamassassin/patches/patch-ai deleted file mode 100644 index d4ba682367a..00000000000 --- a/mail/spamassassin/patches/patch-ai +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2003/09/03 13:08:06 atatat Exp $ - ---- rules/20_head_tests.cf.orig 2003-05-12 15:15:34.000000000 -0400 -+++ rules/20_head_tests.cf -@@ -230,36 +230,6 @@ describe FAKED_IP_IN_RCVD Received: cont - header SMTPD_IN_RCVD Received =~ /\(SMTPD32-\d+\..+\)/ - describe SMTPD_IN_RCVD Received via SMTPD32 server (SMTPD32-n.n) - --# Multizone / Multi meaning BLs first -- --# Osirusoft, like MAPS RBL+ is a multi-meaning BL, so it is treated separately --header RCVD_IN_OSIRUSOFT_COM rbleval:check_rbl('osirusoft', 'relays.osirusoft.com.') --describe RCVD_IN_OSIRUSOFT_COM Received via a relay in relays.osirusoft.com --tflags RCVD_IN_OSIRUSOFT_COM net -- --# X prefix was used to insure that it was run at the end, but it's not needed --# anymore since we run the rule with rblreseval -- Marc --header X_OSIRU_OPEN_RELAY rbleval:check_rbl_results_for('osirusoft', '127.0.0.2') --describe X_OSIRU_OPEN_RELAY DNSBL: sender is Confirmed Open Relay --tflags X_OSIRU_OPEN_RELAY net -- --header X_OSIRU_DUL rbleval:check_rbl_results_for('osirusoft', '127.0.0.3') --describe X_OSIRU_DUL DNSBL: sender ip address in in a dialup block --tflags X_OSIRU_DUL net -- --header X_OSIRU_SPAM_SRC rbleval:check_rbl_results_for('osirusoft', '127.0.0.4') --describe X_OSIRU_SPAM_SRC DNSBL: sender is Confirmed Spam Source --tflags X_OSIRU_SPAM_SRC net -- --header X_OSIRU_SPAMWARE_SITE rbleval:check_rbl_results_for('osirusoft', '127.0.0.6') --describe X_OSIRU_SPAMWARE_SITE DNSBL: sender is a Spamware site or vendor --tflags X_OSIRU_SPAMWARE_SITE net -- --header X_OSIRU_DUL_FH rbleval:check_rbl('osirusoft-dul-firsthop', 'relays.osirusoft.com.') --describe X_OSIRU_DUL_FH Received from first hop dialup listed in relays.osirusoft.com --tflags X_OSIRU_DUL_FH net nice -- -- - # Now, single zone BLs follow: - # the new first arg for check_rbl() indicates what type of check it is; - # each type of check is stored in a separate set, and if an IP has already diff --git a/mail/spamassassin/patches/patch-aj b/mail/spamassassin/patches/patch-aj deleted file mode 100644 index 499b6c3fdf3..00000000000 --- a/mail/spamassassin/patches/patch-aj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2003/09/03 13:08:06 atatat Exp $ - ---- rules/30_text_de.cf.orig 2003-05-12 15:15:34.000000000 -0400 -+++ rules/30_text_de.cf -@@ -67,11 +67,8 @@ lang de describe FAKED_IP_IN_RCVD - lang de describe SMTPD_IN_RCVD Empfangen von einem SMTPD32 Server (SMTPD32-n.n) - lang de describe POST_IN_RCVD Empfangen von einem Relais mit gefaelschtem 'Post.cz' Hostname - lang de describe RCVD_IN_RELAYS_ORDB_ORG Empfangen von einem Relais in der relays.ordb.org Liste --lang de describe RCVD_IN_OSIRUSOFT_COM Empfangen von einem Relais in der relays.osirusoft.com Liste - lang de describe RCVD_IN_RFCI Empfangen von einem Relais in der ipwhois.rfc-ignorant.org Liste - lang de describe RCVD_IN_ORBS Empfangen von einem Relais in der orbs.dorkslayers.com Liste --lang de describe X_OSIRU_SPAM_SRC Sender ist als Spammer bekannt --lang de describe X_OSIRU_SPAMWARE_SITE DNSBL: Sender ist eine Spamware-Site oder -Hersteller - lang de describe RCVD_IN_RBL Empfangen von einem RBL-Relais, siehe http://www.mail-abuse.org/rbl/ - lang de describe RCVD_IN_RSS Empfangen von einem RSS-Relais, siehe http://www.mail-abuse.org/rss/ - lang de describe RCVD_IN_DUL Empfangen von einem Spam-Dialup, siehe http://www.mail-abuse.org/dul/ diff --git a/mail/spamassassin/patches/patch-ak b/mail/spamassassin/patches/patch-ak index f802e934835..b5052d155db 100644 --- a/mail/spamassassin/patches/patch-ak +++ b/mail/spamassassin/patches/patch-ak @@ -1,14 +1,14 @@ -$NetBSD: patch-ak,v 1.3 2003/09/03 13:08:06 atatat Exp $ +$NetBSD: patch-ak,v 1.4 2003/11/03 00:56:26 heinz Exp $ ---- rules/30_text_es.cf.orig 2003-03-17 18:56:57.000000000 -0500 -+++ rules/30_text_es.cf -@@ -55,9 +55,6 @@ lang es describe MDAEMON_2_7_4 Received - lang es describe SMTPD_IN_RCVD Received del servidor SMTPD32 (SMTPD32-n.n) - lang es describe POST_IN_RCVD Received contene el nombre falso 'Post.cz' - lang es describe RCVD_IN_RELAYS_ORDB_ORG Recibido de un relay en relays.ordb.org --lang es describe RCVD_IN_OSIRUSOFT_COM Recibido de un relay en relays.osirusoft.com --lang es describe X_OSIRU_SPAM_SRC Osirusoft.com: el remitente es Confirmada Fuente de Spam --lang es describe X_OSIRU_SPAMWARE_SITE Osirusoft.com: el remitente es un sitio afin al Spame o vendedor - lang es describe RCVD_IN_RBL Recibido desde un RBLed relay, visite http://www.mail-abuse.org/rbl/ - lang es describe RCVD_IN_RSS Recibido desde RSSed relay, visite http://www.mail-abuse.org/rss/ - lang es describe RCVD_IN_DUL Recibido desde dialup, visite http://www.mail-abuse.org/dul/ +--- lib/Mail/SpamAssassin/DBBasedAddrList.pm.orig Sat Mar 29 00:48:07 2003 ++++ lib/Mail/SpamAssassin/DBBasedAddrList.pm +@@ -5,7 +5,8 @@ use bytes; + use Fcntl; + + # tell AnyDBM_File to prefer DB_File, if possible. +-# BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); } ++# Pkgsrc: enable following line because BayesStore.pm already broke the rule ++BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); } + # off until 3.0; there's lots of existing AWLs out there this breaks. + + use AnyDBM_File; diff --git a/mail/spamassassin/patches/patch-al b/mail/spamassassin/patches/patch-al index 66005a2b0a7..e1508aae325 100644 --- a/mail/spamassassin/patches/patch-al +++ b/mail/spamassassin/patches/patch-al @@ -1,21 +1,14 @@ -$NetBSD: patch-al,v 1.3 2003/09/03 13:08:07 atatat Exp $ +$NetBSD: patch-al,v 1.4 2003/11/03 00:56:26 heinz Exp $ ---- rules/30_text_fr.cf.orig 2003-05-12 15:15:34.000000000 -0400 -+++ rules/30_text_fr.cf -@@ -282,7 +282,6 @@ lang fr describe RCVD_IN_BL_SPAMCOP_NET - lang fr describe RCVD_IN_DUL Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste dialup, voir http://www.mail-abuse.org/ - lang fr describe RCVD_IN_ORBS Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste orbs.dorkslayers.com - # lang fr describe RCVD_IN_ORBZ --lang fr describe RCVD_IN_OSIRUSOFT_COM Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste relays.osirusoft.com - lang fr describe RCVD_IN_RBL Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste RBL, voir http://www.mail-abuse.org/ - lang fr describe RCVD_IN_RELAYS_ORDB_ORG Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste rrelays.ordb.com - lang fr describe RCVD_IN_RFCI Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste ipwhois.rfc-ignorant.org -@@ -344,8 +343,6 @@ lang fr describe WORK_AT_HOME Contient - lang fr describe WWW_CLIK4YOU_COM Expression fréquement trouvée dans du spam - lang fr describe X_MAILER_GIBBERISH L'entête X-Mailer: contient des informations incompréhensibles - lang fr describe X_MSMAIL_PRIORITY_HIGH L'entête X-Msmail-Priority: défini une priorité élevée --lang fr describe X_OSIRU_SPAMWARE_SITE L'expéditeur est un spameur selon DNSBL --lang fr describe X_OSIRU_SPAM_SRC L'expéditeur est décidément un spameur selon DNSBL - lang fr describe X_PMFLAGS_PRESENT Contient l'entête X-PMFLAGS: en majuscules - lang fr describe X_PRIORITY_HIGH L'entête X-Priority: défini une priorité élevée - lang fr describe YAHOO_MSGID_ADDED L'entête message-Id: a été ajouté par Yahoo, c'est bon +--- tools/check_whitelist.orig Thu Dec 19 20:05:01 2002 ++++ tools/check_whitelist +@@ -5,7 +5,8 @@ use Fcntl; + + # must match line at top of lib/Mail/SpamAssassin/DBBasedAddrList.pm. + # now off until 3.0 +-# BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); } ++# Pkgsrc: enable following line because BayesStore.pm already broke the rule ++BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); } + + use AnyDBM_File ; + use vars qw( %h $k $v ) ; diff --git a/mail/spamassassin/patches/patch-am b/mail/spamassassin/patches/patch-am deleted file mode 100644 index 5c219e38160..00000000000 --- a/mail/spamassassin/patches/patch-am +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-am,v 1.3 2003/09/03 13:08:07 atatat Exp $ - ---- rules/30_text_it.cf.orig 2003-05-12 15:15:34.000000000 -0400 -+++ rules/30_text_it.cf -@@ -150,7 +150,6 @@ lang it describe RAZOR_CHECK Email pr - lang it describe RCVD_IN_BL_SPAMCOP_NET Ricevuto tramite un relay presente in bl.spamcom.net - lang it describe RCVD_IN_DUL Ricevuto tramite un dialup spammer, visitare http://www.mail-abuse.org/dul/ - lang it describe RCVD_IN_ORBS Ricevuto tramite un relay presente in orbs.dorkslayers.com --lang it describe RCVD_IN_OSIRUSOFT_COM Ricevuto tramite un relay presente in relays.osirusoft.com - lang it describe RCVD_IN_RBL Ricevuto tramite un relay RBL, visitare http://www.mail-abuse.org/rbl/ - lang it describe RCVD_IN_RELAYS_ORDB_ORG Ricevuto tramite un relay presente in relays.ordb.org - lang it describe RCVD_IN_RFCI Ricevuto tramite un relay presente in ipwhois.rfc-ignorant.org -@@ -210,8 +209,6 @@ lang it describe WORK_AT_HOME Contiene - lang it describe WWW_CLIK4YOU_COM Contiene frase usata nello spam - lang it describe X_MAILER_GIBBERISH L'header X-Mailer: contiene caratteri senza senso - lang it describe X_MSMAIL_PRIORITY_HIGH L'header X-Msmail-Priority: definisce una priorità elevata --lang it describe X_OSIRU_SPAMWARE_SITE Il mittente è un sito Spamware --lang it describe X_OSIRU_SPAM_SRC Il mittente è indicato da DNSBL come spammer - lang it describe X_PMFLAGS_PRESENT Presente l'header X-PMFLAGS: (maiuscolo) - lang it describe X_PRIORITY_HIGH Messaggio ad alta priorità - lang it describe YAHOO_MSGID_ADDED Il Message-Id è stato aggiunto da Yahoo!, e ciò è cosa buona diff --git a/mail/spamassassin/patches/patch-an b/mail/spamassassin/patches/patch-an deleted file mode 100644 index b88b50359ba..00000000000 --- a/mail/spamassassin/patches/patch-an +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-an,v 1.3 2003/09/03 13:08:07 atatat Exp $ - ---- rules/30_text_pl.cf.orig 2003-03-17 18:56:57.000000000 -0500 -+++ rules/30_text_pl.cf -@@ -57,9 +57,6 @@ lang pl describe MDAEMON_2_7_4 Odebrano - lang pl describe SMTPD_IN_RCVD Odebrano od serwera SMTPD32 (SMTPD32-n.n) - lang pl describe POST_IN_RCVD Received zawiera oszukan± domene: 'Post.cz' - lang pl describe RCVD_IN_RELAYS_ORDB_ORG Odebrane od zablokowanego nadawcy w/g: relays.ordb.org --lang pl describe RCVD_IN_OSIRUSOFT_COM Odebrane od zablokowanego nadawcy w/g: relays.osirusoft.com --lang pl describe X_OSIRU_SPAM_SRC Osirusoft.com: nadawca jest potwierdzonym Spamerem. --lang pl describe X_OSIRU_SPAMWARE_SITE Osirusoft.com: nadawca jest Spamerem lub producentem. - lang pl describe RCVD_IN_RBL Odebrane od zablokowanego systemu, w/g http://www.mail-abuse.org/rbl/ - lang pl describe RCVD_IN_RSS Odebrane od zablokowanego systemu, w/g http://www.mail-abuse.org/rss/ - lang pl describe RCVD_IN_DUL Odebrane od dial-up'a, w/g http://www.mail-abuse.org/dul/ diff --git a/mail/spamassassin/patches/patch-ao b/mail/spamassassin/patches/patch-ao deleted file mode 100644 index 0aa398d07fb..00000000000 --- a/mail/spamassassin/patches/patch-ao +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ao,v 1.3 2003/09/03 13:08:08 atatat Exp $ - ---- rules/50_scores.cf.orig 2003-05-12 15:15:36.000000000 -0400 -+++ rules/50_scores.cf -@@ -923,12 +923,6 @@ score PYZOR_CHECK 0.0 4.400 0.0 1.211 - # - - score RCVD_IN_RELAYS_ORDB_ORG 0.0 --score RCVD_IN_OSIRUSOFT_COM 0.0 0.552 0.0 0.864 --score X_OSIRU_DUL 0.0 --score X_OSIRU_DUL_FH 0.0 --score X_OSIRU_OPEN_RELAY 0.0 2.900 0.0 0.0 --score X_OSIRU_SPAMWARE_SITE 0.0 1.101 0.0 0.0 --score X_OSIRU_SPAM_SRC 0.0 - score RCVD_IN_RFCI 0.0 1.448 0.0 1.092 - score RCVD_IN_ORBS 0.0 0.499 0.0 0.114 - score RCVD_IN_DSBL 0.0 2.574 0.0 4.295 diff --git a/mail/spamassassin/patches/patch-ap b/mail/spamassassin/patches/patch-ap deleted file mode 100644 index dd9a1a18bec..00000000000 --- a/mail/spamassassin/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2003/06/08 01:11:37 heinz Exp $ - ---- lib/Mail/SpamAssassin.pm.orig Tue May 20 08:06:17 2003 -+++ lib/Mail/SpamAssassin.pm -@@ -558,7 +558,7 @@ sub report_as_spam { - $mail = $self->encapsulate_mail_object ($mail); - - # learn as spam -- $self->learn ($mail, $mail->get_header("Message-Id"), 1, 0); -+ $self->learn ($mail, scalar($mail->get_header("Message-Id")), 1, 0); - - require Mail::SpamAssassin::Reporter; - $mail = Mail::SpamAssassin::Reporter->new($self, $mail, $options); diff --git a/mail/spamassassin/patches/patch-aq b/mail/spamassassin/patches/patch-aq new file mode 100644 index 00000000000..0abeb5488ef --- /dev/null +++ b/mail/spamassassin/patches/patch-aq @@ -0,0 +1,40 @@ +$NetBSD: patch-aq,v 1.1 2003/11/03 00:56:26 heinz Exp $ + +--- README.orig Sat Sep 13 03:05:21 2003 ++++ README +@@ -105,30 +105,30 @@ Mail::SpamAssassin::Conf class (run the + the standard defaults that people use. There is an explanation of all the + default locations that SpamAssassin will look at the end. + +- - /usr/share/spamassassin/*.cf: ++ - @PREFIX@/share/spamassassin/*.cf: + + Distributed configuration files, with all defaults. Do not modify + these, as they are overwritten when you upgrade. + +- - /etc/mail/spamassassin/*.cf: ++ - @PKG_SYSCONFDIR@/*.cf: + + Site config files, for system admins to create, modify, and + add local rules and scores to. Modifications here will be + appended to the config loaded from the above directory. + +- - /usr/share/spamassassin/user_prefs.template: ++ - @PREFIX@/share/spamassassin/user_prefs.template: + + Distributed default user preferences. Do not modify this, as it is + overwritten when you upgrade. + +- - /etc/mail/spamassassin/user_prefs.template: ++ - @PKG_SYSCONFDIR@/user_prefs.template: + + Default user preferences, for system admins to create, modify, and + set defaults for users' preferences files. Takes precedence over + the above prefs file, if it exists. + + Do not put system-wide settings in here; put them in the +- /etc/mail/spamassassin directory. This file is just a template, ++ @PKG_SYSCONFDIR@ directory. This file is just a template, + which will be copied to a user's home directory for them to + change. + -- cgit v1.2.3