Updated postfix to 2.0.2

- Added MAILER-DAEMON to the list of always recognized local
  addresses, since it is generated by Postfix bounces.

- Bugfix: transport_errno was not reset upon successful
  transport map wildcard lookup after an earlier failure.

- Cleanup: unnecessary warnings from the proxymap client
  after proxymap server disconnect.

- Cleanup: Patrik Rak found a few more chattr invocations
  that were missed 20021209. Files: postfix-install,
  conf/post-install.

- Cleanup: the pcre-config command can produce null outputs.

- Bugfix: the virtual(8) Makefile included $(AUXLIBS) in the
  dependencies.

- Bugfix: fixed in the snapshots 20030105 but missed in the
  stable release. "sendmail -bs" tried to access the proxymap
  service.  It should not try to open any user/domain/uce
  related tables at all.

6 files changed, 18 insertions, 30 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4c361f4be5f..181383608b3 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2003/01/14 13:05:14 martti Exp $
+# $NetBSD: Makefile,v 1.74 2003/01/15 17:15:04 martti Exp $
 
-DISTNAME=	postfix-2.0.0.2
+DISTNAME=	postfix-2.0.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 10136df3e0f..114ae68ad5e 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/06 09:15:49 martti Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/15 17:15:04 martti Exp $
 bin/mailq
 bin/newaliases
 etc/mailer.conf.postfix
@@ -12,6 +12,7 @@ libexec/postfix/master
 libexec/postfix/nqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
+libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/showq
@@ -53,6 +54,7 @@ man/man8/master.8
 man/man8/nqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
+man/man8/proxymap.8
 man/man8/qmgr.8
 man/man8/qmqpd.8
 man/man8/showq.8
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 43313d1fc2d..26e7c10bb92 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.26 2003/01/06 09:15:49 martti Exp $
+$NetBSD: distinfo,v 1.27 2003/01/15 17:15:04 martti Exp $
 
-SHA1 (postfix/postfix-2.0.0.2.tar.gz) = 6282f5ed5c7c7a3349e4a72999e5ed096c9a7fdb
-Size (postfix/postfix-2.0.0.2.tar.gz) = 1325575 bytes
-SHA1 (patch-aa) = 01d0df30acc0ee454771ade263b6e793d0dba6a4
+SHA1 (postfix/postfix-2.0.2.tar.gz) = 0274801a1a268735f615256f37a02c6e7ea69300
+Size (postfix/postfix-2.0.2.tar.gz) = 1339432 bytes
+SHA1 (patch-aa) = 5bc8f2d888bea92cfa88ef154c852b63990ae03e
 SHA1 (patch-ab) = b414e4350e9004c3f45f591bc86663d9bf38464a
-SHA1 (patch-ac) = 0c79f73f1a9327e97ab6e6910d03b479c849d9f4
 SHA1 (patch-ad) = d4e536f5f0d482a759da0016ea79f78b0a87455c
 SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
-SHA1 (patch-af) = 61e0789b328b029a016ac45a9503186d6ee603cb
+SHA1 (patch-af) = 411187319b3d4b652abe38452f57a47786412565
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index e4ae0f21668..0960937cd01 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2002/03/06 15:07:54 martti Exp $
+$NetBSD: patch-aa,v 1.11 2003/01/15 17:15:05 martti Exp $
 
---- postfix-install.orig	Sat Feb 23 14:32:12 2002
-+++ postfix-install	Tue Mar  5 13:44:11 2002
-@@ -348,33 +348,13 @@
+--- postfix-install.orig	Tue Jan 14 19:57:32 2003
++++ postfix-install	Wed Jan 15 18:58:03 2003
+@@ -337,33 +337,13 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac
deleted file mode 100644
index 8a499c52224..00000000000
--- a/mail/postfix/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/03/06 15:07:54 martti Exp $
-
---- src/virtual/Makefile.in.orig	Wed Mar  6 15:52:14 2002
-+++ src/virtual/Makefile.in	Wed Mar  6 15:52:19 2002
-@@ -11,7 +11,7 @@
- PROG	= virtual
- TESTPROG= 
- INC_DIR	= ../../include
--LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a $(AUXLIBS)
-+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
- 
- .c.o:;	$(CC) $(CFLAGS) -c $*.c
- 
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index a0bcc8c4a13..0b66fcae2bb 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.12 2003/01/06 09:15:50 martti Exp $
+$NetBSD: patch-af,v 1.13 2003/01/15 17:15:06 martti Exp $
 
---- conf/main.cf.orig	Sat Dec 21 21:53:01 2002
-+++ conf/main.cf	Sat Dec 28 09:07:31 2002
+--- conf/main.cf.orig	Sun Jan  5 17:58:31 2003
++++ conf/main.cf	Wed Jan 15 18:59:15 2003
 @@ -31,13 +31,18 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.12 2003/01/06 09:15:50 martti Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -606,16 +611,16 @@
+@@ -608,16 +613,16 @@
  # commands.  This must be a group name with a numerical group ID that
  # is not shared with other accounts, not even with the Postfix account.
  #