diff options
author | heinz <heinz> | 2008-06-22 22:41:01 +0000 |
---|---|---|
committer | heinz <heinz> | 2008-06-22 22:41:01 +0000 |
commit | 20cf7210bc3e8c9d12cda591fced9170ec7c4993 (patch) | |
tree | 50498a15256c1860dd1f1f0f577c1c36b4192612 /mail | |
parent | 824656d8291931ecc07ee9ea3529e67078eefc96 (diff) | |
download | pkgsrc-20cf7210bc3e8c9d12cda591fced9170ec7c4993.tar.gz |
Updated to version 3.2.5.
Pkgsrc changes:
- p5-DB_File is now required on all systems, even those where Perl
already detects the native db-functions (dbopen,...) and thus
provides DB_File.
This should prevent subtle errors like the one in PR pkg/37751 at
the price of installing an additional package.
- Added explanation to patch-ay.
- patch-bc was adapted to the changes for the path of compiled rulesets.
- patch-bd is no longer necessary, the public key is now cross-verified.
- shut up some warnings from pkglint regarding "set -e" and quoted
variables.
Changes since version 3.2.4:
============================
3.2.5 is a minor bug-fix release. Summary of changes:
- bug 5775: newer gpg versions require keys to be cross-certified (backsig).
Did a cross-verify on our sa-update public key and re-exported. (If you
are already seeing "GPG validation failed" errors from sa-update, see
http://wiki.apache.org/spamassassin/SaUpdateKeyNotCrossCertified .)
- bug 5899: add perl version string to the storage area for compiled
rulesets, to avoid crashes when perl is upgraded between major versions
(e.g perl 5.8.x to 5.10.0) and the ABI breaks
- bug 5496, bug 5910: clear some FORGED_MUA_OUTLOOK false positives,
particularly on the new-format Message-ID generated by the Outlook
Express version used in Windows XP service pack 3
- bug 5730: when using Postgres >= 8.1.0 with Bayes, this error occurs:
'WARNING: nonstandard use of \ in a string literal at character'. fix,
thanks to Tomasz Ostrowski
- bug 5769: fix 'sa-compile: eval failed: Can't find label NO' error,
caused in rare circumstances when sa-compile attempted to deal with
rules written using 'replace_rules' features
- bug 5858: fix circular reference memory leak caused by some messages
- bug 5815: update 2TLD list to include .rs CCTLD
- bug 4706: remove HG_HORMOME rules due to poor performance
- bug 5835: typo in POD docs for SPF plugin; thanks to Benny Pedersen for fix
- bug 5839: a missing or failed eval rule function could mistakenly count
as a rule hit, fixed
- trivial bugfix for the VBounce ruleset: __BOUNCE_FROM_DAEMON incorrectly
used + instead of *, so some From addresses were not being recognised as
bounce senders
Diffstat (limited to 'mail')
-rw-r--r-- | mail/spamassassin/Makefile | 25 | ||||
-rw-r--r-- | mail/spamassassin/distinfo | 13 | ||||
-rw-r--r-- | mail/spamassassin/patches/patch-ay | 6 | ||||
-rw-r--r-- | mail/spamassassin/patches/patch-bc | 16 | ||||
-rw-r--r-- | mail/spamassassin/patches/patch-bd | 41 |
5 files changed, 30 insertions, 71 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 3d5abcb69cc..55584b147bb 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2008/05/20 05:42:46 ghen Exp $ +# $NetBSD: Makefile,v 1.88 2008/06/22 22:41:01 heinz Exp $ -DISTNAME= Mail-SpamAssassin-3.2.4 -PKGNAME= spamassassin-3.2.4 -PKGREVISION= 2 +DISTNAME= Mail-SpamAssassin-3.2.5 +PKGNAME= spamassassin-3.2.5 SVR4_PKGNAME= sa CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} @@ -27,14 +26,12 @@ DEPENDS+= p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar DEPENDS+= p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib DEPENDS+= p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib DEPENDS+= gnupg-[0-9]*:../../security/gnupg +DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File USE_TOOLS+= perl -.if (${OPSYS} != "NetBSD") && (${OPSYS} != "DragonFly") -DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File -.endif -CONFLICTS= p5-Mail-SpamAssassin-[1-9]* +CONFLICTS= p5-Mail-SpamAssassin-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME} @@ -54,7 +51,7 @@ PLIST_SRC= ${PKGDIR}/PLIST ${PLIST_ADD} PERL5_PACKLIST= auto/Mail/SpamAssassin/.packlist GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_DIRS= spamc BUILD_DIRS= . PERL5_CONFIGURE= NO # we need the default "do-configure" target @@ -140,7 +137,7 @@ INTERPRETER_SUPPORT= YES # These variables are substituted in netbsd-rc-script.sh. FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT:Q} -FILES_SUBST+= OPSYS=${OPSYS:Q} +FILES_SUBST+= OPSYS=${OPSYS} pre-configure: perl5-configure # GNU configure needs version.h -> create it @@ -158,19 +155,19 @@ post-install: ${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD} .endfor - cd ${WRKSRC}/rules; \ + set -e ; cd ${WRKSRC}/rules; \ for f in [0-9]*.cf; do \ ${ECHO} "${RULE_SUBDIR}/$$f" >> ${PLIST_ADD}; \ done; \ for f in ${PRE_FILES}; do \ - ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR} && \ - ${ECHO} ${EG_SUBDIR}/$$f >> ${PLIST_ADD}; \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR} && \ + ${ECHO} "${EG_SUBDIR}/$$f" >> ${PLIST_ADD}; \ done # examples are in the static PLIST ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR} - { for d in ${SA_INSTALLDIRS}; do \ + set -e ; { for d in ${SA_INSTALLDIRS}; do \ ${ECHO} "@dirrm $$d"; \ done; } | ${SORT} -r >> ${PLIST_ADD}; diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index da2f997cc93..c211a07ae2f 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.48 2008/05/20 05:42:46 ghen Exp $ +$NetBSD: distinfo,v 1.49 2008/06/22 22:41:01 heinz Exp $ -SHA1 (Mail-SpamAssassin-3.2.4.tar.gz) = 5c0e01831256518b27139507a4ded38e582d8649 -RMD160 (Mail-SpamAssassin-3.2.4.tar.gz) = 00ebd0dfa544079524bbb0918cc21b644b26ecff -Size (Mail-SpamAssassin-3.2.4.tar.gz) = 1219161 bytes +SHA1 (Mail-SpamAssassin-3.2.5.tar.gz) = 14b1f6eae0221a152176f7f597f55581445e800a +RMD160 (Mail-SpamAssassin-3.2.5.tar.gz) = 5a72a97d124e72ff4da1627982748377f1e34128 +Size (Mail-SpamAssassin-3.2.5.tar.gz) = 1223706 bytes SHA1 (patch-ab) = 9872b4c3e6d34cb58f84081554eff49efcfc6a6a SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8 -SHA1 (patch-ay) = 7d805e7ef86e279a19e7d3d2f03e2227624317f8 +SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424 SHA1 (patch-ba) = ea6b8eac3d9475641725dc4aa1e7a4d31912a044 -SHA1 (patch-bc) = d12de1f4d4cf3b475275d15b3b8edc37e3b05405 -SHA1 (patch-bd) = eeeef0000912bd39ff6d943729e8c68bc31225bb +SHA1 (patch-bc) = 71fcf6297eacbd69a5c5d5b1911f648e4011ce3e diff --git a/mail/spamassassin/patches/patch-ay b/mail/spamassassin/patches/patch-ay index 362d5454417..af32c72d122 100644 --- a/mail/spamassassin/patches/patch-ay +++ b/mail/spamassassin/patches/patch-ay @@ -1,4 +1,8 @@ -$NetBSD: patch-ay,v 1.1 2006/03/13 21:11:57 heinz Exp $ +$NetBSD: patch-ay,v 1.2 2008/06/22 22:41:01 heinz Exp $ + + Change default behaviour of SpamAssassin for pkgsrc in order to shut up + unwanted warnings in the log files. + If the users want to use SPF, they can enable the plugin. --- rules/init.pre.orig 2006-03-10 20:30:02.000000000 +0100 +++ rules/init.pre diff --git a/mail/spamassassin/patches/patch-bc b/mail/spamassassin/patches/patch-bc index b5d66eae40d..ccb313aeaf1 100644 --- a/mail/spamassassin/patches/patch-bc +++ b/mail/spamassassin/patches/patch-bc @@ -1,26 +1,26 @@ -$NetBSD: patch-bc,v 1.2 2008/01/09 15:55:52 heinz Exp $ +$NetBSD: patch-bc,v 1.3 2008/06/22 22:41:01 heinz Exp $ Both submitted upstream (bug id 5628/5630): - no need for a hard-coded path, the appropriate variables already exist - the documentation conflicts with the code ---- sa-compile.raw.orig 2007-08-08 15:19:47.000000000 +0200 +--- sa-compile.raw.orig 2008-06-10 11:21:07.000000000 +0200 +++ sa-compile.raw -@@ -661,7 +661,7 @@ Options: +@@ -684,7 +684,7 @@ Options: --siteconfigpath=path Path for site configs (default: /etc/mail/spamassassin) --updatedir=path Directory to place updates -- (default: /var/lib/spamassassin/compiled/<version>) -+ (default: @@LOCAL_STATE_DIR@@/compiled/@@VERSION@@) +- (default: /var/lib/spamassassin/compiled/<perlversion>/<version>) ++ (default: @@LOCAL_STATE_DIR@@/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@) --cf='config line' Additional line of configuration -D, --debug [area=n,...] Print debugging messages -V, --version Print version -@@ -719,12 +719,12 @@ the default directories (usually C</etc/ +@@ -746,12 +746,12 @@ the default directories (usually C</etc/ By default, C<sa-compile> will use the system-wide rules update directory: -- @@LOCAL_STATE_DIR@@/spamassassin/compiled/@@VERSION@@ -+ @@LOCAL_STATE_DIR@@/compiled/@@VERSION@@ +- @@LOCAL_STATE_DIR@@/spamassassin/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@ ++ @@LOCAL_STATE_DIR@@/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@ If the updates should be stored in another location, specify it here. diff --git a/mail/spamassassin/patches/patch-bd b/mail/spamassassin/patches/patch-bd deleted file mode 100644 index f63f05d2227..00000000000 --- a/mail/spamassassin/patches/patch-bd +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2008/05/20 05:42:46 ghen Exp $ - -Updated sa-update PGP key to fix GnuGP 1.4.9 "cross-certified" error, -see http://wiki.apache.org/spamassassin/SaUpdateKeyNotCrossCertified - ---- rules/sa-update-pubkey.txt.orig 2008-01-05 22:11:39.000000000 +0100 -+++ rules/sa-update-pubkey.txt -@@ -52,8 +52,31 @@ NvzB1i9yubAMrsTQVu1Q8e5LsnL/MNYKb6oEJbBy - VNqX9f7jlybpLZW/n8cQ2r1ax19v7FleO/xSGvkYm7B1+4BW0mjy6A5dta5+e5WG - D5R06Uya3/xRAPGdmV6t4Mw8fFsuyCvs+vC73PR3+eS1UvCYsDpcQD8KpVBnsHaA - duWRKKhjuFL0vdOWAr25tFOTKAj5Ywas47PBukO0isov2WBCA1rVqOr6FUvdP76y --mqHv/0E6/vnTLxFoNsu4Ce42nAQ/A/jR --=SY0J -+mqHv/0E6/vnTLxFoNsu4Ce42nAQ/A/jRiQQ+BBgBAgAJAhsCBQJHhbheAinBXSAE -+GQECAAYFAkOnbIoACgkQbFU5eCT0NM68MQ/8DvYqxRm3vP0Gwnr+63kzET8S+6vf -+gxOghnU+eMlqUeUu/ajqnVDMzoAIRDw9QgQc9ZZoklOSJQwOuloAbdpL4TwQ2XfJ -+MLU60JkZWnEOXJwClb0qG1GqtcBPbMEUPfZcQfphdRL3jpWZlaexFiJRSD+A0riw -+7q3NZKPDt4FrF7F3GY9krFy+P0nRt5f462DeDhCYZgguBQH+oGtjc5Hx+kOVWDsS -+txo5xkt4/0DG50ZklPkTlCohmJwRLACy+NswdQ9q83eWAhzKOPgkal7xF6a+LyE+ -+ytVYy2EgEU74r2gVw5iizy92FDj//Z2QAUyf/c4BMuAhvfwVIHd8n2DPHvpMP15L -+6fwoymh0OjzmhwK94Z2u1YqNC1CK27/hfB6okQ/Tct7/Ik61dBjtiYdUC9tTA5Ze -+W8X5ouSmttS1QFixx+Z4hiXV7Qj12lgVKuJohjrVshfcbVzTHljjAo3YkOZIHIoA -+IJTUMRNzTIx9k4hrPVbxbVQhKjKTwFNtBuxvmptGTcLEIv9THpqlq8jkcStJ2Zrd -+hhofPCWRT/Kzo+WE+Kgefv88T5Li7Ku12U/UpiK85+6nRspXj3rnkfDOUbLZjGM+ -+1NET0xQTPuyxN6CXF7MMxfGCpszCudYxMANDQqNXu9brcPN/+EIxGRjqin4E7q+h -+kYUaY7Ki8mXtJ8cJEEBWphpSROxFktcQALWQv996bFq1iFcGuQ0ITxNDlOWCsses -+bgEM5zR10DH+6s2bXEO8xyDHQJtrvdCPetRDosnuOToBMnGMXTYVytnWzwwAzwq1 -+YM+bGAeTHaIX+2UmxwFyX4GMOdqsNB+xDZ8pmRKjamJSgUQt6e18YpZlg1Y4QkxS -+Vptq7OZBjiKeLUhLhGJ6GWgEIedLcoCtFzKCfz3zwn0Oxl+1EnVu8yqN+quWTf8P -+7EZn+0ztqZY059BrcK2jmOyXvtOZBcAHXCUknh/uPHwAJV2WFWSNid2kNiLOrV+J -+3eLTs5sF9wNhxWRhl6/10cwTzjy0Onv5cJh2tjdwksigMRMwz4c839zXORni/tnY -++IY22kNTKu84gB8rBuqUq8MQXNdS3bbROwwNUzpC0D1C1z1fBvyXDL1EwJdz70Wc -+2m/Sw6tIid5g98+XMW+Ibt43Jk2XbK71JLhbVbePbAcHVh/UXEtnjhRfX7oyWlwS -+a+lkKMiJd/6CQ6bvYsgklE7uEzTpRskpkkOcCk1O+8jfl+DsDwKrvVaNu8tpx45k -+TtV4JDA6iEHKakD/zZdVTR79W2CFqBvRfRikc5INOl1OfMQ4ODmjkMl3yI9wrHwS -+SQQxdq2XsS7xbU9HDFBEguQDu0rfzILZ9DuKIVHyr/CsRoJ5joj+JvKaUQC81ywQ -+aB8EKy5bg4U6 -+=IbYW - -----END PGP PUBLIC KEY BLOCK----- - - |