 @@ -1,74 +1,80 @@
-@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/05/13 10:34:06 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/main.cf
 libexec/postfix/master
 libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/post-install
 libexec/postfix/postfix-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/tlsmgr
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
 man/man1/mailq.1
 man/man1/newaliases.1
 man/man1/postalias.1
 man/man1/postcat.1
 man/man1/postconf.1
 man/man1/postdrop.1
 man/man1/postfix.1
 man/man1/postkick.1
 man/man1/postlock.1
 man/man1/postlog.1
 man/man1/postmap.1
 man/man1/postmulti.1
 man/man1/postqueue.1
 man/man1/postsuper.1
 man/man1/qshape.1
 man/man1/sendmail.1
 man/man5/access.5
 man/man5/aliases.5
 man/man5/body_checks.5
 man/man5/bounce.5
 man/man5/canonical.5
 man/man5/cidr_table.5
 man/man5/generic.5
 man/man5/header_checks.5
 man/man5/ldap_table.5
 man/man5/master.5
 man/man5/mysql_table.5
 man/man5/nisplus_table.5
 man/man5/pcre_table.5
 man/man5/pgsql_table.5
 man/man5/postconf.5
 man/man5/postfix-wrapper.5
 man/man5/regexp_table.5
 man/man5/relocated.5
 man/man5/tcp_table.5
 man/man5/transport.5
 man/man5/virtual.5
 man/man8/anvil.8
 man/man8/bounce.8
 man/man8/cleanup.8
 man/man8/defer.8
 man/man8/discard.8
 man/man8/error.8
 man/man8/flush.8
 man/man8/lmtp.8
 @@ -116,26 +122,27 @@ share/doc/postfix/CONTENT_INSPECTION_REA
 share/doc/postfix/DATABASE_README
 share/doc/postfix/DB_README
 share/doc/postfix/DEBUG_README
 share/doc/postfix/DSN_README
 share/doc/postfix/ETRN_README
 share/doc/postfix/FILTER_README
 share/doc/postfix/INSTALL
 share/doc/postfix/IPV6_README
 share/doc/postfix/LDAP_README
 share/doc/postfix/LINUX_README
 share/doc/postfix/LOCAL_RECIPIENT_README
 share/doc/postfix/MAILDROP_README
 share/doc/postfix/MILTER_README
 share/doc/postfix/MULTI_INSTANCE_README
 share/doc/postfix/MYSQL_README
 share/doc/postfix/NFS_README
 share/doc/postfix/OVERVIEW
 share/doc/postfix/PACKAGE_README
 share/doc/postfix/PCRE_README
 share/doc/postfix/PGSQL_README
 share/doc/postfix/QSHAPE_README
 share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/RESTRICTION_CLASS_README
 share/doc/postfix/SASL_README
 share/doc/postfix/SCHEDULER_README
 share/doc/postfix/SMTPD_ACCESS_README
 share/doc/postfix/SMTPD_POLICY_README

 @@ -1,62 +1,62 @@
-$NetBSD: patch-ag,v 1.19 2008/11/03 00:47:36 taca Exp $
+$NetBSD: patch-ag,v 1.20 2009/05/13 10:34:06 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	2008-08-23 05:47:16.000000000 +0900
+--- src/util/sys_defs.h.orig	2009-05-11 03:45:27.000000000 +0300
-+++ src/util/sys_defs.h
++++ src/util/sys_defs.h	2009-05-13 12:25:40.000000000 +0300
 @@ -28,8 +28,8 @@
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
      || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
 -    || defined(NETBSD4) \
 -    || defined(EKKOBSD1)
 +    || defined(NETBSD4) || defined(NETBSD5) \
 +    || defined(EKKOBSD1) || defined(DRAGONFLY)
  #define SUPPORTED
  #include <sys/types.h>
  #include <sys/param.h>
 @@ -42,7 +42,9 @@
  #define DEF_MAILBOX_LOCK "flock, dotlock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
 +#ifndef HAS_DB
  #define HAS_DB
 +#endif
  #define HAS_SA_LEN
  #define DEF_DB_TYPE	"hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -155,9 +157,19 @@
+@@ -158,9 +160,19 @@
  #define HAS_FUTIMES
  #endif
 +#if defined(__DragonFly__)
 +#define HAS_DEV_URANDOM
 +#define HAS_ISSETUGID
 +#define HAS_FUTIMES
 +#define SOCKADDR_SIZE	socklen_t
 +#define SOCKOPT_SIZE	socklen_t
 +#define HAS_DUPLEX_PIPE
 +#endif
++
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \
      || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \
      || (defined(OpenBSD) && OpenBSD >= 200003) \
 +    || defined(__DragonFly__) \
      || defined(USAGI_LIBINET6)
  #ifndef NO_IPV6
  # define HAS_IPV6
-@@ -166,14 +178,16 @@
+@@ -169,14 +181,16 @@
  #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
      || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
 -    || (defined(OpenBSD) && OpenBSD >= 199700)	/* OpenBSD 2.0?? */
 +    || (defined(OpenBSD) && OpenBSD >= 199700)	/* OpenBSD 2.0?? */ \
 +    || defined(__DragonFly__)
  # define USE_SYSV_POLL
  #endif
  #ifndef NO_KQUEUE
  # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \
      || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \
 -    || (defined(OpenBSD) && OpenBSD >= 200105)	/* OpenBSD 2.9 */

 @@ -1,87 +1,87 @@
-$NetBSD: patch-ai,v 1.22 2008/11/03 00:47:36 taca Exp $
+$NetBSD: patch-ai,v 1.23 2009/05/13 10:34:06 martti Exp $
 Make this pkgsrc friendly.
 Add support for NetBSD 5.x and DragonFly BSD.
---- makedefs.orig	2008-09-04 08:46:54.000000000 +0900
+--- makedefs.orig	2009-05-12 00:26:46.000000000 +0300
-+++ makedefs
++++ makedefs	2009-05-13 12:26:34.000000000 +0300
-@@ -144,6 +144,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -144,6 +144,8 @@
  		;;
    FreeBSD.7*)	SYSTYPE=FREEBSD7
  		;;
 + DragonFly.*)	SYSTYPE=DRAGONFLY
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -160,6 +162,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -160,6 +162,8 @@
  		;;
     NetBSD.4*)	SYSTYPE=NETBSD4
  		;;
 +   NetBSD.5*)	SYSTYPE=NETBSD5
 +		;;
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
     BSD/OS.3*)	SYSTYPE=BSDI3
-@@ -210,13 +214,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -212,13 +216,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
 -		if [ -f /usr/local/lib/libdb.a ]; then
 -		    SYSLIBS="$SYSLIBS -ldb"
 -		    CCARGS="$CCARGS -DHAS_DB"
 -		    if [ -d /usr/local/include/db ]; then
 -			CCARGS="$CCARGS -I/usr/local/include/db"
 -		    fi
 -		fi
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -248,25 +245,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -250,25 +247,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
 -		SYSLIBS="-ldb"
  		;;
      Linux.2*)	SYSTYPE=LINUX2
 -		# Postfix no longer needs DB 1.85 compatibility
 -		if [ -f /usr/include/db.h ]
 -		then
 -		    : we are all set
 -		elif [ -f /usr/include/db/db.h ]
 -		then
 -		    CCARGS="$CCARGS -I/usr/include/db"
 -		else
 -		    # No, we're not going to try db1 db2 db3 etc.
 -		    # On a properly installed system, Postfix builds
 -		    # by including <db.h> and by linking with -ldb
 -		    echo "No <db.h> include file found." 1>&2
 -		    echo "Install the appropriate db*-devel package first." 1>&2
 -		    echo "See the RELEASE_NOTES file for more information." 1>&2
 -		    exit 1
 -		fi
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -277,7 +257,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -279,7 +259,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
 -		SYSLIBS="-ldb"
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -370,25 +349,13 @@ EOF
+@@ -372,25 +351,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"
 -		if [ -f /usr/lib/libdb.a ]; then
 -		    CCARGS="$CCARGS -DHAS_DB"
 -		    SYSLIBS="$SYSLIBS -ldb"
 -		fi
  		;;
  HP-UX.B.10.*)	SYSTYPE=HPUX10
  		CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
  		    (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
 -		if [ -f /usr/lib/libdb.a ]; then
 -		    CCARGS="$CCARGS -DHAS_DB"

 @@ -1,55 +1,55 @@
-$NetBSD: patch-as,v 1.4 2008/10/16 09:56:58 martti Exp $
+$NetBSD: patch-as,v 1.5 2009/05/13 10:34:06 martti Exp $
 Support for sqlite.
---- src/global/Makefile.in.orig	2007-12-06 14:49:03.000000000 +0100
+--- src/global/Makefile.in.orig	2009-02-13 03:25:05.000000000 +0200
-+++ src/global/Makefile.in
++++ src/global/Makefile.in	2009-05-13 12:27:54.000000000 +0300
 @@ -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 \
  	deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \
 -	dict_proxy.c domain_list.c dot_lockfile.c dot_lockfile_as.c \
 +	dict_proxy.c dict_sqlite.c  domain_list.c dot_lockfile.c dot_lockfile_as.c \
  	dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \
  	ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \
  	header_token.c input_transp.c int_filt.c is_header.c log_adhoc.c \
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  	clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \
  	defer.o deliver_completed.o deliver_flock.o deliver_pass.o \
  	deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \
 -	dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \
 +	dict_proxy.o dict_sqlite.o domain_list.o dot_lockfile.o dot_lockfile_as.o \
  	dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \
  	ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \
  	header_token.o input_transp.o int_filt.o is_header.o log_adhoc.o \
-@@ -63,7 +63,7 @@
+@@ -65,7 +65,7 @@
  	canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \
  	conv_time.h db_common.h debug_peer.h debug_process.h defer.h \
  	deliver_completed.h deliver_flock.h deliver_pass.h deliver_request.h \
 -	dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h domain_list.h \
 +	dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h dict_sqlite.h domain_list.h \
  	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 \
-@@ -860,6 +860,13 @@
+@@ -862,6 +862,13 @@
  dict_proxy.o: dict_proxy.h
  dict_proxy.o: mail_params.h
  dict_proxy.o: mail_proto.h
 +dict_sqlite.o: ../../include/dict.h
 +dict_sqlite.o: ../../include/msg.h
 +dict_sqlite.o: ../../include/sys_defs.h
 +dict_sqlite.o: cfg_parser.h
 +dict_sqlite.o: db_common.h
 +dict_sqlite.o: dict_sqlite.c
 +dict_sqlite.o: dict_sqlite.h
  domain_list.o: ../../include/match_list.h
  domain_list.o: ../../include/match_ops.h
  domain_list.o: ../../include/sys_defs.h
-@@ -1219,6 +1226,7 @@
+@@ -1233,6 +1240,7 @@
  mail_dict.o: dict_mysql.h
  mail_dict.o: dict_pgsql.h
  mail_dict.o: dict_proxy.h
 +mail_dict.o: dict_sqlite.h
  mail_dict.o: mail_dict.c
  mail_dict.o: mail_dict.h
  mail_error.o: ../../include/name_mask.h

 @@ -1,20 +1,20 @@
-$NetBSD: patch-at,v 1.4 2008/10/16 09:56:58 martti Exp $
+$NetBSD: patch-at,v 1.5 2009/05/13 10:34:06 martti Exp $
 Support for sqlite.
 --- src/global/dict_sqlite.c.orig	2008-10-17 00:40:21.000000000 +0200
 +++ src/global/dict_sqlite.c
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,254 @@
 +/*++
 +/* NAME
 +/*	dict_sqlite 3
 +/* SUMMARY
 +/*	dictionary manager interface to SQLite3 databases
 +/* SYNOPSIS
 +/*	#include <dict_sqlite.h>
 +/*
 +/*	DICT	*dict_sqlite_open(name, open_flags, dict_flags)
 +/*	const char *name;
 +/*	int	open_flags;
 +/*	int	dict_flags;
 +/* DESCRIPTION
 @@ -36,66 +36,64 @@ Support for sqlite.
 +/*	prefixed with the value of \fIname\fR and an underscore,
 +/*	and they are specified in main.cf.  For example, if this
 +/*	value is \fIsqlitecon\fR, the parameters would look like
 +/*	\fIsqlitecon_user\fR, \fIsqlitecon_table\fR, and so on.
 +/*
 +/* .IP open_flags
 +/*	Must be O_RDONLY.
 +/* .IP dict_flags
 +/*	See dict_open(3).
 +/* .PP
 +/*	Configuration parameters:
 +/*
 +/*	The parameters encodes a number of pieces of information:
-+/*	dbpath, query, result_format and expansion_limit:
++/*	dbpath, query, table, select_field and where_field:
 +/* .IP \fIdbpath\fR
 +/*	Path to SQLite database
 +/* .IP \fIquery\fR
-+/*	Query template, before the query is actually issued, variable
++/*      Query template, before the query is actually issued, variable
-+/*	substitutions are performed. See sqlite_table(5) for details.
++/*	substitutions are performed. See sqlite_table(5) for details. If
 +/*	No query is specified, the legacy variables \fItable\fR,
 +/*	\fIselect_field\fR, \fIwhere_field\fR and \fIadditional_conditions\fR
 +/*	are used to construct the query template.
 +/* .IP \fIresult_format\fR
-+/*	The format used to expand results from queries.  Substitutions
++/*      The format used to expand results from queries.  Substitutions
-+/*	are performed as described in sqlite_table(5). Defaults to returning
++/*      are performed as described in sqlite_table(5). Defaults to returning
 +/*	the lookup result unchanged.
 +/* .IP expansion_limit
 +/*	Limit (if any) on the total number of lookup result values. Lookups which
 +/*	exceed the limit fail with dict_errno=DICT_ERR_RETRY. Note that each
 +/*	non-empty (and non-NULL) column of a multi-column result row counts as
 +/*	one result.
 +/*
 +/* SEE ALSO
 +/*	dict(3) generic dictionary manager
 +/* AUTHOR(S)
 +/*	Axel Steiner
 +/*	ast@treibsand.com
 +/*--*/
++
 +/* System library. */
 +#include "sys_defs.h"
++
 +#ifdef HAS_SQLITE
 +#include <sqlite3.h>
++
 +#if !defined(SQLITE_VERSION_NUMBER) || (SQLITE_VERSION_NUMBER < 3005004)
 +#error "Your SQLite version is too old"
 +#endif
 +/* Utility library. */
++
 +#include "msg.h"
 +#include "dict.h"
 +#include "vstring.h"
 +#include "stringops.h"
 +#include "mymalloc.h"
++
 +/* Global library. */
++
 +#include "cfg_parser.h"
 +#include "db_common.h"
++
 +/* Application-specific. */
++
 +#include "dict_sqlite.h"
++
 +typedef struct {
 +	DICT dict;
 +	CFG_PARSER *parser;
 @@ -106,106 +104,81 @@ Support for sqlite.
 +	int expansion_limit;
 +	void *ctx;
 +} DICT_SQLITE;
++
 +typedef sqlite3_stmt *SQL;
++
 +/* internal function declarations */
++
 +static const char *dict_sqlite_lookup(DICT *, const char *);
 +DICT   *dict_sqlite_open(const char *, int, int);
 +static void dict_sqlite_close(DICT *);
 +static void sqlite_parse_config(DICT_SQLITE *, const char *);
++
 +/* dict_sqlite_quote - escape SQL metacharacters in input string */
 +static void dict_sqlite_quote(DICT *dict, const char *name, VSTRING *result) {
 +	DICT_SQLITE *dict_sqlite = (DICT_SQLITE *) dict;
 +	int len = strlen(name);
 +	int buflen = 2*len + 1;
 +	char *q;
 +	if (buflen < len)
 +		msg_panic("dict_sqlite_quote: integer overflow in 2*%d+1", len);
 +	VSTRING_SPACE(result, buflen);
 +	q = sqlite3_mprintf("%q",name);
 +	vstring_strncat(result,q, strlen(q));
 +	sqlite3_free(q);
 +	VSTRING_SKIP(result);
 +}
++
 +/* dict_sqlite_close - close the database */
++
 +static void dict_sqlite_close(DICT *dict) {
 +	const char *myname = "dict_sqlite_close";
 +	DICT_SQLITE *dict_sqlite = (DICT_SQLITE *) dict;
++
 +	if (msg_verbose)
 +		msg_info("%s: dict_sqlite_close", myname);
 +	if (sqlite3_close(dict_sqlite->db) != SQLITE_OK)
 +		msg_fatal("%s: DB close failed", myname);
 +	cfg_parser_free(dict_sqlite->parser);
 +	myfree(dict_sqlite->dbpath);
 +	myfree(dict_sqlite->query);
 +	myfree(dict_sqlite->result_format);
 +	if (dict_sqlite->ctx)
 +		db_common_free_ctx(dict_sqlite->ctx);
 +	if (dict->fold_buf)
 +		vstring_free(dict->fold_buf);
 +	dict_free(dict);
 +}
++
++
 +/* dict_sqlite_lookup - find database entry */
++
 +static const char *dict_sqlite_lookup(DICT *dict, const char *name) {
 +	const char *myname = "dict_sqlite_lookup";
 +	DICT_SQLITE *dict_sqlite = (DICT_SQLITE *) dict;
 +	SQL sql;
 +	const char *zErrMsg;
 +	static VSTRING *query;
 +	static VSTRING *result;
 +	const char *r;
 +	int expansion = 0;
++
 +	/*
 +	 * Optionally fold the key.
 +	 */
-+	if (dict->flags & DICT_FLAG_FOLD_FIX) {
++	if (dict->fold_buf) {
 +		if (dict->fold_buf == 0)
 +			dict->fold_buf = vstring_alloc(10);
 +		vstring_strcpy(dict->fold_buf, name);
 +		name = lowercase(vstring_str(dict->fold_buf));
 +	}
++
 +	if (db_common_check_domain(dict_sqlite->ctx, name) == 0) {
 +		if (msg_verbose)
 +			msg_info("%s: Skipping lookup of '%s'", myname, name);
 +		return (0);
 +	}
++
 +#define INIT_VSTR(buf, len) do { \
 +	if (buf == 0) \
 +		buf = vstring_alloc(len); \
 +	VSTRING_RESET(buf); \
 +	VSTRING_TERMINATE(buf); \
 +    } while (0)
++
 +	INIT_VSTR(query, 10);
++
 +	if (!db_common_expand(dict_sqlite->ctx, dict_sqlite->query,
-+			name, 0, query, dict_sqlite_quote))
++			name, 0, query, NULL))
 +		return (0);
++
 +	if (msg_verbose)
 +		msg_info("%s: %s: Searching with query %s", myname,
 +				dict_sqlite->parser->name, vstring_str(query));
++
 +	if(sqlite3_prepare_v2(dict_sqlite->db,vstring_str(query),-1,&sql,&zErrMsg)!=SQLITE_OK) {
 +		msg_fatal("%s: sql prepare %s\n",myname,sqlite3_errmsg(dict_sqlite->db));
 +	}
++
 +	INIT_VSTR(result, 10);
 +	while (sqlite3_step(sql) == SQLITE_ROW ) {
 +		if (db_common_expand(dict_sqlite->ctx, dict_sqlite->result_format,
 @@ -241,45 +214,48 @@ Support for sqlite.
++
 +	if ((dict_sqlite->query = cfg_get_str(p, "query", NULL, 0, 0)) == 0) {
 +		buf = vstring_alloc(64);
 +		db_common_sql_build_query(buf, p);
 +		dict_sqlite->query = vstring_export(buf);
 +	}
 +	dict_sqlite->expansion_limit = cfg_get_int(p,"expansion_limit", 0, 0, 0);
 +	dict_sqlite->ctx = 0;
++
 +	(void) db_common_parse(&dict_sqlite->dict, &dict_sqlite->ctx, dict_sqlite->query, 1);
 +	(void) db_common_parse(0, &dict_sqlite->ctx, dict_sqlite->result_format, 0);
++
 +	db_common_parse_domain(p, dict_sqlite->ctx);
 +	if (dict_sqlite->dict.flags & DICT_FLAG_FOLD_FIX)
 +		dict_sqlite->dict.fold_buf = vstring_alloc(10);
++
 +	if (db_common_dict_partial(dict_sqlite->ctx))
 +		dict_sqlite->dict.flags |= DICT_FLAG_PATTERN;
 +	else
 +		dict_sqlite->dict.flags |= DICT_FLAG_FIXED;
++
 +	if (dict_sqlite->dict.flags & DICT_FLAG_FOLD_FIX)
 +		dict_sqlite->dict.fold_buf = vstring_alloc(10);
 +}
++
 +/* dict_sqlite_open - open sqlite database */
++
 +DICT   *dict_sqlite_open(const char *name, int open_flags, int dict_flags) {
 +	DICT_SQLITE   *dict_sqlite;
++
 +	/*
 +	 * Sanity checks.
 +	 */
 +	if (open_flags != O_RDONLY)
 +		msg_fatal("%s:%s map requires O_RDONLY access mode", DICT_TYPE_SQLITE, name);
++
 +	dict_sqlite = (DICT_SQLITE *) dict_alloc(DICT_TYPE_SQLITE, name, sizeof(DICT_SQLITE));
 +	dict_sqlite->dict.lookup = dict_sqlite_lookup;
 +	dict_sqlite->dict.close = dict_sqlite_close;
 +	dict_sqlite->dict.flags = dict_flags;
 +	dict_sqlite->dict.flags |= DICT_FLAG_FIXED;
 +	sqlite_parse_config(dict_sqlite, name);
++
 +	if (sqlite3_open(dict_sqlite->dbpath, &dict_sqlite->db)) {
 +		msg_fatal("Can't open database: %s\n", sqlite3_errmsg(dict_sqlite->db));
 +		sqlite3_close(dict_sqlite->db);
 +	}
++
 +	return (DICT_DEBUG (&dict_sqlite->dict));
 +}
 +#endif

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.104 2009/05/12 12:27:19 martti Exp $
+# $NetBSD: Makefile,v 1.105 2009/05/13 10:34:06 martti Exp $
-DISTNAME=	postfix-2.6-20081205
+DISTNAME=	postfix-2.7-20090511
-PKGNAME=	postfix-2.6.20081205
+PKGNAME=	postfix-2.7.20090511
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
 MASTER_SITES+=	http://postfix.it-austria.net/releases/experimental/
 MASTER_SITES+=	http://mirrors.isc.org/pub/postfix/experimental/
 MASTER_SITES+=	http://mirror.postfix.jp/postfix-release/experimental/
 DIST_SUBDIR=	postfix
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
 LICENSE=	postfix-license
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*

 @@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.51 2009/01/05 10:25:39 martti Exp $
+$NetBSD: distinfo,v 1.52 2009/05/13 10:34:06 martti Exp $
-SHA1 (postfix/postfix-2.6-20081205.tar.gz) = 56a18a5fa084896ed2e7386773dcc58ed3af65a8
+SHA1 (postfix/postfix-2.7-20090511.tar.gz) = d1893f38a2066fcd8e9a6157bc8f4cdc14b7fc28
-RMD160 (postfix/postfix-2.6-20081205.tar.gz) = acee503b01233acd0f77de3d40b113edca3cff42
+RMD160 (postfix/postfix-2.7-20090511.tar.gz) = 7226d666f7da1cdcf9de2e7ac445ae58fc2a30a9
-Size (postfix/postfix-2.6-20081205.tar.gz) = 3180585 bytes
+Size (postfix/postfix-2.7-20090511.tar.gz) = 3322707 bytes
 SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
-SHA1 (patch-ag) = 643d6aea9574bbe05d252638b34ce132cd9bc4ac
+SHA1 (patch-ag) = 85dee76cc7dafcdb57d2dfa7af8e9e0e96f747fa
-SHA1 (patch-ai) = a9a1e0ebcf38c570c51283006419f7a4fdac2225
+SHA1 (patch-ai) = 809f63e6e4e61b3c2cecc49ee0a4c7cabc97844e
-SHA1 (patch-as) = b70ce22b253a011f4917ed170db29da2c92f675b
+SHA1 (patch-as) = eb57a7bbfad7bd7f2a13eed9d0429f63e93af622
-SHA1 (patch-at) = cb8a292f56c985a68e112e7fad8b05b482886251
+SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
 SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf
-SHA1 (patch-av) = b1569145f8ff0d81351ca6b94a1172260ba6b932
+SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73

 @@ -1,24 +1,24 @@
-$NetBSD: patch-av,v 1.4 2008/10/16 09:56:58 martti Exp $
+$NetBSD: patch-av,v 1.5 2009/05/13 10:34:06 martti Exp $
 Support for sqlite.
 --- src/global/mail_dict.c.orig	2008-01-08 22:07:47.000000000 +0100
 +++ src/global/mail_dict.c
 @@ -36,6 +36,7 @@
  #include <dict_ldap.h>
  #include <dict_mysql.h>
  #include <dict_pgsql.h>
 +#include <dict_sqlite.h>
  #include <mail_dict.h>
  typedef struct {
-@@ -53,6 +54,9 @@
+@@ -54,6 +55,9 @@ static const DICT_OPEN_INFO dict_open_in
  #endif
  #ifdef HAS_PGSQL
      DICT_TYPE_PGSQL, dict_pgsql_open,
-+#endif
+ #endif
 +#ifdef HAS_SQLITE
 +    DICT_TYPE_SQLITE, dict_sqlite_open,
- #endif
++#endif
 ,
  };

 @@ -1,14 +1,14 @@
-$NetBSD: patch-au,v 1.3 2008/10/16 09:45:12 martti Exp $
+$NetBSD: patch-au,v 1.4 2009/05/13 10:34:06 martti Exp $
 Support for sqlite.
 --- src/global/dict_sqlite.h.orig	2008-10-17 00:40:21.000000000 +0200
 +++ src/global/dict_sqlite.h
 @@ -0,0 +1,32 @@
 +#ifndef _DICT_SQLITE_H_INCLUDED_
 +#define _DICT_SQLITE_H_INCLUDED_
++
 +/*++
 +/* NAME
 +/*	dict_sqlite 3h
 +/* SUMMARY