Updated to the latest development release.

6 files changed, 37 insertions, 33 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index d036b8caef1..2be29945820 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2009/08/31 09:37:49 martti Exp $
+# $NetBSD: Makefile,v 1.110 2009/12/13 08:55:57 martti Exp $
 
-DISTNAME=	postfix-2.7-20090828
-PKGNAME=	postfix-2.7.20090828
+DISTNAME=	postfix-2.7-20091209
+PKGNAME=	postfix-2.7.20091209
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
 MASTER_SITES+=	http://postfix.it-austria.net/releases/experimental/
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index c9c9d8e7d06..ee2f0fd4143 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:04:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/12/13 08:55:57 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/discard
+libexec/postfix/dnsblog
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
@@ -21,6 +22,7 @@ libexec/postfix/postfix-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script
+libexec/postfix/postscreen
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
@@ -75,6 +77,7 @@ man/man8/bounce.8
 man/man8/cleanup.8
 man/man8/defer.8
 man/man8/discard.8
+man/man8/dnsblog.8
 man/man8/error.8
 man/man8/flush.8
 man/man8/lmtp.8
@@ -83,6 +86,7 @@ man/man8/master.8
 man/man8/oqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
+man/man8/postscreen.8
 man/man8/proxymap.8
 man/man8/qmgr.8
 man/man8/qmqpd.8
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 26f7e8f44f8..1d39493ebd0 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.55 2009/08/31 09:37:49 martti Exp $
+$NetBSD: distinfo,v 1.56 2009/12/13 08:55:57 martti Exp $
 
-SHA1 (postfix/postfix-2.7-20090828.tar.gz) = fb311bea397d5ba92fb5bef04bf9153edeee80c9
-RMD160 (postfix/postfix-2.7-20090828.tar.gz) = 163f33c7936960027bee50f9eec400d8e31d874f
-Size (postfix/postfix-2.7-20090828.tar.gz) = 3335807 bytes
+SHA1 (postfix/postfix-2.7-20091209.tar.gz) = 0c033f4015825147273a4e7206643873ae305902
+RMD160 (postfix/postfix-2.7-20091209.tar.gz) = be0a008172b49739f03e5efda5af875cf4ceba08
+Size (postfix/postfix-2.7-20091209.tar.gz) = 3385941 bytes
 SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
-SHA1 (patch-ag) = 85dee76cc7dafcdb57d2dfa7af8e9e0e96f747fa
-SHA1 (patch-ai) = 809f63e6e4e61b3c2cecc49ee0a4c7cabc97844e
-SHA1 (patch-as) = eb57a7bbfad7bd7f2a13eed9d0429f63e93af622
+SHA1 (patch-ag) = 24f57981d99f6515329b313bff627655abe0342e
+SHA1 (patch-ai) = f681187d6cf1f1793ecbf946a4aecee278d11f3d
+SHA1 (patch-as) = 8f16d7eda96c1fdbe76fb0a5294148dbf6148171
 SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
 SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf
 SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index 4b44bf63346..b00a17bfb15 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.20 2009/05/13 10:34:06 martti Exp $
+$NetBSD: patch-ag,v 1.21 2009/12/13 08:55:57 martti Exp $
 
 Only define HAS_DB if it hasn't been defined.
 Add support for NetBSD 5.x and DragonFly BSD.
 
---- src/util/sys_defs.h.orig	2009-05-11 03:45:27.000000000 +0300
-+++ src/util/sys_defs.h	2009-05-13 12:25:40.000000000 +0300
-@@ -28,8 +28,8 @@
+--- src/util/sys_defs.h.orig	2009-11-15 01:32:37.000000000 +0200
++++ src/util/sys_defs.h	2009-12-13 10:46:54.000000000 +0200
+@@ -29,8 +29,8 @@
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
      || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
@@ -16,7 +16,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  #define SUPPORTED
  #include <sys/types.h>
  #include <sys/param.h>
-@@ -42,7 +42,9 @@
+@@ -43,7 +43,9 @@
  #define DEF_MAILBOX_LOCK "flock, dotlock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
@@ -26,7 +26,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  #define HAS_SA_LEN
  #define DEF_DB_TYPE	"hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -158,9 +160,19 @@
+@@ -163,9 +165,19 @@
  #define HAS_FUTIMES
  #endif
  
@@ -46,7 +46,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
      || defined(USAGI_LIBINET6)
  #ifndef NO_IPV6
  # define HAS_IPV6
-@@ -169,14 +181,16 @@
+@@ -174,14 +186,16 @@
  
  #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
      || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index 2b3f63576eb..15f9a4c0735 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,20 +1,20 @@
-$NetBSD: patch-ai,v 1.23 2009/05/13 10:34:06 martti Exp $
+$NetBSD: patch-ai,v 1.24 2009/12/13 08:55:57 martti Exp $
 
 Make this pkgsrc friendly.
 Add support for NetBSD 5.x and DragonFly BSD.
 
---- makedefs.orig	2009-05-12 00:26:46.000000000 +0300
-+++ makedefs	2009-05-13 12:26:34.000000000 +0300
-@@ -144,6 +144,8 @@
+--- makedefs.orig	2009-11-10 02:44:41.000000000 +0200
++++ makedefs	2009-12-13 10:47:16.000000000 +0200
+@@ -146,6 +146,8 @@
  		;;
-   FreeBSD.7*)	SYSTYPE=FREEBSD7
+   FreeBSD.8*)	SYSTYPE=FREEBSD8
  		;;
 + DragonFly.*)	SYSTYPE=DRAGONFLY
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -160,6 +162,8 @@
+@@ -162,6 +164,8 @@
  		;;
     NetBSD.4*)	SYSTYPE=NETBSD4
  		;;
@@ -23,7 +23,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
     BSD/OS.3*)	SYSTYPE=BSDI3
-@@ -212,13 +216,6 @@
+@@ -214,13 +218,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -37,7 +37,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -250,25 +247,8 @@
+@@ -252,25 +249,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -63,7 +63,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -279,7 +259,6 @@
+@@ -281,7 +261,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -71,7 +71,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -372,25 +351,13 @@
+@@ -383,25 +362,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"
diff --git a/mail/postfix-current/patches/patch-as b/mail/postfix-current/patches/patch-as
index f7279d00236..02bd980d6da 100644
--- a/mail/postfix-current/patches/patch-as
+++ b/mail/postfix-current/patches/patch-as
@@ -1,9 +1,9 @@
-$NetBSD: patch-as,v 1.5 2009/05/13 10:34:06 martti Exp $
+$NetBSD: patch-as,v 1.6 2009/12/13 08:55:57 martti Exp $
 
 Support for sqlite.
 
---- src/global/Makefile.in.orig	2009-02-13 03:25:05.000000000 +0200
-+++ src/global/Makefile.in	2009-05-13 12:27:54.000000000 +0300
+--- src/global/Makefile.in.orig	2009-10-07 03:09:52.000000000 +0300
++++ src/global/Makefile.in	2009-12-13 10:48:04.000000000 +0200
 @@ -4,7 +4,7 @@
  	clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \
  	defer.c deliver_completed.c deliver_flock.c deliver_pass.c \
@@ -31,7 +31,7 @@ Support for sqlite.
  	dot_lockfile.h dot_lockfile_as.h dsb_scan.h dsn.h dsn_buf.h \
  	dsn_mask.h dsn_print.h dsn_util.h ehlo_mask.h ext_prop.h \
  	file_id.h flush_clnt.h header_opts.h header_token.h input_transp.h \
-@@ -862,6 +862,13 @@
+@@ -868,6 +868,13 @@
  dict_proxy.o: dict_proxy.h
  dict_proxy.o: mail_params.h
  dict_proxy.o: mail_proto.h
@@ -45,7 +45,7 @@ Support for sqlite.
  domain_list.o: ../../include/match_list.h
  domain_list.o: ../../include/match_ops.h
  domain_list.o: ../../include/sys_defs.h
-@@ -1233,6 +1240,7 @@
+@@ -1239,6 +1246,7 @@
  mail_dict.o: dict_mysql.h
  mail_dict.o: dict_pgsql.h
  mail_dict.o: dict_proxy.h