5 files changed, 30 insertions, 32 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index f4395999a5a..46e87aeddfe 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.90 2003/03/21 05:21:23 taca Exp $
+# $NetBSD: Makefile,v 1.91 2003/04/17 06:22:18 martti Exp $
 
-DISTNAME=	postfix-2.0.7
+DISTNAME=	postfix-2.0.8
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 029397e5b1e..dc426bc8696 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.38 2003/03/21 05:21:24 taca Exp $
+$NetBSD: distinfo,v 1.39 2003/04/17 06:22:18 martti Exp $
 
-SHA1 (postfix/postfix-2.0.7.tar.gz) = 6f7567f780239e4372192171365d858c37c08fac
-Size (postfix/postfix-2.0.7.tar.gz) = 1345929 bytes
-SHA1 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = 5b2fb37d4e211cd41b422d89179845190f223d94
-Size (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = 95608 bytes
-SHA1 (patch-aa) = 5bc8f2d888bea92cfa88ef154c852b63990ae03e
-SHA1 (patch-ad) = d4e536f5f0d482a759da0016ea79f78b0a87455c
+SHA1 (postfix/postfix-2.0.8.tar.gz) = d41e6e8d6cc381fb5234fdeb7404a424b5130420
+Size (postfix/postfix-2.0.8.tar.gz) = 1347496 bytes
+SHA1 (patch-aa) = f45060427494d6ea9c415a20add1f5aab547ba34
+SHA1 (patch-ad) = 2f83cc6108eea4a1c401fe9e549d93430166f7fa
 SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
 SHA1 (patch-af) = 1020280735f4d4aeb352f576e00e3bdb28f152a6
-SHA1 (patch-ag) = 424aa8485737638914d66916b9ce4f827da21d3a
+SHA1 (patch-ag) = 7c59f4bee987dedc2fd5f193a8d5c980ac09ae82
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index 0960937cd01..521294995c7 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2003/01/15 17:15:05 martti Exp $
+$NetBSD: patch-aa,v 1.12 2003/04/17 06:22:18 martti Exp $
 
---- postfix-install.orig	Tue Jan 14 19:57:32 2003
-+++ postfix-install	Wed Jan 15 18:58:03 2003
-@@ -337,33 +337,13 @@
+--- postfix-install.orig	2003-03-21 21:04:53.000000000 +0200
++++ postfix-install	2003-04-17 08:53:23.000000000 +0300
+@@ -338,33 +338,13 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
diff --git a/mail/postfix/patches/patch-ad b/mail/postfix/patches/patch-ad
index 9d6c6558b5d..e51c1069e64 100644
--- a/mail/postfix/patches/patch-ad
+++ b/mail/postfix/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2003/01/06 09:15:50 martti Exp $
+$NetBSD: patch-ad,v 1.6 2003/04/17 06:22:19 martti Exp $
 
---- conf/sample-misc.cf.orig	Wed Dec 18 01:42:28 2002
-+++ conf/sample-misc.cf	Sat Dec 28 08:52:35 2002
-@@ -350,7 +350,7 @@
+--- conf/sample-misc.cf.orig	2003-03-20 22:51:12.000000000 +0200
++++ conf/sample-misc.cf	2003-04-17 08:53:55.000000000 +0300
+@@ -357,7 +357,7 @@
  # The daemon_directory parameter specifies the location of Postfix
  # support programs and daemons. This directory must be owned by root.
  #
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index c9e50a87337..70c1f884911 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2003/03/20 22:23:22 christos Exp $
+$NetBSD: patch-ag,v 1.8 2003/04/17 06:22:19 martti Exp $
 
---- src/cleanup/cleanup.c	Mon Nov  5 11:25:58 2001
-+++ src/cleanup/cleanup.c	Thu Jan 17 21:50:18 2002
-@@ -281,6 +281,7 @@
+--- src/cleanup/cleanup.c.orig	2002-12-20 03:33:40.000000000 +0200
++++ src/cleanup/cleanup.c	2003-04-17 08:54:39.000000000 +0300
+@@ -333,6 +333,7 @@
       * Pass control to the single-threaded service skeleton.
       */
      single_server_main(argc, argv, cleanup_service,
@@ -10,9 +10,9 @@ $NetBSD: patch-ag,v 1.7 2003/03/20 22:23:22 christos Exp $
  		       MAIL_SERVER_INT_TABLE, cleanup_int_table,
  		       MAIL_SERVER_STR_TABLE, cleanup_str_table,
  		       MAIL_SERVER_TIME_TABLE, cleanup_time_table,
---- src/cleanup/cleanup.h	Tue Oct 30 19:39:06 2001
-+++ src/cleanup/cleanup.h	Thu Jan 17 21:50:18 2002
-@@ -109,6 +109,7 @@
+--- src/cleanup/cleanup.h.orig	2002-12-03 16:58:11.000000000 +0200
++++ src/cleanup/cleanup.h	2003-04-17 08:54:39.000000000 +0300
+@@ -118,6 +118,7 @@
  extern void cleanup_all(void);
  extern void cleanup_pre_jail(char *, char **);
  extern void cleanup_post_jail(char *, char **);
@@ -20,8 +20,8 @@ $NetBSD: patch-ag,v 1.7 2003/03/20 22:23:22 christos Exp $
  extern CONFIG_INT_TABLE cleanup_int_table[];
  extern CONFIG_STR_TABLE cleanup_str_table[];
  extern CONFIG_TIME_TABLE cleanup_time_table[];
---- src/cleanup/cleanup_envelope.c.orig	2002-11-01 08:34:02.000000000 -0500
-+++ src/cleanup/cleanup_envelope.c	2003-03-20 17:09:12.000000000 -0500
+--- src/cleanup/cleanup_envelope.c.orig	2002-11-01 15:34:02.000000000 +0200
++++ src/cleanup/cleanup_envelope.c	2003-04-17 08:54:39.000000000 +0300
 @@ -192,15 +192,19 @@
  	if (state->orig_rcpt == 0)
  	    state->orig_rcpt = mystrdup(buf);
@@ -51,8 +51,8 @@ $NetBSD: patch-ag,v 1.7 2003/03/20 22:23:22 christos Exp $
  	cleanup_out_recipient(state, state->orig_rcpt, STR(clean_addr));
  	if (state->recip == 0)
  	    state->recip = mystrdup(STR(clean_addr));
---- src/cleanup/cleanup_init.c.orig	2002-12-03 09:56:56.000000000 -0500
-+++ src/cleanup/cleanup_init.c	2003-03-20 17:10:34.000000000 -0500
+--- src/cleanup/cleanup_init.c.orig	2002-12-03 16:56:56.000000000 +0200
++++ src/cleanup/cleanup_init.c	2003-04-17 08:54:39.000000000 +0300
 @@ -6,6 +6,8 @@
  /* SYNOPSIS
  /*	#include "cleanup.h"
@@ -91,9 +91,9 @@ $NetBSD: patch-ag,v 1.7 2003/03/20 22:23:22 christos Exp $
   /*
    * Mappings.
    */
---- src/global/mail_params.h	Tue Jan 15 10:24:34 2002
-+++ src/global/mail_params.h	Thu Jan 17 21:50:19 2002
-@@ -295,6 +295,10 @@
+--- src/global/mail_params.h.orig	2003-04-17 08:54:22.000000000 +0300
++++ src/global/mail_params.h	2003-04-17 08:54:39.000000000 +0300
+@@ -324,6 +324,10 @@
  #define DEF_RCPT_CANON_MAPS	""
  extern char *var_rcpt_canon_maps;