Maintenance update to 2.44

Parts of patch-ag and patch-ah as well as complete patch-aa could be
removed again, they are now included in SA 2.44 (see below).

#### official release announcement ###############

This is a bug-fix release, which fixes the following bugs:

  - Backport fix for Bug 1306: Possible buffer overflow in libspamc when
    running in BSMTP mode (patch 1.15 -> 1.18)

  - Backport workaround from Bug 526: Failed sanity check because of
    clobbered STDOUT (patch 1.147 -> 1.148)

  - Backport fix for Debian Bug 160206: Insufficient buffer in libspamc
    (patch 1.8 -> 1.9)

  - Backport fix for warnings in sed_path (patch 1.141 -> 1.142)

  - Backport fix for Bug 1127: Existing lowercase x-spam-status header
    kills SpamAssassin (patch 1.40 -> 1.41)

  - localized %ENV to fix problem where Razor2 erases the PATH so DCC
    and
    pyzor don't work, etc.

Note that this is *not* 2.50, which offers Bayesian filtering etc. These
bugs are already fixed in the 2.50 CVS tree, but that is not yet ready for
release.  This is a stable maintainance release only.

6 files changed, 20 insertions, 51 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 0aee6534055..45b856cc503 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/01/29 17:34:28 tron Exp $
+# $NetBSD: Makefile,v 1.17 2003/02/02 19:38:39 heinz Exp $
 
-DISTNAME=	Mail-SpamAssassin-2.43
-PKGNAME=	spamassassin-2.43
-PKGREVISION=	2
+DISTNAME=	Mail-SpamAssassin-2.44
+PKGNAME=	spamassassin-2.44
+PKGREVISION=	# empty
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}			\
@@ -54,8 +54,7 @@ INTERPRETER_SUPPORT=YES
 .endif
 FILES_SUBST+=		INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT}
 
-test:	build
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} test
+TEST_TARGET=	test
 
 pre-configure: perl5-configure
 
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index fa915ed1a70..d97f3e8de94 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.10 2003/01/29 17:34:28 tron Exp $
+$NetBSD: distinfo,v 1.11 2003/02/02 19:38:39 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-2.43.tar.gz) = ffe0f4d80ab2367bb3df856ec777bafb6ac7616e
-Size (Mail-SpamAssassin-2.43.tar.gz) = 538505 bytes
-SHA1 (patch-aa) = 734d63b947e934eee8809bbd0b643bc6232f193c
+SHA1 (Mail-SpamAssassin-2.44.tar.gz) = f5f1289b2ce29ff656f83c5f90908a6abf486606
+Size (Mail-SpamAssassin-2.44.tar.gz) = 525059 bytes
 SHA1 (patch-ab) = df905aebb1e374a549808a5b925fbf9511dc3333
 SHA1 (patch-ac) = 229d234f56d113022f08d5b3250c4f12d6808636
 SHA1 (patch-ad) = 41a0130905fe000613a963acd7bb7cc8e743469c
-SHA1 (patch-ae) = 579b1705a3c56b822b5665b2c97c9989e2867e24
-SHA1 (patch-ag) = c712835745c8f435c5d7f19baed8bebcc657ccc6
-SHA1 (patch-ah) = e2db3d8c1c877be712f11b0eca674097821e6dcc
+SHA1 (patch-ae) = 4866c0c3d6478671d67d2a83548a0a1b9603b8e7
+SHA1 (patch-ag) = 59ae0f4f338d17ede8a944c99b1ad5437a6694c0
+SHA1 (patch-ah) = 5b2af5a9304857aaf4569414144e6b99066d73e2
diff --git a/mail/spamassassin/patches/patch-aa b/mail/spamassassin/patches/patch-aa
deleted file mode 100644
index 0361317f725..00000000000
--- a/mail/spamassassin/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/01/29 17:34:29 tron Exp $
-
---- spamd/libspamc.c.orig	2002-10-15 17:22:49.000000000 +0200
-+++ spamd/libspamc.c	2003-01-29 18:32:03.000000000 +0100
-@@ -309,7 +309,7 @@
-       case MESSAGE_BSMTP:
-         total=full_write(fd, m->pre, m->pre_len);
-         for(i=0; i<m->out_len; ){
--            for(j=0; i<m->out_len && j<sizeof(buffer)/sizeof(*buffer)-1; ){
-+            for(j=0; i<m->out_len && j<sizeof(buffer)/sizeof(*buffer)-2; ){
-                 if(i+1<m->out_len && m->out[i]=='\n' && m->out[i+1]=='.'){
-                     buffer[j++]=m->out[i++];
-                     buffer[j++]=m->out[i++];
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index 54de5850992..cb3ff869986 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2002/10/20 20:09:06 heinz Exp $
+$NetBSD: patch-ae,v 1.3 2003/02/02 19:38:40 heinz Exp $
 
---- spamd/spamd.raw.orig	Mon Oct 14 18:44:42 2002
+--- spamd/spamd.raw.orig	Fri Jan 31 15:49:03 2003
 +++ spamd/spamd.raw
-@@ -831,7 +831,8 @@
+@@ -837,7 +837,8 @@
  use POSIX 'setsid';
  sub daemonize
  {
diff --git a/mail/spamassassin/patches/patch-ag b/mail/spamassassin/patches/patch-ag
index 25b9693d99c..f51ac63f75e 100644
--- a/mail/spamassassin/patches/patch-ag
+++ b/mail/spamassassin/patches/patch-ag
@@ -1,16 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2002/11/06 21:51:27 heinz Exp $
+$NetBSD: patch-ag,v 1.3 2003/02/02 19:38:40 heinz Exp $
 
---- lib/Mail/SpamAssassin/Dns.pm.orig	Fri Oct  4 14:54:16 2002
+--- lib/Mail/SpamAssassin/Dns.pm.orig	Wed Nov 27 17:45:19 2002
 +++ lib/Mail/SpamAssassin/Dns.pm
-@@ -365,6 +365,7 @@
- 
-     eval {
-       local ($^W) = 0;    # argh, warnings in Razor
-+      local %ENV;
- 
-       require Razor2::Client::Agent;
- 
-@@ -389,6 +390,12 @@
+@@ -390,6 +390,12 @@
          my $objects = $rc->prepare_objects( \@msg )
            or die "error in prepare_objects";
          $rc->get_server_info() or die $rc->errprefix("checkit");
diff --git a/mail/spamassassin/patches/patch-ah b/mail/spamassassin/patches/patch-ah
index f2ae07cda71..9b2a7ed6c20 100644
--- a/mail/spamassassin/patches/patch-ah
+++ b/mail/spamassassin/patches/patch-ah
@@ -1,16 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2002/11/06 21:51:27 heinz Exp $
+$NetBSD: patch-ah,v 1.3 2003/02/02 19:38:40 heinz Exp $
 
---- lib/Mail/SpamAssassin/Reporter.pm.orig	Mon Oct 14 18:44:35 2002
+--- lib/Mail/SpamAssassin/Reporter.pm.orig	Wed Nov 27 17:45:21 2002
 +++ lib/Mail/SpamAssassin/Reporter.pm
-@@ -126,6 +126,7 @@
-   if ( !$@ ) {
-     eval {
-       local ($^W) = 0;    # argh, warnings in Razor
-+      local %ENV;
- 
-       local $SIG{ALRM} = sub { die "alarm\n" };
-       alarm $timeout;
-@@ -151,6 +152,12 @@
+@@ -152,6 +152,12 @@
          my $objects = $rc->prepare_objects( \@msg )
            or adie ("error in prepare_objects");
          $rc->get_server_info() or adie $rc->errprefix("reportit");