Updated postfix to 2.2.8

Postfix 2.2.8 backs out a workaround for broken servers/firewalls
that created more problems than it solved.

- The Postfix 2.2.6 paranoia about malformed remote server replies
  caused "multiple delivery" problems or "no delivery" problems with
  broken servers/firewalls. Postfix still logs a warning but no longer
  defers delivery.

3 files changed, 18 insertions, 18 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index f7ecbd4acba..008fb75369f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.174 2006/01/08 18:35:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.175 2006/01/10 06:38:14 martti Exp $
 
-DISTNAME=	postfix-2.2.6
-PKGREVISION=	2
+DISTNAME=	postfix-2.2.8
+#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 397cd3158ef..149d0c86a77 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.94 2005/12/01 06:46:40 martti Exp $
+$NetBSD: distinfo,v 1.95 2006/01/10 06:38:15 martti Exp $
 
-SHA1 (postfix/postfix-2.2.6.tar.gz) = 938ab8d2b1e02b18515ff6de57782e7e483b609d
-RMD160 (postfix/postfix-2.2.6.tar.gz) = d7af42d4e407a812ad99fbddcc2c30327c78f487
-Size (postfix/postfix-2.2.6.tar.gz) = 2433005 bytes
+SHA1 (postfix/postfix-2.2.8.tar.gz) = 1949863d07b4590208359c2e81b270c107514e51
+RMD160 (postfix/postfix-2.2.8.tar.gz) = 449a6b417bafbcd598a96979b5de5af40b3f663e
+Size (postfix/postfix-2.2.8.tar.gz) = 2434615 bytes
 SHA1 (patch-aa) = 49d2bf6c7e5bbe5aac4d950ac69c7b6b32a98ef3
-SHA1 (patch-ai) = d3ea006bafb5e9df869fbb2dec8c7f53b160c8e0
+SHA1 (patch-ai) = 80db725720eb46083f69785ce3616b7a461e850a
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 2cf9873b0b0..f3075588e44 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.14 2005/10/13 13:06:38 joerg Exp $
+$NetBSD: patch-ai,v 1.15 2006/01/10 06:38:15 martti Exp $
 
---- makedefs.orig	2005-02-22 13:35:52.000000000 +0100
-+++ makedefs
-@@ -116,6 +116,8 @@ case "$SYSTEM.$RELEASE" in
+--- makedefs.orig	2006-01-03 23:50:25.000000000 +0200
++++ makedefs	2006-01-09 08:11:32.000000000 +0200
+@@ -118,6 +118,8 @@
  		;;
-   FreeBSD.5*)	SYSTYPE=FREEBSD5
+   FreeBSD.6*)	SYSTYPE=FREEBSD6
  		;;
 +  DragonFly.1*) SYSTYPE=FREEBSD4
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -124,7 +126,7 @@ case "$SYSTEM.$RELEASE" in
+@@ -126,7 +128,7 @@
  		;;
     NetBSD.1*)	SYSTYPE=NETBSD1
  		;;
@@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.14 2005/10/13 13:06:38 joerg Exp $
  		;;
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
-@@ -175,13 +177,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -177,13 +179,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -34,7 +34,7 @@ $NetBSD: patch-ai,v 1.14 2005/10/13 13:06:38 joerg Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -213,25 +208,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -215,25 +210,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -60,7 +60,7 @@ $NetBSD: patch-ai,v 1.14 2005/10/13 13:06:38 joerg Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -242,7 +220,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -244,7 +222,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -68,7 +68,7 @@ $NetBSD: patch-ai,v 1.14 2005/10/13 13:06:38 joerg Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -270,25 +247,13 @@ case "$SYSTEM.$RELEASE" in
+@@ -272,25 +249,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"