pull postfix-users patch to correct sprious backslash.

update IPv6 patch.  fixes src/dst address family mismatch in src/smtp.

4 files changed, 31 insertions, 7 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 1d51652cfe9..65764fc1f9e 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2001/03/12 07:18:05 itojun Exp $
+# $NetBSD: Makefile,v 1.23 2001/03/18 14:02:00 itojun Exp $
 
 DISTNAME=	release-20010228
 PKGNAME=	postfix-20010228
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
-PATCHFILES=	postfix-20010228release-v6-20010312a.diff.gz \
+PATCHFILES=	postfix-20010228release-v6-20010318a.diff.gz \
 		postfix-20010228release-ercpt.diff
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/ \
 		ftp://ftp.gw.com/pub/people/kim/patches/
diff --git a/mail/postfix-current/files/md5 b/mail/postfix-current/files/md5
index a95a69f3623..e45889add7a 100644
--- a/mail/postfix-current/files/md5
+++ b/mail/postfix-current/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.14 2001/03/12 07:18:06 itojun Exp $
+$NetBSD: md5,v 1.15 2001/03/18 14:02:01 itojun Exp $
 
 SHA1 (postfix/release-20010228.tar.gz) = a3815938b963073053e833cc8adbaed7f6c71297
-SHA1 (postfix/postfix-20010228release-v6-20010312a.diff.gz) = 6991278d09e0e3dc699650c7698973e65be2a95a
+SHA1 (postfix/postfix-20010228release-v6-20010318a.diff.gz) = e53fe984c66cc32f83b6adbe4301af1ad162ccfd
 SHA1 (postfix/postfix-20010228release-ercpt.diff) = c6abc5d57ca1a36de85dadee878b266d707ad3cd
diff --git a/mail/postfix-current/files/patch-sum b/mail/postfix-current/files/patch-sum
index 768fe60e946..4512dcde2b3 100644
--- a/mail/postfix-current/files/patch-sum
+++ b/mail/postfix-current/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.12 2001/02/04 06:10:24 itojun Exp $
+$NetBSD: patch-sum,v 1.13 2001/03/18 14:02:01 itojun Exp $
 
-MD5 (patch-aa) = f7ac2eab459a10ba6223185b5fc781b0
-MD5 (patch-af) = 0ecd0dd8ffa61668aaab2422862f51b5
+SHA1 (patch-aa) = 0e54ee4a1538cbe116ff1c85cbcb50b08c09095b
+SHA1 (patch-af) = 1f96a9b36cc65b079839542cc4e7a3230318013c
+SHA1 (patch-ba) = feebe30fc918de0c8fe11ccfc1096230f1155166
diff --git a/mail/postfix-current/patches/patch-ba b/mail/postfix-current/patches/patch-ba
new file mode 100644
index 00000000000..10eba92a032
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ba
@@ -0,0 +1,23 @@
+$NetBSD: patch-ba,v 1.3 2001/03/18 14:02:01 itojun Exp $
+
+fix sprious \ in mail header.
+
+Message-Id: <20010313174719.35692BC070@spike.porcupine.org>
+Subject: PATCH (spurious \ in mail header)
+From: wietse@porcupine.org (Wietse Venema)
+To: Postfix users <postfix-users@postfix.org>
+Date: Tue, 13 Mar 2001 12:47:19 -0500 (EST)
+
+Index: src/global/tok822_parse.c
+diff -u -r1.1 -r1.2
+--- src/global/tok822_parse.c	2001/03/13 17:47:13	1.1
++++ src/global/tok822_parse.c	2001/03/16 11:57:53	1.2
+@@ -252,7 +252,7 @@
+ 	    VSTRING_ADDCH(vp, ')');
+ 	    break;
+ 	case TOK822_COMMENT_TEXT:
+-	    tok822_copy_quoted(vp, vstring_str(tp->vstr), "()\\\r\n");
++	    tok822_copy_quoted(vp, vstring_str(tp->vstr), "()\\");
+ 	    break;
+ 	case TOK822_QSTRING:
+ 	    VSTRING_ADDCH(vp, '"');