summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2014-02-09 05:34:13 +0000
committertaca <taca@pkgsrc.org>2014-02-09 05:34:13 +0000
commit9b610680b9db4753c514923b1dafe76194cd21cd (patch)
treea9a44c036e242dc632ca1b0b445e1dff9f7956ab
parentbf98b1c1204af2731f7f5cb306bf2729a629538b (diff)
downloadpkgsrc-9b610680b9db4753c514923b1dafe76194cd21cd.tar.gz
Update postfix to 2.11.0. Quote from release announce:
The main changes in no particular order are: * Support for PKI-less TLS server certificate verification with DANE (DNS-based Authentication of Named Entities) where the CA public key or the server certificate is identified via DNSSEC lookup. This requires a DNS resolver that validates DNSSEC replies. The problem with conventional PKI is that there are literally hundreds of organizations world-wide that can provide a certificate in anyone's name. DANE limits trust to the people who control the target DNS zone and its parent zones. * Support for LMDB databases. Originally developed as part of OpenLDAP, LMDB is the first persistent Postfix database that can be shared among multiple writers such as postscreen daemons (Postfix already supported shared non-persistent memcached caches). Postfix currently requires LMDB version 0.9.11 or later. See LMDB_README for details and limitations. * A new postscreen_dnsbl_whitelist_threshold feature to allow clients to skip postscreen tests based on their DNSBL score. This can eliminate email delays due to "after 220 greeting" protocol tests, which otherwise require that a client reconnects before it can deliver mail. Some providers such as Google don't retry from the same IP address, and that can result in large email delivery delays. * The recipient_delimiter feature now supports different delimiters, for example both "+" and "-". As before, this implementation recognizes exactly one delimiter character per email address, and exactly one address extension per email address. * Advanced master.cf query/update support to access service attributes as "name = value" pairs. For example to turn off chroot on all services use "postconf -F '*/*/chroot = n'", and to change/add a "-o name=value" setting use "postconf -P smtp/inet/name = value". This was developed primarily to allow automated tools to manage Postfix systems without having to parse Postfix configuration files.
-rw-r--r--mail/postfix/Makefile4
-rw-r--r--mail/postfix/PLIST6
-rw-r--r--mail/postfix/distinfo16
-rw-r--r--mail/postfix/patches/patch-aa8
-rw-r--r--mail/postfix/patches/patch-ag58
-rw-r--r--mail/postfix/patches/patch-ai40
-rw-r--r--mail/postfix/patches/patch-src_dns_dns__lookup.c20
7 files changed, 43 insertions, 109 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index a57b2a4a823..286add56f2c 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.269 2014/01/16 15:56:58 taca Exp $
+# $NetBSD: Makefile,v 1.270 2014/02/09 05:34:13 taca Exp $
-DISTNAME= postfix-2.10.3
+DISTNAME= postfix-2.11.0
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
MASTER_SITES+= http://postfix.it-austria.net/releases/official/
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index b2003bf82e0..526892f547b 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2013/02/13 14:31:31 taca Exp $
+@comment $NetBSD: PLIST,v 1.27 2014/02/09 05:34:13 taca Exp $
bin/mailq
bin/newaliases
libexec/postfix/anvil
@@ -61,6 +61,7 @@ man/man5/cidr_table.5
man/man5/generic.5
man/man5/header_checks.5
man/man5/ldap_table.5
+man/man5/lmdb_table.5
man/man5/master.5
man/man5/memcache_table.5
man/man5/mysql_table.5
@@ -71,6 +72,7 @@ man/man5/postconf.5
man/man5/postfix-wrapper.5
man/man5/regexp_table.5
man/man5/relocated.5
+man/man5/socketmap_table.5
man/man5/sqlite_table.5
man/man5/tcp_table.5
man/man5/transport.5
@@ -134,10 +136,12 @@ share/doc/postfix/DEBUG_README
share/doc/postfix/DSN_README
share/doc/postfix/ETRN_README
share/doc/postfix/FILTER_README
+share/doc/postfix/FORWARD_SECRECY_README
share/doc/postfix/INSTALL
share/doc/postfix/IPV6_README
share/doc/postfix/LDAP_README
share/doc/postfix/LINUX_README
+share/doc/postfix/LMDB_README
share/doc/postfix/LOCAL_RECIPIENT_README
share/doc/postfix/MAILDROP_README
share/doc/postfix/MEMCACHE_README
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 41ba91aa1a0..cd658f15d40 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.152 2014/01/16 15:56:58 taca Exp $
+$NetBSD: distinfo,v 1.153 2014/02/09 05:34:13 taca Exp $
-SHA1 (postfix-2.10.3.tar.gz) = cc1e488a6c2487e69e83fbbab41e1f539c42ff03
-RMD160 (postfix-2.10.3.tar.gz) = a8f0cfdb74e0c0aa17e28a087182d574b38c301b
-Size (postfix-2.10.3.tar.gz) = 3828808 bytes
-SHA1 (patch-aa) = 2115fd7af5776a14fdbfc88a5ad3bc668a6762db
-SHA1 (patch-ag) = 60d752b6c8db971d92ca0017c63329ad446209c5
-SHA1 (patch-ai) = 959013a2af5a2304fe6bae59a09cc13c92fc3d4c
-SHA1 (patch-src_dns_dns__lookup.c) = 1e4e94f0929d351c5cdb606ac2f61c1e07224ca5
+SHA1 (postfix-2.11.0.tar.gz) = bc1fd50412742d9c28232b07c7d2139e37d3de28
+RMD160 (postfix-2.11.0.tar.gz) = 4f53040c607339eee010e35bafd2792037279b3c
+Size (postfix-2.11.0.tar.gz) = 4034741 bytes
+SHA1 (patch-aa) = 6f7dc14d53e914e9cb72752fb3941c569cd2e8f9
+SHA1 (patch-ag) = 150007e901ad3b470b0800bb3e073bff06eb8190
+SHA1 (patch-ai) = 5f56b77a716bec1fce5dcdbbb2d589f3301cabd3
+SHA1 (patch-src_dns_dns__lookup.c) = 9c26686e5abd9aee36f042440e5f6a6ffca3df4a
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index fbf81c88f76..0daf889935e 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.22 2013/02/13 14:31:31 taca Exp $
+$NetBSD: patch-aa,v 1.23 2014/02/09 05:34:13 taca Exp $
Make this pkgsrc friendly.
---- postfix-install.orig 2011-11-19 23:09:16.000000000 +0000
+--- postfix-install.orig 2012-05-22 19:40:29.000000000 +0000
+++ postfix-install
-@@ -365,26 +365,6 @@ HTML files. Specify \"no\" if you do not
+@@ -370,26 +370,6 @@ HTML files. Specify \"no\" if you do not
: ${tempdir=`pwd`}
: ${config_directory=`bin/postconf -c conf -h -d config_directory`}
@@ -31,7 +31,7 @@ Make this pkgsrc friendly.
# In case some systems special-case pathnames beginning with //.
case $install_root in
-@@ -739,10 +719,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -744,10 +724,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
"sample_directory = $sample_directory" \
"readme_directory = $readme_directory" \
|| exit 1
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index 125a486747f..f8c98a32380 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,22 +1,9 @@
-$NetBSD: patch-ag,v 1.33 2012/02/27 03:01:30 taca Exp $
+$NetBSD: patch-ag,v 1.34 2014/02/09 05:34:13 taca Exp $
Only define HAS_DB if it hasn't been defined.
-Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
-Handle closefrom() on FreeBSD.
---- src/util/sys_defs.h.orig 2011-11-02 23:46:22.000000000 +0000
+--- src/util/sys_defs.h.orig 2013-09-29 20:51:55.000000000 +0000
+++ src/util/sys_defs.h
-@@ -30,8 +30,8 @@
- || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
- || defined(OPENBSD5) \
- || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
-- || defined(NETBSD4) \
-- || defined(EKKOBSD1)
-+ || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \
-+ || defined(EKKOBSD1) || defined(DRAGONFLY)
- #define SUPPORTED
- #include <sys/types.h>
- #include <sys/param.h>
@@ -44,7 +44,9 @@
#define DEF_MAILBOX_LOCK "flock, dotlock"
#define HAS_SUN_LEN
@@ -25,44 +12,5 @@ Handle closefrom() on FreeBSD.
#define HAS_DB
+#endif
#define HAS_SA_LEN
- #define DEF_DB_TYPE "hash"
+ #define NATIVE_DB_TYPE "hash"
#if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -165,9 +167,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
-@@ -176,14 +188,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 */
-+ || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */ \
-+ || defined(__DragonFly__)
- # define EVENTS_STYLE EVENTS_STYLE_KQUEUE
- # endif
- #endif
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 00d8019dff1..47bfcded891 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,31 +1,10 @@
-$NetBSD: patch-ai,v 1.30 2013/09/30 15:21:15 taca Exp $
+$NetBSD: patch-ai,v 1.31 2014/02/09 05:34:13 taca Exp $
Make this pkgsrc friendly.
-Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
---- makedefs.orig 2013-02-04 01:33:13.000000000 +0000
+--- makedefs.orig 2014-01-05 17:18:56.000000000 +0000
+++ makedefs
-@@ -155,6 +155,8 @@ case "$SYSTEM.$RELEASE" in
- ;;
- FreeBSD.9*) SYSTYPE=FREEBSD9
- ;;
-+ DragonFly.*) SYSTYPE=DRAGONFLY
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
-@@ -173,6 +175,10 @@ case "$SYSTEM.$RELEASE" in
- ;;
- NetBSD.4*) SYSTYPE=NETBSD4
- ;;
-+ NetBSD.5*) SYSTYPE=NETBSD5
-+ ;;
-+ NetBSD.6*) SYSTYPE=NETBSD6
-+ ;;
- BSD/OS.2*) SYSTYPE=BSDI2
- ;;
- BSD/OS.3*) SYSTYPE=BSDI3
-@@ -226,13 +232,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -239,13 +239,6 @@ case "$SYSTEM.$RELEASE" in
esac
;;
ULTRIX.4*) SYSTYPE=ULTRIX4
@@ -39,18 +18,20 @@ Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
for l in syslog resolv; do
if [ -f /usr/local/lib/lib$l.a ]; then
SYSLIBS="$SYSLIBS -l$l"
-@@ -270,31 +269,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -283,33 +276,8 @@ case "$SYSTEM.$RELEASE" in
esac;;
# Tested with RedHat 3.03 on 20020729.
Linux.1*) SYSTYPE=LINUX1
- case "$CCARGS" in
- *-DNO_DB*) ;;
+- *-DHAS_DB*) ;;
- *) SYSLIBS="-ldb";;
- esac
;;
Linux.2*) SYSTYPE=LINUX2
- case "$CCARGS" in
- *-DNO_DB*) ;;
+- *-DHAS_DB*) ;;
- *) if [ -f /usr/include/db.h ]
- then
- : we are all set
@@ -71,12 +52,13 @@ Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
for name in nsl resolv $GDBM_LIBS
do
for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -348,24 +324,6 @@ EOF
+@@ -363,25 +331,6 @@ EOF
esac
;;
Linux.3*) SYSTYPE=LINUX3
- case "$CCARGS" in
- *-DNO_DB*) ;;
+- *-DHAS_DB*) ;;
- *) if [ -f /usr/include/db.h ]
- then
- : we are all set
@@ -96,10 +78,10 @@ Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
for name in nsl resolv
do
for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
-@@ -379,24 +337,6 @@ EOF
+@@ -395,24 +344,6 @@ EOF
;;
GNU.0*|GNU/kFreeBSD.[567]*)
- SYSTYPE=GNU0
+ SYSTYPE=GNU0
- case "$CCARGS" in
- *-DNO_DB*) ;;
- *) if [ -f /usr/include/db.h ]
@@ -121,7 +103,7 @@ Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
for name in nsl resolv
do
for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -427,25 +367,13 @@ EOF
+@@ -443,25 +374,13 @@ EOF
HP-UX.A.09.*) SYSTYPE=HPUX9
SYSLIBS=-ldbm
CCARGS="$CCARGS -DMISSING_USLEEP"
diff --git a/mail/postfix/patches/patch-src_dns_dns__lookup.c b/mail/postfix/patches/patch-src_dns_dns__lookup.c
index 027ed3889e8..f16a6c45ebf 100644
--- a/mail/postfix/patches/patch-src_dns_dns__lookup.c
+++ b/mail/postfix/patches/patch-src_dns_dns__lookup.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_dns_dns__lookup.c,v 1.2 2013/09/06 14:08:18 taca Exp $
+$NetBSD: patch-src_dns_dns__lookup.c,v 1.3 2014/02/09 05:34:13 taca Exp $
Fix runtime problem when mysql PKG_OPTIONS is enabled.
---- src/dns/dns_lookup.c.orig 2013-02-26 19:34:50.000000000 +0000
+--- src/dns/dns_lookup.c.orig 2014-01-09 15:00:36.000000000 +0000
+++ src/dns/dns_lookup.c
-@@ -153,6 +153,8 @@
+@@ -194,6 +194,8 @@
/* Local stuff. */
@@ -13,7 +13,7 @@ Fix runtime problem when mysql PKG_OPTIONS is enabled.
/*
* Structure to keep track of things while decoding a name server reply.
*/
-@@ -192,7 +194,7 @@ static int dns_query(const char *name, i
+@@ -235,7 +237,7 @@ static int dns_query(const char *name, i
/*
* Initialize the name service.
*/
@@ -22,11 +22,11 @@ Fix runtime problem when mysql PKG_OPTIONS is enabled.
if (why)
vstring_strcpy(why, "Name service initialization failure");
return (DNS_FAIL);
-@@ -206,18 +208,18 @@ static int dns_query(const char *name, i
+@@ -264,18 +266,18 @@ static int dns_query(const char *name, i
+ */
+ #define SAVE_FLAGS (USER_FLAGS | XTRA_FLAGS)
- if ((flags & USER_FLAGS) != flags)
- msg_panic("dns_query: bad flags: %d", flags);
-- saved_options = (_res.options & USER_FLAGS);
+- saved_options = (_res.options & SAVE_FLAGS);
+ saved_options = (rstate.options & USER_FLAGS);
/*
@@ -44,6 +44,6 @@ Fix runtime problem when mysql PKG_OPTIONS is enabled.
+ len = res_nsearch(&rstate, (char *) name, C_IN, type, reply->buf, reply->buf_len);
+ rstate.options &= ~flags;
+ rstate.options |= saved_options;
+ reply_header = (HEADER *) reply->buf;
+ reply->rcode = reply_header->rcode;
if (len < 0) {
- if (why)
- vstring_sprintf(why, "Host or domain name not found. "