Thu Mar 8 17:54:45 2012 UTC ()
Pull up following revision(s) (requested by tron in ticket #102):
external/ibm-public/postfix/man/man5/Makefile: revision 1.3
distrib/sets/lists/man/mi: revision 1.1383
doc/CHANGES: revision 1.1681
external/ibm-public/postfix/lib/global/Makefile: revision 1.3
external/ibm-public/postfix/Makefile.inc: revision 1.14
Add support for SQLite look-up tables to postfix(1), see sqlite_table(5)
for more details.
While here stop installation of pcre_table(5) as this table type
is not supported.
Note SQLite support for Postfix.
(riz)
diff -r1.1379.2.1 -r1.1379.2.2 src/distrib/sets/lists/man/mi
diff -r1.1670.2.2 -r1.1670.2.3 src/doc/CHANGES
diff -r1.13 -r1.13.4.1 src/external/ibm-public/postfix/Makefile.inc
diff -r1.2 -r1.2.6.1 src/external/ibm-public/postfix/lib/global/Makefile
diff -r1.2 -r1.2.2.1 src/external/ibm-public/postfix/man/man5/Makefile
--- src/distrib/sets/lists/man/mi 2012/03/02 18:27:51 1.1379.2.1
+++ src/distrib/sets/lists/man/mi 2012/03/08 17:54:42 1.1379.2.2
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1379.2.1 2012/03/02 18:27:51 riz Exp $
+# $NetBSD: mi,v 1.1379.2.2 2012/03/08 17:54:42 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2005,7 +2005,7 @@
./usr/share/man/cat5/passwd.conf.0 man-sys-catman .cat
./usr/share/man/cat5/pcap-savefile.0 man-net-catman .cat
./usr/share/man/cat5/pcfs.0 man-obsolete obsolete
-./usr/share/man/cat5/pcre_table.0 man-postfix-catman postfix,.cat
+./usr/share/man/cat5/pcre_table.0 man-obsolete obsolete
./usr/share/man/cat5/pf.boot.conf.0 man-pf-catman pf,.cat
./usr/share/man/cat5/pf.conf.0 man-pf-catman pf,.cat
./usr/share/man/cat5/pf.os.0 man-pf-catman pf,.cat
@@ -2041,6 +2041,7 @@
./usr/share/man/cat5/shells.0 man-sys-catman .cat
./usr/share/man/cat5/siginfo.0 man-obsolete obsolete
./usr/share/man/cat5/spamd.conf.0 man-obsolete obsolete
+./usr/share/man/cat5/sqlite_table.0 man-postfix-catman postfix,.cat
./usr/share/man/cat5/ssh_config.0 man-secsh-catman crypto,.cat
./usr/share/man/cat5/sshd_config.0 man-secsh-catman crypto,.cat
./usr/share/man/cat5/stab.0 man-sys-catman .cat
@@ -4783,7 +4784,7 @@
./usr/share/man/html5/passwd.conf.html man-sys-htmlman html
./usr/share/man/html5/passwd.html man-sys-htmlman html
./usr/share/man/html5/pcap-savefile.html man-sys-htmlman html
-./usr/share/man/html5/pcre_table.html man-postfix-htmlman postfix,html
+./usr/share/man/html5/pcre_table.html man-obsolete obsolete
./usr/share/man/html5/pf.boot.conf.html man-pf-htmlman pf,html
./usr/share/man/html5/pf.conf.html man-pf-htmlman pf,html
./usr/share/man/html5/pf.os.html man-pf-htmlman pf,html
@@ -4812,6 +4813,7 @@
./usr/share/man/html5/security.conf.html man-sys-htmlman html
./usr/share/man/html5/services.html man-net-htmlman html
./usr/share/man/html5/shells.html man-sys-htmlman html
+./usr/share/man/html5/sqlite_table.html man-postfix-htmlman postfix,html
./usr/share/man/html5/ssh_config.html man-secsh-htmlman crypto,html
./usr/share/man/html5/sshd_config.html man-secsh-htmlman crypto,html
./usr/share/man/html5/stab.html man-sys-htmlman html
@@ -7514,7 +7516,7 @@
./usr/share/man/man5/passwd.conf.5 man-sys-man .man
./usr/share/man/man5/pcap-savefile.5 man-netutil-man .man
./usr/share/man/man5/pcfs.5 man-obsolete obsolete
-./usr/share/man/man5/pcre_table.5 man-postfix-man postfix,.man
+./usr/share/man/man5/pcre_table.5 man-obsolete obsolete
./usr/share/man/man5/pf.boot.conf.5 man-pf-man pf,.man
./usr/share/man/man5/pf.conf.5 man-pf-man pf,.man
./usr/share/man/man5/pf.os.5 man-pf-man pf,.man
@@ -7552,6 +7554,7 @@
./usr/share/man/man5/spamd.conf.5 man-obsolete obsolete
./usr/share/man/man5/ssh_config.5 man-secsh-man crypto,.man
./usr/share/man/man5/sshd_config.5 man-secsh-man crypto,.man
+./usr/share/man/man5/sqlite_table.5 man-postfix-man postfix,.man
./usr/share/man/man5/stab.5 man-sys-man .man
./usr/share/man/man5/sysctl.conf.5 man-sys-man .man
./usr/share/man/man5/syslog.conf.5 man-sysutil-man .man
--- src/doc/CHANGES 2012/02/20 21:41:28 1.1670.2.2
+++ src/doc/CHANGES 2012/03/08 17:54:44 1.1670.2.3
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1670.2.2 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1670.2.3 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -1263,3 +1263,4 @@
created with quotadump. [dholland 20120212]
postfix(1): Import version 2.8.8 [tron 20120217]
pkg_install(1): Import version 20120128 [tron 20120219]
+ postfix(1): Add support for SQLite tables. [tron 20120304]
--- src/external/ibm-public/postfix/Makefile.inc 2011/08/25 17:05:45 1.13
+++ src/external/ibm-public/postfix/Makefile.inc 2012/03/08 17:54:45 1.13.4.1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2011/08/25 17:05:45 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.13.4.1 2012/03/08 17:54:45 riz Exp $
.include <bsd.own.mk>
@@ -44,6 +44,13 @@
# IPv6 support.
.if ${MKINET6} == "no"
CPPFLAGS+= -DNO_IPV6
+.endif
+
+# SQLite support.
+CPPFLAGS+= -DHAS_SQLITE
+. if defined(PROG)
+DPADD+= ${LIBSQLITE3}
+LDADD+= -lsqlite3
.endif
# LDAP support.
--- src/external/ibm-public/postfix/lib/global/Makefile 2011/03/02 20:12:29 1.2
+++ src/external/ibm-public/postfix/lib/global/Makefile 2012/03/08 17:54:44 1.2.6.1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/03/02 20:12:29 tron Exp $
+# $NetBSD: Makefile,v 1.2.6.1 2012/03/08 17:54:44 riz Exp $
LIBISPRIVATE= yes
@@ -14,7 +14,8 @@
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 \
--- src/external/ibm-public/postfix/man/man5/Makefile 2012/01/23 01:28:56 1.2
+++ src/external/ibm-public/postfix/man/man5/Makefile 2012/03/08 17:54:42 1.2.2.1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/01/23 01:28:56 joerg Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2012/03/08 17:54:42 riz Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
.PATH: ${DIST}
MAN= access.5 aliases.5 bounce.5 canonical.5 relocated.5 \
- transport.5 virtual.5 pcre_table.5 regexp_table.5 \
+ transport.5 virtual.5 sqlite_table.5 regexp_table.5 \
cidr_table.5 header_checks.5 ldap_table.5 master.5 \
nisplus_table.5 generic.5
MAN+= postconf.5 postfix-wrapper.5