postfix-2.7.1-RC2

diff --git a/postfix/makedefs b/postfix/makedefs
index b4473c9b83d4219211b0003fd1ead25e64485c48..de57a6a3e270d189582ca89fce781957025a1853 100644 (file)
--- 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 63dc6cb7e9ee8b30d08d645ee3f5ac2441b514ee..74e6cf6afe32fa5db9af20256cb487765405467f 100644 (file)
--- 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 fb94364e3a5e297a1b5ba37dac77c7da751ebedb..ac37e3e557467bd86961877a12a9db71eeb8e6c6 100644 (file)
--- 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 883b88eb8f689cf06f095babd20667f65b9e750d..93a87cd3c3636c416f154cca83415f63dc949427 100644 (file)
--- 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