From dd12de79793082157b415e8d4deb6cecc243a6da Mon Sep 17 00:00:00 2001 From: martti Date: Wed, 13 May 2009 10:33:23 +0000 Subject: Updated mail/postfix to 2.6.0 - Multi-instance support introduces a new postmulti(1) command to create/add/remove/etc. additional Postfix instances. The familiar "postfix start" etc. commands now automatically start multiple Postfix instances. The good news: nothing changes when you use only one Postfix instance. See MULTI_INSTANCE_README for details. - Multi-instance support required that some files be moved from the non-shared $config_directory to the shared $daemon_directory. The affected files are postfix-script, postfix-files and post-install. - TLS (SSL) support was updated for elliptic curve encryption. This requires OpenSSL version 0.9.9 or later. The SMTP client no longer uses the SSLv2 protocol by default. See TLS_README for details. - The Milter client now supports all Sendmail 8.14 Milter requests, including requests for rejected recipient addresses, and requests to replace the envelope sender address. See MILTER_README for details. - Postfix no longer adds (Resent-) From:, Date:, Message-ID: or To: headers to email messages with "remote" origins (these are origins that don't match $local_header_rewrite_clients). Adding such headers breaks DKIM signatures that explicitly cover non-present headers. For compatibility with existing logfile processing software, Postfix will log ``message-id=<>'' for email messages that have no Message-Id header. - Stress-adaptive behavior is now enabled by default. This allows the Postfix SMTP server to temporarily reduce time limits and error-count limits under conditions of overload, such as a malware attack or backscatter flood. See STRESS_README for details. No functionality has been removed, but it is a good idea to review the RELEASE_NOTES file for the usual minor incompatibilities or limitations. --- mail/postfix/Makefile | 6 +++--- mail/postfix/PLIST | 13 +++++++++++-- mail/postfix/distinfo | 14 +++++++------- mail/postfix/patches/patch-ag | 10 +++++----- mail/postfix/patches/patch-ai | 18 +++++++++--------- mail/postfix/patches/patch-as | 16 ++++++++-------- 6 files changed, 43 insertions(+), 34 deletions(-) (limited to 'mail') diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 3232416b97a..ca8c6f54491 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.223 2009/05/13 10:32:23 martti Exp $ +# $NetBSD: Makefile,v 1.224 2009/05/13 10:33:23 martti Exp $ -DISTNAME= postfix-2.5.7 +DISTNAME= postfix-2.6.0 #PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ @@ -116,7 +116,7 @@ PKG_GECOS.postfix= Postfix User PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR} CONF_FILES= # empty -.for i in main.cf master.cf postfix-files +.for i in main.cf master.cf CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} .endfor CONF_FILES_PERMS= # empty diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST index 5dcfaa313dc..fc537ab7f99 100644 --- a/mail/postfix/PLIST +++ b/mail/postfix/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2008/04/12 22:43:04 jlam Exp $ +@comment $NetBSD: PLIST,v 1.21 2009/05/13 10:33:23 martti Exp $ bin/mailq bin/newaliases libexec/postfix/anvil @@ -9,11 +9,18 @@ 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 @@ -37,6 +44,7 @@ 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 @@ -56,6 +64,7 @@ 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 @@ -123,6 +132,7 @@ 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 @@ -162,7 +172,6 @@ share/examples/postfix/main.cf.default share/examples/postfix/makedefs.out share/examples/postfix/master.cf share/examples/postfix/post-install -share/examples/postfix/postfix-files share/examples/postfix/postfix-script share/examples/postfix/relocated ${PLIST.csasl}share/examples/postfix/smtpd.conf diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 21f46aa8b57..e42dd06386f 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.124 2009/05/13 10:32:23 martti Exp $ +$NetBSD: distinfo,v 1.125 2009/05/13 10:33:23 martti Exp $ -SHA1 (postfix/postfix-2.5.7.tar.gz) = 1a7620b703a24cd7eef56daddff605cace184a60 -RMD160 (postfix/postfix-2.5.7.tar.gz) = 5fa24140e4888fa32f4e01d4021ae37a60b523dd -Size (postfix/postfix-2.5.7.tar.gz) = 3159263 bytes +SHA1 (postfix/postfix-2.6.0.tar.gz) = 736a87802d3cde3566bc7c15ba94f38b855aa186 +RMD160 (postfix/postfix-2.6.0.tar.gz) = d3b2c75f2ea701a4e5243b1ac1f9ac88a58bb172 +Size (postfix/postfix-2.6.0.tar.gz) = 3324014 bytes SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb -SHA1 (patch-ag) = b572e51dd5053e655667f4c9f583191ae5c7fb1c -SHA1 (patch-ai) = 6884934b519eea945555b3556350e303f83221fb -SHA1 (patch-as) = 531d372fd2e51781616202b9c704b621b96770c4 +SHA1 (patch-ag) = 85dee76cc7dafcdb57d2dfa7af8e9e0e96f747fa +SHA1 (patch-ai) = 809f63e6e4e61b3c2cecc49ee0a4c7cabc97844e +SHA1 (patch-as) = eb57a7bbfad7bd7f2a13eed9d0429f63e93af622 SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03 SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73 diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag index 62796447e7f..cb18093d89a 100644 --- a/mail/postfix/patches/patch-ag +++ b/mail/postfix/patches/patch-ag @@ -1,10 +1,10 @@ -$NetBSD: patch-ag,v 1.27 2008/11/03 00:47:17 taca Exp $ +$NetBSD: patch-ag,v 1.28 2009/05/13 10:33:23 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-01-15 09:51:44.000000000 +0900 -+++ src/util/sys_defs.h +--- 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 @@ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ @@ -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) -@@ -155,9 +157,19 @@ +@@ -158,9 +160,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 -@@ -166,14 +178,16 @@ +@@ -169,14 +181,16 @@ #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \ || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \ diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai index b92c0e84d6f..e707a6c7276 100644 --- a/mail/postfix/patches/patch-ai +++ b/mail/postfix/patches/patch-ai @@ -1,11 +1,11 @@ -$NetBSD: patch-ai,v 1.24 2008/11/03 00:47:17 taca Exp $ +$NetBSD: patch-ai,v 1.25 2009/05/13 10:33:23 martti Exp $ Make this pkgsrc friendly. Add support for NetBSD 5.x and DragonFly BSD. ---- makedefs.orig 2008-01-16 05:20:24.000000000 +0900 -+++ makedefs -@@ -132,6 +132,8 @@ case "$SYSTEM.$RELEASE" in +--- makedefs.orig 2009-05-12 00:26:46.000000000 +0300 ++++ makedefs 2009-05-13 12:26:34.000000000 +0300 +@@ -144,6 +144,8 @@ ;; FreeBSD.7*) SYSTYPE=FREEBSD7 ;; @@ -14,7 +14,7 @@ Add support for NetBSD 5.x and DragonFly BSD. OpenBSD.2*) SYSTYPE=OPENBSD2 ;; OpenBSD.3*) SYSTYPE=OPENBSD3 -@@ -148,6 +150,8 @@ case "$SYSTEM.$RELEASE" in +@@ -160,6 +162,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 -@@ -198,13 +202,6 @@ case "$SYSTEM.$RELEASE" in +@@ -212,13 +216,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" -@@ -236,25 +233,8 @@ case "$SYSTEM.$RELEASE" in +@@ -250,25 +247,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 -@@ -265,7 +245,6 @@ case "$SYSTEM.$RELEASE" in +@@ -279,7 +259,6 @@ # CCARGS="$CCARGS -DHAS_DBM -DPATH_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 -@@ -360,25 +339,13 @@ EOF +@@ -372,25 +351,13 @@ HP-UX.A.09.*) SYSTYPE=HPUX9 SYSLIBS=-ldbm CCARGS="$CCARGS -DMISSING_USLEEP" diff --git a/mail/postfix/patches/patch-as b/mail/postfix/patches/patch-as index 06bb7d1bddc..b656ff9b2c7 100644 --- a/mail/postfix/patches/patch-as +++ b/mail/postfix/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.4 2008/10/16 09:40:20 martti Exp $ +$NetBSD: patch-as,v 1.5 2009/05/13 10:33:23 martti Exp $ Support for sqlite. ---- src/global/Makefile.in.orig 2007-12-06 14:49:03.000000000 +0100 -+++ src/global/Makefile.in -@@ -4,7 +4,7 @@ SRCS = abounce.c anvil_clnt.c been_here. +--- 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 +@@ -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 \ @@ -13,7 +13,7 @@ Support for sqlite. 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 @@ OBJS = abounce.o anvil_clnt.o been_here. +@@ -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 \ @@ -22,7 +22,7 @@ Support for sqlite. 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 @@ HDRS = abounce.h anvil_clnt.h been_here. +@@ -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 \ @@ -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 \ -@@ -860,6 +860,13 @@ dict_proxy.o: dict_proxy.c +@@ -862,6 +862,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 -@@ -1219,6 +1226,7 @@ mail_dict.o: dict_ldap.h +@@ -1233,6 +1240,7 @@ mail_dict.o: dict_mysql.h mail_dict.o: dict_pgsql.h mail_dict.o: dict_proxy.h -- cgit v1.2.3