Updated postfix to 1.1.9

* add a MESSAGE file to describe how to activate postfix (pkg/13335)

Changes:
* Close user@domain@postfix-style.virtual.domain source routing relaying
  loophole involving postfix-style virtual domains with @virtual.domain
  catch-all patterns
* mail_addr_map() used the "wrong" @ character in addresses with multiple @.
* For address localpart quoting, now quote @ as a special character
  everywhere, except when resolving addresses. Previously, the @ was nowhere
  quoted as a special character, not even in SMTP commands.
* Don't allow an OK access rule lookup result for
  user@domain@postfix-style.virtual.domain.
* Quote unquoted address localparts that need quoting.
* The SMTP client logged and bounced the CNAME expanded recipient address,
  and thereby complicated trouble shooting.
* The SMTP and LMTP clients bounced the quoted recipient address, resulting
  in too much quoting in bounce reports.
* The LDAP client used the "wrong" @ character in addresses with multiple @.
* Forwards "postqueue -r" compatibility with the additional queue file
  records that are stored by snapshot 20050512.
* Specify "resolve_dequoted_address = no" to prevent Postfix from looking
  inside quotes for extra @ etc. characters when resolving an address.
  This behavior is technically more correct, but it opens a mail relay
  loophole with "user @domain"@domain when relaying mail to a Sendmail system.

4 files changed, 21 insertions, 18 deletions

diff --git a/mail/postfix/MESSAGE b/mail/postfix/MESSAGE
new file mode 100644
index 00000000000..5f2800efb5d
--- /dev/null
+++ b/mail/postfix/MESSAGE
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2002/05/14 06:57:23 martti Exp $
+
+To activate postfix:
+
+- Check the configuration files in /etc/postfix (see ${PREFIX}/share/postfix)
+- Modify /etc/mailer.conf (see ${PREFIX}/etc/mailer.conf.postfix)
+- Set postfix=YES in /etc/rc.conf
+===========================================================================
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4b91f389012..679d25976f3 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2002/05/05 14:46:27 martti Exp $
+# $NetBSD: Makefile,v 1.62 2002/05/14 06:57:24 martti Exp $
 
-DISTNAME=	postfix-1.1.8
+DISTNAME=	postfix-1.1.9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
@@ -89,18 +89,18 @@ post-build:
 	    <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix
 
 pre-install:
-	${INSTALL_DATA_DIR} /etc/postfix 
-	${INSTALL_DATA_DIR} ${PREFIX}/share/postfix 
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix 
+	${INSTALL_DATA_DIR} /etc/postfix
+	${INSTALL_DATA_DIR} ${PREFIX}/share/postfix
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/postfix
 	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/postfix \
 	    ${PREFIX}/libexec/postfix
 	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
 	-${RM} -f ${WRKSRC}/conf/*.orig
 .if defined(USE_SASL) && ${USE_SASL} == "YES"
-	echo "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
+	${ECHO} "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${PREFIX}/lib/sasl
-	echo lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl
+	${ECHO} lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl
 .endif
 	${TEST} -f /etc/postfix/postfix-files || \
 		${INSTALL_DATA} ${WRKSRC}/conf/postfix-files /etc/postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index c99081a5c3f..9ee29153e83 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2002/05/05 14:46:27 martti Exp $
+$NetBSD: distinfo,v 1.19 2002/05/14 06:57:24 martti Exp $
 
-SHA1 (postfix/postfix-1.1.8.tar.gz) = 4b82a6de31a49578797c85300d39c539bdc71702
-Size (postfix/postfix-1.1.8.tar.gz) = 1187634 bytes
+SHA1 (postfix/postfix-1.1.9.tar.gz) = 8f778aeb71b1aafb12dc591ac4f1976df6295270
+Size (postfix/postfix-1.1.9.tar.gz) = 1190272 bytes
 SHA1 (patch-aa) = 01d0df30acc0ee454771ade263b6e793d0dba6a4
 SHA1 (patch-ab) = d4e50ffc31d71ff64067101f6d733655fcf76713
 SHA1 (patch-ac) = 0c79f73f1a9327e97ab6e6910d03b479c849d9f4
 SHA1 (patch-ad) = 78f24bf3f7e6829c2a5c9a402e33dea25f1a55d2
 SHA1 (patch-ae) = 66908f37243ce4da24129ccb53120b4e068ffa1d
-SHA1 (patch-af) = 606510ca128f70ac2f5972313039248c11130bb0
+SHA1 (patch-af) = fbee5a8854857e2a99c59bcfaee4775df735f086
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 6f187db7475..191d3185ca3 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,13 +1,7 @@
-$NetBSD: patch-af,v 1.10 2002/03/27 07:17:10 martti Exp $
+$NetBSD: patch-af,v 1.11 2002/05/14 06:57:25 martti Exp $
 
 --- conf/main.cf.orig	Mon Mar 25 21:09:24 2002
 +++ conf/main.cf	Wed Mar 27 07:33:47 2002
-@@ -1,3 +1,5 @@
-+#	$NetBSD: patch-af,v 1.10 2002/03/27 07:17:10 martti Exp $
-+#
- # Global Postfix configuration file. This file lists only a subset
- # of all 100+ parameters. See the sample-xxx.cf files for a full list.
- # 
 @@ -31,14 +33,19 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.  The default value is $program_directory.