From: Wietse Venema <wietse@porcupine.org>
Date: Thu, 3 Jun 2010 05:00:00 +0000 (-0500)
Subject: postfix-2.7.1-RC2
X-Git-Tag: v2.7.1-RC2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10164808fd96a0b85213fe7f38622b3335e4b965;p=thirdparty%2Fpostfix.git

postfix-2.7.1-RC2
---

diff --git a/postfix/makedefs b/postfix/makedefs
index b4473c9b8..de57a6a3e 100644
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -421,10 +421,10 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
 		 [1-6].*) CCARGS="$CCARGS -DNO_IPV6";;
 		       *) CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO";;
 		esac
-		# Darwin 10.3.0 no longer has <arpa/nameser8_compat.h>.
+		# Darwin 10.3.0 no longer has <nameser8_compat.h>.
 		case $RELEASE in
 		     ?.*) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_NAMESER8_COMPAT_H";;
-		       *) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_NAMESER_COMPAT_H";;
+		       *) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H";;
 		esac
 		# kqueue and/or poll are broken up to and including MacOS X 10.5
 		CCARGS="$CCARGS -DNO_KQUEUE"
diff --git a/postfix/src/dns/dns.h b/postfix/src/dns/dns.h
index 63dc6cb7e..74e6cf6af 100644
--- a/postfix/src/dns/dns.h
+++ b/postfix/src/dns/dns.h
@@ -22,8 +22,8 @@
 #ifdef RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
 #include <nameser8_compat.h>
 #endif
-#ifdef RESOLVE_H_NEEDS_NAMESER_COMPAT_H
-#include <nameser_compat.h>
+#ifdef RESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
 #endif
 #include <resolv.h>
 
diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index fb94364e3..ac37e3e55 100644
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -2922,7 +2922,7 @@ extern bool var_smtp_cname_overr;
 #ifdef USE_TLS
 #include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER >= 0x1000000fL
-#define PREFER_aNULL "aNULL:"
+#define PREFER_aNULL "aNULL:-aNULL:"
 #else
 #define PREFER_aNULL ""
 #endif
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 883b88eb8..93a87cd3c 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20100601"
-#define MAIL_VERSION_NUMBER	"2.7.1-RC1"
+#define MAIL_RELEASE_DATE	"20100603"
+#define MAIL_VERSION_NUMBER	"2.7.1-RC2"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE