Postfix 2.2.1 import.

New features since 2.1.x:
  - built-in IPv6 and TLS (we no longer use patches--beware config changes!)
  - more sophisticated LDAP/MySQL/PostgreSQL support, with freeform queries
  - SMTP client-side connection reuse
  - by default, no longer rewrite message headers in mail from remote clients
  - can use your ISP account name for mail destined outside your machine
  - can selectively turn off ESMTP features in client or server
  - remote SMTP client resource control (the anvil server)
  - support for CDB, SDBM and NIS+ databases is now built into Postfix
  - new SMTP access control features
  - and more
Caution:
  - You MUST stop 2.1.x and earlier versions before upgrading.
  - Use the postfix upgrade program to upgrade your main.cf/master.cf.

4 files changed, 18 insertions, 62 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index be966cd7e01..1281a3c0083 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,20 +1,15 @@
-# $NetBSD: Makefile,v 1.157 2005/02/09 06:55:10 martti Exp $
+# $NetBSD: Makefile,v 1.158 2005/03/22 10:43:50 cjs Exp $
 
-DISTNAME=	postfix-2.1.5
-PKGREVISION=	5
+DISTNAME=	postfix-2.2.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-DIST_SUBDIR=	postfix
-
-CLASS_PATCH=		postfix-2.1.1-canonical_classes-with_docs.diff
-PATCHFILES+=		${CLASS_PATCH}
-SITES_${CLASS_PATCH}=	ftp://ftp.gw.com/pub/people/kim/patches/
-PATCH_DIST_STRIP.${CLASS_PATCH}=	-p1
 
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
 
+DIST_SUBDIR=	postfix
+
 CONFLICTS+=	sendmail-[0-9]* fastforward>=0.51nb2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 2d8036f39f6..29babec5de8 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,18 +1,10 @@
-$NetBSD: distinfo,v 1.82 2005/02/24 09:59:26 agc Exp $
+$NetBSD: distinfo,v 1.83 2005/03/22 10:43:50 cjs Exp $
 
-SHA1 (postfix/postfix-2.1.5.tar.gz) = bbc65c9fdc1cbd8e553816a5549b2685255cf69d
-RMD160 (postfix/postfix-2.1.5.tar.gz) = c0e078babbc3e76035fe4f502ea5fb3645e8ed92
-Size (postfix/postfix-2.1.5.tar.gz) = 1971931 bytes
-SHA1 (postfix/postfix-2.1.1-canonical_classes-with_docs.diff) = d11d839210db3aa6e0a62850cb45edabe257c3fe
-RMD160 (postfix/postfix-2.1.1-canonical_classes-with_docs.diff) = 9b9de40dba7b5520966aa6c3a10eeac27438cedf
-Size (postfix/postfix-2.1.1-canonical_classes-with_docs.diff) = 13110 bytes
-SHA1 (postfix/tls+ipv6-1.26-pf-2.1.5.patch.gz) = 6813eb7d1c1ac9a76a04b7495d540236aa0aa625
-RMD160 (postfix/tls+ipv6-1.26-pf-2.1.5.patch.gz) = ff2fb005681659476383fe4f32fd1d14e51fa9d9
-Size (postfix/tls+ipv6-1.26-pf-2.1.5.patch.gz) = 256725 bytes
-SHA1 (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 313d572bcd960e3cafd78ac9ee4b87bdc1f02fc8
-Size (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 239141 bytes
+SHA1 (postfix/postfix-2.2.1.tar.gz) = 06d5f1b4cbf16dec4189589ae744bc1a58943871
+RMD160 (postfix/postfix-2.2.1.tar.gz) = 8547ea001d8db07ff8f0cabf30589cd711c48644
+Size (postfix/postfix-2.2.1.tar.gz) = 2407157 bytes
 SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
 SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
-SHA1 (patch-ac) = f26b493c648c84af6ff70c54da82876eae8c2637
+SHA1 (patch-ac) = ffcd4f8b00c1cf01f050a0c943bfe61a1ec2361a
 SHA1 (patch-ag) = d5e9aab43b5d3be6df9ad8e3f03572b9a228f784
 SHA1 (patch-ai) = f166c2d52bfb8a441db22a9090312c0a2de56a6f
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index 8413fa1a514..7cdf925803c 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2005/02/09 06:55:10 martti Exp $
+# $NetBSD: options.mk,v 1.16 2005/03/22 10:43:50 cjs Exp $
 
 # Global and legacy options
 
@@ -19,42 +19,11 @@ AUXLIBS+=	${BUILDLINK_LDFLAGS.${BDB_TYPE}} ${BDB_LIBS}
 .endif
 
 ###
-### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/)
-###
-.if !empty(PKG_OPTIONS:Minet6)
-.  if empty(PKG_OPTIONS:Mtls)
-PKG_OPTIONS+=		tls
-.  endif
-IPV6TLS_PATCH=		tls+ipv6-1.26-pf-2.1.5.patch.gz
-PATCHFILES+=		${IPV6TLS_PATCH}
-SITES_${IPV6TLS_PATCH}=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.26/
-PATCH_DIST_STRIP.${IPV6TLS_PATCH}=	-p1
-PLIST_SRC+=		${PKGDIR}/PLIST.inet6
-
-post-patch: darwin-inet6-fix inet6-ni_withscopeid-fix
-darwin-inet6-fix:
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} \
-		< ${FILESDIR}/patch-darwin-inet6
-inet6-ni_withscopeid-fix:
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} \
-		< ${FILESDIR}/patch-inet6-ni_withscopeid
-.endif
-
-###
 ### STARTTLS support (http://mirrors.loonybin.net/postfix_tls/)
 ###
 .if !empty(PKG_OPTIONS:Mtls)
 .  include "../../security/openssl/buildlink3.mk"
-.  if empty(PKG_OPTIONS:Minet6)
-TLS_PATCH=		pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz
-PATCHFILES+=		${TLS_PATCH}
-SITES_${TLS_PATCH}=	http://mirrors.loonybin.net/postfix_tls/	\
-			ftp://mirrors.loonybin.net/pub/postfix_tls/	\
-			ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/
-PATCH_DIST_CAT.${TLS_PATCH}=	${TAR} -zxOf ${TLS_PATCH} "*/pfixtls.diff"
-PATCH_DIST_STRIP.${TLS_PATCH}=	-p1
-.  endif
-CCARGS+=	-DHAS_SSL
+CCARGS+=	-DUSE_TLS
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
 		-lssl -lcrypto
diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac
index e4821f28113..af6fd559fb3 100644
--- a/mail/postfix/patches/patch-ac
+++ b/mail/postfix/patches/patch-ac
@@ -1,27 +1,27 @@
-$NetBSD: patch-ac,v 1.10 2004/12/23 13:51:28 kim Exp $
+$NetBSD: patch-ac,v 1.11 2005/03/22 10:43:50 cjs Exp $
 
 See http://archives.neohapsis.com/archives/postfix/2004-08/1114.html
 and the preceding thread.  Fixes "smtp killed by signal 11" problems.
 
---- src/util/vstream.c.orig	2003-07-09 22:01:21.000000000 -0400
-+++ src/util/vstream.c	2004-12-23 01:21:52.000000000 -0500
-@@ -920,6 +920,10 @@
+--- src/util/vstream.c.old	2005-03-22 19:04:49.000000000 +0900
++++ src/util/vstream.c	2005-03-22 19:05:26.000000000 +0900
+@@ -926,6 +926,10 @@
       * policies. Either this, or the vstream*open() routines would have to
       * have a really ugly interface with lots of mostly-unused arguments (can
       * you say VMS?).
-+     *
++     * 
 +     * Initialize the I/O time (as documented) so that a time sensitive, "write
 +     * before read" application does not force flush the first data written
 +     * to a stream, potentially triggering NAGLE delays or other trouble.
       */
      stream = (VSTREAM *) mymalloc(sizeof(*stream));
      stream->fd = fd;
-@@ -933,7 +937,7 @@
+@@ -939,7 +943,7 @@
      stream->timeout = 0;
      stream->context = 0;
      stream->jbuf = 0;
 -    stream->iotime = 0;
-+    stream->iotime = time((time_t *) 0); /* as documented */
++    stream->iotime = time((time_t *) 0); /* as documented */;
      return (stream);
  }