Module Name: src
Committed By: tron
Date: Wed Mar 2 22:24:57 UTC 2011
Modified Files:
src/external/ibm-public/postfix/lib/masterlib: Makefile
src/external/ibm-public/postfix/lib/tls: Makefile
src/external/ibm-public/postfix/lib/util: Makefile
src/external/ibm-public/postfix/libexec: Makefile
src/external/ibm-public/postfix/man/man8: Makefile
src/external/ibm-public/postfix/sbin/postconf: Makefile
src/external/ibm-public/postfix/share/README_FILES: Makefile
src/external/ibm-public/postfix/share/html: Makefile
Added Files:
src/external/ibm-public/postfix/libexec/dnsblog: Makefile
src/external/ibm-public/postfix/libexec/postscreen: Makefile
src/external/ibm-public/postfix/libexec/tlsproxy: Makefile
Log Message:
Build new Postfix components dnsblog(8), postscreen(8) and tlsproxy(8)
and install new documentation files.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/ibm-public/postfix/lib/masterlib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/lib/tls/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/lib/util/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/libexec/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/ibm-public/postfix/libexec/dnsblog/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/ibm-public/postfix/libexec/postscreen/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/ibm-public/postfix/libexec/tlsproxy/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/man/man8/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/sbin/postconf/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/ibm-public/postfix/share/README_FILES/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/share/html/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/lib/masterlib/Makefile
diff -u src/external/ibm-public/postfix/lib/masterlib/Makefile:1.1 src/external/ibm-public/postfix/lib/masterlib/Makefile:1.2
--- src/external/ibm-public/postfix/lib/masterlib/Makefile:1.1 Thu Jun 25 18:21:52 2009
+++ src/external/ibm-public/postfix/lib/masterlib/Makefile Wed Mar 2 22:24:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:21:52 tron Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/02 22:24:55 tron Exp $
LIBISPRIVATE= yes
@@ -10,6 +10,6 @@
.PATH: ${DIST}
SRCS= single_server.c multi_server.c trigger_server.c master_proto.c \
- mail_flow.c
+ mail_flow.c event_server.c
.include <bsd.lib.mk>
Index: src/external/ibm-public/postfix/lib/tls/Makefile
diff -u src/external/ibm-public/postfix/lib/tls/Makefile:1.1 src/external/ibm-public/postfix/lib/tls/Makefile:1.2
--- src/external/ibm-public/postfix/lib/tls/Makefile:1.1 Thu Jun 25 18:21:52 2009
+++ src/external/ibm-public/postfix/lib/tls/Makefile Wed Mar 2 22:24:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:21:52 tron Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/02 22:24:55 tron Exp $
LIBISPRIVATE= yes
@@ -13,6 +13,6 @@
tls_prng_exch.c tls_stream.c tls_bio_ops.c tls_misc.c tls_dh.c \
tls_rsa.c tls_verify.c tls_certkey.c tls_session.c \
tls_client.c tls_server.c tls_scache.c tls_mgr.c tls_seed.c \
- tls_level.c
+ tls_level.c tls_proxy_clnt.c tls_proxy_print.c
.include <bsd.lib.mk>
Index: src/external/ibm-public/postfix/lib/util/Makefile
diff -u src/external/ibm-public/postfix/lib/util/Makefile:1.3 src/external/ibm-public/postfix/lib/util/Makefile:1.4
--- src/external/ibm-public/postfix/lib/util/Makefile:1.3 Wed Mar 2 20:12:29 2011
+++ src/external/ibm-public/postfix/lib/util/Makefile Wed Mar 2 22:24:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/03/02 20:12:29 tron Exp $
+# $NetBSD: Makefile,v 1.4 2011/03/02 22:24:55 tron Exp $
LIBISPRIVATE= yes
@@ -43,7 +43,7 @@
allascii.c load_file.c killme_after.c vstream_tweak.c edit_file.c \
inet_windowsize.c unix_pass_fd_fix.c dict_cache.c dict_thash.c \
ip_match.c nbbio.c stream_pass_connect.c unix_pass_listen.c \
- unix_pass_trigger.c valid_utf_8.c
+ unix_pass_trigger.c valid_utf_8.c myrand.c
COPTS.unix_recv_fd.c = -Wno-stack-protector
COPTS.unix_send_fd.c = -Wno-stack-protector
Index: src/external/ibm-public/postfix/libexec/Makefile
diff -u src/external/ibm-public/postfix/libexec/Makefile:1.2 src/external/ibm-public/postfix/libexec/Makefile:1.3
--- src/external/ibm-public/postfix/libexec/Makefile:1.2 Sun Jul 11 05:37:32 2010
+++ src/external/ibm-public/postfix/libexec/Makefile Wed Mar 2 22:24:55 2011
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2010/07/11 05:37:32 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/02 22:24:55 tron Exp $
.include <bsd.own.mk>
-SUBDIR= anvil bounce cleanup discard error flush local master oqmgr pickup \
- pipe postfix-script proxymap qmgr scache sendmail showq smtp smtpd \
- spawn trivial-rewrite verify virtual
+SUBDIR= anvil bounce cleanup discard dnsblog error flush local master oqmgr \
+ pickup pipe postfix-script postscreen proxymap qmgr scache sendmail \
+ showq smtp smtpd spawn trivial-rewrite verify virtual
.if ${MKCRYPTO} != "no"
-SUBDIR+= tlsmgr
+SUBDIR+= tlsmgr tlsproxy
.endif
# Not built: fsstone (unneeded), smtpstone (unneeded), qmqpd (unneeded)
Index: src/external/ibm-public/postfix/man/man8/Makefile
diff -u src/external/ibm-public/postfix/man/man8/Makefile:1.1 src/external/ibm-public/postfix/man/man8/Makefile:1.2
--- src/external/ibm-public/postfix/man/man8/Makefile:1.1 Tue Jun 23 15:02:52 2009
+++ src/external/ibm-public/postfix/man/man8/Makefile Wed Mar 2 22:24:56 2011
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.1 2009/06/23 15:02:52 tron Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/02 22:24:56 tron Exp $
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/man/man8
.PATH: ${DIST}
-MAN= anvil.8 bounce.8 cleanup.8 discard.8 error.8 local.8 \
- master.8 pickup.8 pipe.8 qmgr.8 \
+MAN= anvil.8 bounce.8 cleanup.8 discard.8 dnsblog.8 error.8 local.8 \
+ master.8 pickup.8 pipe.8 postscreen.8 proxymap.8 qmgr.8 \
scache.8 showq.8 smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 \
oqmgr.8 spawn.8 flush.8 virtual.8 \
- verify.8 proxymap.8
+ verify.8
.if ${MKCRYPTO} != "no"
-MAN+= tlsmgr.8
+MAN+= tlsmgr.8 tlsproxy.8
.endif
MLINKS= bounce.8 defer.8
Index: src/external/ibm-public/postfix/sbin/postconf/Makefile
diff -u src/external/ibm-public/postfix/sbin/postconf/Makefile:1.2 src/external/ibm-public/postfix/sbin/postconf/Makefile:1.3
--- src/external/ibm-public/postfix/sbin/postconf/Makefile:1.2 Fri Feb 19 13:55:46 2010
+++ src/external/ibm-public/postfix/sbin/postconf/Makefile Wed Mar 2 22:24:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/19 13:55:46 njoly Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/02 22:24:56 tron Exp $
# XXX Note we aren't building ../conf/main.cf.default
# The shipped makefiles construct it using postconf -d after building
@@ -16,9 +16,9 @@
.PATH: ${DIST}
PSRCS= postconf.c
-GENSRCS=bool_table.h bool_vars.h int_table.h int_vars.h nint_table.h \
- nint_vars.h str_table.h str_vars.h time_table.h time_vars.h \
- raw_table.h raw_vars.h
+GENSRCS=bool_table.h bool_vars.h int_table.h int_vars.h nbool_table.h \
+ nbool_vars.h nint_table.h nint_vars.h str_table.h str_vars.h \
+ time_table.h time_vars.h raw_table.h raw_vars.h
AUTOSRCS=auto_table.h auto_vars.h
SRCS= ${PSRCS} ${GENSRCS} ${AUTOSRCS}
Index: src/external/ibm-public/postfix/share/README_FILES/Makefile
diff -u src/external/ibm-public/postfix/share/README_FILES/Makefile:1.1 src/external/ibm-public/postfix/share/README_FILES/Makefile:1.2
--- src/external/ibm-public/postfix/share/README_FILES/Makefile:1.1 Thu Jun 25 18:22:01 2009
+++ src/external/ibm-public/postfix/share/README_FILES/Makefile Wed Mar 2 22:24:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:22:01 tron Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/02 22:24:56 tron Exp $
.include <bsd.own.mk>
@@ -18,11 +18,11 @@
IPV6_README LDAP_README LOCAL_RECIPIENT_README \
MAILDROP_README MILTER_README MYSQL_README MULTI_INSTANCE_README \
NFS_README OVERVIEW PCRE_README \
- PGSQL_README QSHAPE_README ../RELEASE_NOTES \
+ PGSQL_README POSTSCREEN_README QSHAPE_README ../RELEASE_NOTES \
RESTRICTION_CLASS_README SASL_README SCHEDULER_README \
SMTPD_ACCESS_README SMTPD_POLICY_README SMTPD_PROXY_README \
- STANDARD_CONFIGURATION_README TLS_README TLS_LEGACY_README \
- TUNING_README UUCP_README \
+ SOHO_README SQLITE_README STANDARD_CONFIGURATION_README \
+ TLS_README TLS_LEGACY_README TUNING_README UUCP_README \
VERP_README VIRTUAL_README XCLIENT_README XFORWARD_README
# not installed:
Index: src/external/ibm-public/postfix/share/html/Makefile
diff -u src/external/ibm-public/postfix/share/html/Makefile:1.1 src/external/ibm-public/postfix/share/html/Makefile:1.2
--- src/external/ibm-public/postfix/share/html/Makefile:1.1 Thu Jun 25 18:22:01 2009
+++ src/external/ibm-public/postfix/share/html/Makefile Wed Mar 2 22:24:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:22:01 tron Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/02 22:24:56 tron Exp $
.include <bsd.own.mk>
@@ -10,11 +10,11 @@
.PATH: ${DIST}
PFX_DAEMONS= anvil.8.html bounce.8.html cleanup.8.html discard.8.html \
- error.8.html flush.8.html lmtp.8.html local.8.html \
- master.8.html oqmgr.8.html pickup.8.html pipe.8.html proxymap.8.html \
- qmgr.8.html scache.8.html showq.8.html smtp.8.html \
- smtpd.8.html spawn.8.html tlsmgr.8.html trivial-rewrite.8.html \
- verify.8.html virtual.8.html
+ dnsblog.8.html error.8.html flush.8.html lmtp.8.html local.8.html \
+ master.8.html oqmgr.8.html pickup.8.html pipe.8.html \
+ postscreen.8.html proxymap.8.html qmgr.8.html scache.8.html \
+ showq.8.html smtp.8.html smtpd.8.html spawn.8.html tlsmgr.8.html \
+ tlsproxy.8.html trivial-rewrite.8.html verify.8.html virtual.8.html
PFX_COMMANDS= postalias.1.html postcat.1.html \
postconf.1.html postdrop.1.html postfix.1.html postkick.1.html \
postlock.1.html postlog.1.html postmap.1.html postqueue.1.html \
@@ -24,8 +24,9 @@
generic.5.html header_checks.5.html ldap_table.5.html \
master.5.html mysql_table.5.html nisplus_table.5.html \
pcre_table.5.html pgsql_table.5.html postconf.5.html \
- regexp_table.5.html relocated.5.html transport.5.html virtual.5.html \
- postfix-wrapper.5.html postfix-manuals.html
+ regexp_table.5.html relocated.5.html sqlite_table.5.html \
+ transport.5.html virtual.5.html postfix-wrapper.5.html \
+ postfix-manuals.html
PFX_READMES= ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html \
ADDRESS_VERIFICATION_README.html BACKSCATTER_README.html \
BASIC_CONFIGURATION_README.html BUILTIN_FILTER_README.html \
@@ -36,10 +37,11 @@
LOCAL_RECIPIENT_README.html MAILDROP_README.html MYSQL_README.html \
MILTER_README.html \
NFS_README.html OVERVIEW.html PCRE_README.html \
- PGSQL_README.html QSHAPE_README.html \
+ PGSQL_README.html POSTSCREEN_README.html QSHAPE_README.html \
RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \
SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \
SMTPD_PROXY_README.html STANDARD_CONFIGURATION_README.html \
+ SOHO_README.html SQLITE_README.html \
TLS_README.html TLS_LEGACY_README.html TUNING_README.html \
UUCP_README.html VERP_README.html VIRTUAL_README.html \
XCLIENT_README.html XFORWARD_README.html MULTI_INSTANCE_README.html
Added files:
Index: src/external/ibm-public/postfix/libexec/dnsblog/Makefile
diff -u /dev/null src/external/ibm-public/postfix/libexec/dnsblog/Makefile:1.1
--- /dev/null Wed Mar 2 22:24:57 2011
+++ src/external/ibm-public/postfix/libexec/dnsblog/Makefile Wed Mar 2 22:24:55 2011
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2011/03/02 22:24:55 tron Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+PROG= dnsblog
+
+DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG}
+.PATH: ${DIST}
+
+DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
+
+.include <bsd.prog.mk>
Index: src/external/ibm-public/postfix/libexec/postscreen/Makefile
diff -u /dev/null src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.1
--- /dev/null Wed Mar 2 22:24:57 2011
+++ src/external/ibm-public/postfix/libexec/postscreen/Makefile Wed Mar 2 22:24:55 2011
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2011/03/02 22:24:55 tron Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+PROG= postscreen
+
+DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG}
+.PATH: ${DIST}
+
+SRCS= postscreen.c postscreen_access.c postscreen_dict.c postscreen_dnsbl.c \
+ postscreen_early.c postscreen_expand.c postscreen_misc.c \
+ postscreen_send.c postscreen_smtpd.c postscreen_starttls.c \
+ postscreen_state.c postscreen_tests.c
+
+
+DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+
+.if ${MKCRYPTO} != "no"
+DPADD+= ${LIBPTLS} ${LIBSSL} ${LIBCRYPTO}
+LDADD+= ${LIBPTLS} -lssl -lcrypto
+.endif
+
+.include <bsd.prog.mk>
Index: src/external/ibm-public/postfix/libexec/tlsproxy/Makefile
diff -u /dev/null src/external/ibm-public/postfix/libexec/tlsproxy/Makefile:1.1
--- /dev/null Wed Mar 2 22:24:57 2011
+++ src/external/ibm-public/postfix/libexec/tlsproxy/Makefile Wed Mar 2 22:24:56 2011
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2011/03/02 22:24:56 tron Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+PROG= tlsproxy
+
+DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG}
+.PATH: ${DIST}
+
+SRCS= tlsproxy_state.c tlsproxy.c
+
+DPADD+= ${LIBPTLS} ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+LDADD+= ${LIBPTLS} ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+
+DPADD+= ${LIBSSL} ${LIBCRYPTO}
+LDADD+= -lssl -lcrypto
+
+.include <bsd.prog.mk>
