Add patch taken from Courier CVS repository that fixes a memory-stomping

bug when reporting unknown local recipients.  Bump PKGREVISIONs of courier
and courier-mta.

3 files changed, 33 insertions, 5 deletions

diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 1cbe4127ee1..6138302201e 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/10/15 15:37:14 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2007/10/17 13:50:30 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/courier-mta/distinfo b/mail/courier-mta/distinfo
index dd5c7fdaa7a..d57a21c2a19 100644
--- a/mail/courier-mta/distinfo
+++ b/mail/courier-mta/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: distinfo,v 1.10 2007/10/17 13:50:30 jlam Exp $
 
 SHA1 (courier-0.57.1.tar.bz2) = 5e602d4a4d5dd33b17146c7f54467ac6352e9340
 RMD160 (courier-0.57.1.tar.bz2) = 28b9f409e281403280b69f3a4f4be8b9e4f74dc2
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = 0899aea066310909e4595974e5df69980a4db5d2
 SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3
 SHA1 (patch-af) = a3bcc672fc05e05497d7408c1a96ad52226aee01
 SHA1 (patch-ah) = 78e0db8d5319d985d7e8aec4c1240561fead3a00
-SHA1 (patch-ai) = a2172e61d38ccff3d877393bd968171e5fed124a
+SHA1 (patch-ai) = a66ce54eb2bc9ecb9905588a7bf5e3423ac57214
 SHA1 (patch-aj) = 5e3bcd5c8b0186dd048807deb6603102d05f1303
 SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
 SHA1 (patch-an) = 1c78baf7fc393b013c47745b914571aff94f1497
diff --git a/mail/courier-mta/patches/patch-ai b/mail/courier-mta/patches/patch-ai
index 01b017819b4..501e9edf2b5 100644
--- a/mail/courier-mta/patches/patch-ai
+++ b/mail/courier-mta/patches/patch-ai
@@ -1,8 +1,35 @@
-$NetBSD: patch-ai,v 1.2 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-ai,v 1.3 2007/10/17 13:50:30 jlam Exp $
 
 --- courier/module.local/local.c.orig	Sun Oct  7 16:37:52 2007
 +++ courier/module.local/local.c
-@@ -745,6 +745,8 @@ const char *quota;
+@@ -391,8 +391,6 @@ toalias:
+ 	}
+ 
+ not_found:
+-	if (hostdomain)	free(hostdomain);
+-
+ 	/*
+ 	** When submit is being called by the sendmail command line,
+ 	** don't reject unknown addresses, instead accept them (and bounce
+@@ -407,6 +405,8 @@ not_found:
+ 	{
+ 		free(addr);
+ 		(*delfunc)(rwi, rwi->ptr, rwi->ptr);
++		if (hostdomain)	free(hostdomain);
++
+ 		return;
+ 	}
+ 
+@@ -420,6 +420,8 @@ not_found:
+ 		snprintf(buf, 255, "User <%s> unknown",
+ 			 orig_addr ? orig_addr:"");
+ 		free(addr);
++		if (hostdomain)	free(hostdomain);
++
+ 		if (orig_addr)
+ 			free(orig_addr);
+ 		(*rwi->err_func)(550, buf, rwi);
+@@ -745,6 +747,8 @@ const char *quota;
  					strlen(argv[7])), "SENDER="),
  					argv[7]));