[pkgsrc/pkgsrc-2006Q4]: pkgsrc/mail/spamassassin Pullup ticket 2031 - request...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf1aa6dd491f
branches:  pkgsrc-2006Q4
changeset: 523030:bf1aa6dd491f
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Fri Feb 23 11:36:22 2007 +0000

description:
Pullup ticket 2031 - requested by taca
security update for spamassassin

- pkgsrc/mail/spamassassin/Makefile                     1.78-1.79
- pkgsrc/mail/spamassassin/distinfo                     1.43

   Module Name: pkgsrc
   Committed By:        ghen
   Date:                Thu Feb  8 09:30:27 UTC 2007

   Modified Files:
           pkgsrc/mail/spamassassin: Makefile

   Log Message:
   Put rule file updates in ${VARBASE}/spamassassin instead of ${VARBASE}.  Bump
   PKGREVISION.
---
   Module Name: pkgsrc
   Committed By:        heinz
   Date:                Thu Feb 15 21:43:43 UTC 2007

   Modified Files:
           pkgsrc/mail/spamassassin: Makefile distinfo

   Log Message:
   Updated to version 3.1.8.

   Pkgsrc changes:
     - some cleanup of the Makefile to shut up a few pkglint notes and warnings
       (USE_TOOLS, SUBST_CLASSES).

   Changes since version 3.1.7:
   ============================
   3.1.8 is a major bug-fix release, including a potential DoS.  The major
   highlights are:

   - bug 5318: fix for CVE-2007-0451: possible DoS due to incredibly
     long URIs found in the message content.
   - bug 5240: disable perl module usage in update channels unless
     --allowplugins is specified
   - bug 5288: files with names starting/ending in whitespace weren't usable
   - bug 5056: remove Text::Wrap related code due to upstream issues
   - bug 5145: update spamassassin and sa-learn to better deal with STDIN
   - bug 5140 and 5179: improvements and bug fixes related to DomainKeys
     and DKIM support
   - several updates for Received header parsing
   - several documentation updates and random taint-variable related issues

diffstat:

 mail/spamassassin/Makefile |  14 ++++++++------
 mail/spamassassin/distinfo |   8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs (64 lines):

diff -r 9ebc4b1749ae -r bf1aa6dd491f mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile        Tue Feb 20 15:16:15 2007 +0000
+++ b/mail/spamassassin/Makefile        Fri Feb 23 11:36:22 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2006/11/05 17:15:54 joerg Exp $
+# $NetBSD: Makefile,v 1.77.2.1 2007/02/23 11:36:22 ghen Exp $
 
-DISTNAME=      Mail-SpamAssassin-3.1.7
-PKGNAME=       spamassassin-3.1.7
+DISTNAME=      Mail-SpamAssassin-3.1.8
+PKGNAME=       spamassassin-3.1.8
 SVR4_PKGNAME=  sa
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/source/}
@@ -23,6 +23,8 @@
 DEPENDS+=      p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar
 DEPENDS+=      p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib
 
+USE_TOOLS+=    perl
+
 .if (${OPSYS} != "NetBSD") && (${OPSYS} != "DragonFly")
 DEPENDS+=      p5-DB_File-[0-9]*:../../databases/p5-DB_File
 .endif
@@ -58,7 +60,7 @@
 MAKE_PARAMS+=          CONTACT_ADDRESS=${SPAMASSASSIN_CONTACT_ADDRESS:Q}
 MAKE_PARAMS+=          DEFRULESDIR="${RULESDIR}"
 MAKE_PARAMS+=          LOCALRULESDIR="${PKG_SYSCONFDIR}"
-MAKE_PARAMS+=          LOCALSTATEDIR="${VARBASE}"
+MAKE_PARAMS+=          LOCALSTATEDIR="${VARBASE}/spamassassin"
 MAKE_PARAMS+=          PERL_BIN="${PERL5}"
 MAKE_PARAMS+=          SYSCONFDIR="${PKG_SYSCONFDIR}"
 
@@ -86,13 +88,13 @@
 OWN_DIRS+=             ${VARBASE}/spamassassin
 OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR}/sa-update-keys ${SHAREOWN} ${SHAREGRP} 0700
 
-SUBST_CLASSES+=                sa2 sa3
-
+SUBST_CLASSES+=                sa2
 SUBST_STAGE.sa2=       pre-configure
 SUBST_FILES.sa2=       README spamd/spamd.raw
 SUBST_SED.sa2=         -e s!@@PREFIX@@!${PREFIX}!g
 SUBST_SED.sa2+=                -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
 
+SUBST_CLASSES+=                sa3
 SUBST_STAGE.sa3=       pre-configure
 SUBST_FILES.sa3=       INSTALL UPGRADE USAGE ldap/README               \
                        spamc/README.qmail                              \
diff -r 9ebc4b1749ae -r bf1aa6dd491f mail/spamassassin/distinfo
--- a/mail/spamassassin/distinfo        Tue Feb 20 15:16:15 2007 +0000
+++ b/mail/spamassassin/distinfo        Fri Feb 23 11:36:22 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2006/10/10 18:39:27 heinz Exp $
+$NetBSD: distinfo,v 1.42.2.1 2007/02/23 11:36:22 ghen Exp $
 
-SHA1 (Mail-SpamAssassin-3.1.7.tar.gz) = 3d31eff0eb9a158fab308958d65cdca81b8944bc
-RMD160 (Mail-SpamAssassin-3.1.7.tar.gz) = b5e5cffdbcfba6e58346bdd51c8adba1547fcca4
-Size (Mail-SpamAssassin-3.1.7.tar.gz) = 1168183 bytes
+SHA1 (Mail-SpamAssassin-3.1.8.tar.gz) = 08f81f72d8a783887cf815dfc55ea38e3582b966
+RMD160 (Mail-SpamAssassin-3.1.8.tar.gz) = 9e1af7219e3d6c1297181748b85853b812d2cdc4
+Size (Mail-SpamAssassin-3.1.8.tar.gz) = 1173847 bytes
 SHA1 (patch-ab) = df95d87a2f2e7af238c27c3d5468d9aad7eb000d
 SHA1 (patch-ae) = 1461b24978c75c394c607ae1d49cb49dd086b563
 SHA1 (patch-aq) = 495a3ac94a05129520e5d7018fdd56b6dad3c951