Module Name: src
Committed By: tron
Date: Sun Mar 4 16:12:25 UTC 2012
Modified Files:
src/distrib/sets/lists/man: mi
src/external/ibm-public/postfix: Makefile.inc
src/external/ibm-public/postfix/lib/global: Makefile
src/external/ibm-public/postfix/man/man5: Makefile
src/sys/sys: cdefs_elf.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1382 -r1.1383 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.13 -r1.14 src/external/ibm-public/postfix/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/lib/global/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/man/man5/Makefile
cvs rdiff -u -r1.38 -r1.39 src/sys/sys/cdefs_elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1382 src/distrib/sets/lists/man/mi:1.1383
--- src/distrib/sets/lists/man/mi:1.1382 Wed Feb 29 20:07:54 2012
+++ src/distrib/sets/lists/man/mi Sun Mar 4 16:12:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1382 2012/02/29 20:07:54 tron Exp $
+# $NetBSD: mi,v 1.1383 2012/03/04 16:12:24 tron 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
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.13 src/external/ibm-public/postfix/Makefile.inc:1.14
--- src/external/ibm-public/postfix/Makefile.inc:1.13 Thu Aug 25 17:05:45 2011
+++ src/external/ibm-public/postfix/Makefile.inc Sun Mar 4 16:12:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2011/08/25 17:05:45 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.14 2012/03/04 16:12:24 tron Exp $
.include <bsd.own.mk>
@@ -46,6 +46,13 @@ CPPFLAGS+= -DUSE_TLS
CPPFLAGS+= -DNO_IPV6
.endif
+# SQLite support.
+CPPFLAGS+= -DHAS_SQLITE
+. if defined(PROG)
+DPADD+= ${LIBSQLITE3}
+LDADD+= -lsqlite3
+.endif
+
# LDAP support.
.if ${USE_LDAP} != "no"
CPPFLAGS+= -DHAS_LDAP
Index: src/external/ibm-public/postfix/lib/global/Makefile
diff -u src/external/ibm-public/postfix/lib/global/Makefile:1.2 src/external/ibm-public/postfix/lib/global/Makefile:1.3
--- src/external/ibm-public/postfix/lib/global/Makefile:1.2 Wed Mar 2 20:12:29 2011
+++ src/external/ibm-public/postfix/lib/global/Makefile Sun Mar 4 16:12:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/03/02 20:12:29 tron Exp $
+# $NetBSD: Makefile,v 1.3 2012/03/04 16:12:24 tron Exp $
LIBISPRIVATE= yes
@@ -14,7 +14,8 @@ SRCS= abounce.c anvil_clnt.c been_here.c
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 \
Index: src/external/ibm-public/postfix/man/man5/Makefile
diff -u src/external/ibm-public/postfix/man/man5/Makefile:1.2 src/external/ibm-public/postfix/man/man5/Makefile:1.3
--- src/external/ibm-public/postfix/man/man5/Makefile:1.2 Mon Jan 23 01:28:56 2012
+++ src/external/ibm-public/postfix/man/man5/Makefile Sun Mar 4 16:12:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/01/23 01:28:56 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/03/04 16:12:25 tron Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@ DIST= ${NETBSDSRCDIR}/external/ibm-publi
.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
Index: src/sys/sys/cdefs_elf.h
diff -u src/sys/sys/cdefs_elf.h:1.38 src/sys/sys/cdefs_elf.h:1.39
--- src/sys/sys/cdefs_elf.h:1.38 Sat Mar 3 02:09:57 2012
+++ src/sys/sys/cdefs_elf.h Sun Mar 4 16:12:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs_elf.h,v 1.38 2012/03/03 02:09:57 matt Exp $ */
+/* $NetBSD: cdefs_elf.h,v 1.39 2012/03/04 16:12:25 tron Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -153,8 +153,8 @@
#define __link_set_add_bss2(set, sym, n) __link_set_make_entry2(set, sym, n)
#define __link_set_decl(set, ptype) \
- extern ptype * const __start_link_set_##set[] __dso_hidden; \
- extern ptype * const __stop_link_set_##set[] __dso_hidden \
+ extern ptype * const __start_link_set_##set[]; \
+ extern ptype * const __stop_link_set_##set[] \
#define __link_set_start(set) (__start_link_set_##set)
#define __link_set_end(set) (__stop_link_set_##set)
