Pullup ticket #4780 - requested by taca

mail/postfix: security update

Revisions pulled up:
- mail/postfix/Makefile                                         1.284
- mail/postfix/distinfo                                         1.160
- mail/postfix/patches/patch-ai                                 1.33

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Jul 22 00:25:37 UTC 2015

   Modified Files:
   	pkgsrc/mail/postfix: Makefile distinfo
   	pkgsrc/mail/postfix/patches: patch-ai

   Log Message:
   Update postfix to 2.11.6, security release.

   With all supported Postfix releases, the default settings have been
   updated so that they no longer enable export-grade ciphers, and no
   longer enable the SSLv2 and SSLv3 protocols. These ciphers and
   protocols have little if any legitimate use today, and have instead
   become a vehicle for downgrade attacks. There are no other code
   changes.

   Postfix documentation has been updated to reflect the new default
   settings and their rationale; the RELEASE_NOTES give suggestions
   for how to enable the old ciphers and protocols if your infrastructure
   requires them.

   Finally, abandoning deprecated ciphers and protocols does not really
   improve TLS security without measures to better authenticate remote
   servers. Secure DNS and TLSA are steps in that direction.

3 files changed, 16 insertions, 17 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 9528ab6c3e1..813ea862fbc 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.283 2015/06/12 10:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.283.2.1 2015/07/22 20:16:12 tron Exp $
 
-DISTNAME=	postfix-2.11.5
-PKGREVISION=	1
+DISTNAME=	postfix-2.11.6
 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/distinfo b/mail/postfix/distinfo
index 25c34763138..ba549072858 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.159 2015/04/19 15:32:48 taca Exp $
+$NetBSD: distinfo,v 1.159.2.1 2015/07/22 20:16:12 tron Exp $
 
-SHA1 (postfix-2.11.5.tar.gz) = 5aba928b7706242521e161c53e4294bd5287b220
-RMD160 (postfix-2.11.5.tar.gz) = 347e1a5f9f134562c11d393b93a890df23cb49fe
-Size (postfix-2.11.5.tar.gz) = 4036256 bytes
+SHA1 (postfix-2.11.6.tar.gz) = 005f84264ae8fa6989181bc61b756a0fd8e99dfa
+RMD160 (postfix-2.11.6.tar.gz) = 54a35e148ec169d86528857484e002e9326dc56e
+Size (postfix-2.11.6.tar.gz) = 4030414 bytes
 SHA1 (patch-aa) = 6f7dc14d53e914e9cb72752fb3941c569cd2e8f9
 SHA1 (patch-ag) = 2f96a679e7f0c2e36615f5e7993ab96296303a10
-SHA1 (patch-ai) = 01fe261dccd3119a99703fbf2a0c5247efe476ba
+SHA1 (patch-ai) = de5985d9fd6a81ea74b69224c82c665cd311c0c7
 SHA1 (patch-src_dns_dns__lookup.c) = 9c26686e5abd9aee36f042440e5f6a6ffca3df4a
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 3829f99d05e..664328d459f 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.32 2014/08/25 16:00:54 taca Exp $
+$NetBSD: patch-ai,v 1.32.8.1 2015/07/22 20:16:13 tron Exp $
 
 Make this pkgsrc friendly.
 
---- makedefs.orig	2014-01-16 19:49:11.000000000 +0000
+--- makedefs.orig	2015-07-19 14:24:10.000000000 +0000
 +++ makedefs
-@@ -182,6 +182,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -187,6 +187,8 @@ case "$SYSTEM.$RELEASE" in
  		;;
     NetBSD.6*)	SYSTYPE=NETBSD6
  		;;
@@ -13,7 +13,7 @@ Make this pkgsrc friendly.
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
     BSD/OS.3*)	SYSTYPE=BSDI3
-@@ -239,13 +241,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -244,13 +246,6 @@ case "$SYSTEM.$RELEASE" in
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -27,7 +27,7 @@ Make this pkgsrc friendly.
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -283,33 +278,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -288,33 +283,8 @@ case "$SYSTEM.$RELEASE" in
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -61,10 +61,10 @@ Make this pkgsrc friendly.
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -363,25 +333,6 @@ EOF
+@@ -368,25 +338,6 @@ EOF
  		esac
  		;;
-     Linux.3*)	SYSTYPE=LINUX3
+   Linux.[34].*)	SYSTYPE=LINUX$RELEASE_MAJOR
 -		case "$CCARGS" in
 -		 *-DNO_DB*) ;;
 -		 *-DHAS_DB*) ;;
@@ -87,7 +87,7 @@ Make this pkgsrc friendly.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
-@@ -395,24 +346,6 @@ EOF
+@@ -400,24 +351,6 @@ EOF
  		;;
       GNU.0*|GNU/kFreeBSD.[567]*)
  		SYSTYPE=GNU0
@@ -112,7 +112,7 @@ Make this pkgsrc friendly.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -443,25 +376,13 @@ EOF
+@@ -448,25 +381,13 @@ EOF
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"