postfix-2.10.7

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 702a88947b77010a826c1fe2a91835b92ef3f114..7c35b7ba64d2f56dd016e769f79a752d9d972b13 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -17922,7 +17922,7 @@ Apologies for any names omitted.
 
 20120824
 
-       Feature: support for "sendmail -R hdrs|full". Jan Kundrát.
+       Feature: support for "sendmail -R hdrs|full". Jan Kundr?t.
        File: sendmail/sendmail.c.
 
 20120902
@@ -18402,3 +18402,21 @@ Apologies for any names omitted.
        Safety: stop aliasing loops that exponentially increase the
        address length with each iteration. Back-ported from Postfix
        3.0. File: cleanup/cleanup_map1n.c.
+
+20150324
+
+       Bugfix (introduced: Postfix 2.6): sender_dependent_relayhost_maps
+       ignored the relayhost setting in the case of a DUNNO lookup
+       result.  It would use the recipient domain instead.  Viktor
+       Dukhovni. Wietse took the pieces of code that enforce the
+       precedence of a sender-dependent relayhost, the global
+       relayhost, and the recipient domain, and put that code
+       together in once place so that it is easier to maintain.
+       File: trivial-rewrite/resolve.c.
+
+20150408
+
+       Portability: FreeBSD10 support. Files: makedefs, util/sys_defs.h.
+
+       Incompatibility: specifying "make makefiles" with "CC=command"
+       will no longer override the default WARN setting.

diff --git a/postfix/makedefs b/postfix/makedefs
index 79e32af92257d59922daca8b8f716ce8dae059f1..bbb81ad21c4b380f7d23198213dbedb5396e9272 100644 (file)
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -155,6 +155,9 @@ case "$SYSTEM.$RELEASE" in
                ;;
   FreeBSD.9*)  SYSTYPE=FREEBSD9
                ;;
+  FreeBSD.10*) SYSTYPE=FREEBSD10
+               : ${CC=cc}
+               ;;
   OpenBSD.2*)  SYSTYPE=OPENBSD2
                ;;
   OpenBSD.3*)  SYSTYPE=OPENBSD3
@@ -454,7 +457,6 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
     Darwin.*)   SYSTYPE=MACOSX
                # Use the native compiler by default
                : ${CC=cc}
-               CCARGS="$CCARGS \$(WARN)"
                # Darwin > 1.3 uses awk and flat_namespace
                case $RELEASE in
                 1.[0-3]) AWK=gawk;;
@@ -656,7 +658,7 @@ esac
 # een burned once by a compiler that lies about what warnings it
 # produces, not taking that chance again.
 
-: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \
+: ${CC=gcc} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \
 ${WARN='-Wall -Wno-comment -Wformat -Wimplicit -Wmissing-prototypes \
        -Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
        -Wunused -Wno-missing-braces'}
@@ -679,7 +681,7 @@ AR  = $AR
 ARFL   = $ARFL
 RANLIB = $RANLIB
 SYSLIBS        = $AUXLIBS $SYSLIBS
-CC     = $CC $CCARGS
+CC     = $CC $CCARGS \$(WARN)
 OPT    = $OPT
 DEBUG  = $DEBUG
 AWK    = $AWK

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 22ddec2709a4d89e8d5a492c28473891635f7593..f42dffa8b31836b790522aaea073b41e02519317 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      "20150208"
-#define MAIL_VERSION_NUMBER    "2.10.6"
+#define MAIL_RELEASE_DATE      "20150412"
+#define MAIL_VERSION_NUMBER    "2.10.7"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE     "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/trivial-rewrite/resolve.c b/postfix/src/trivial-rewrite/resolve.c
index d9a709e30fad24eed739c6b792d2aa548bee7316..84d1d63af066768b362147997b6e4e9b1a26c92a 100644 (file)
--- a/postfix/src/trivial-rewrite/resolve.c
+++ b/postfix/src/trivial-rewrite/resolve.c
@@ -549,15 +549,20 @@ static void resolve_addr(RES_CONTEXT *rp, char *sender, char *addr,
                if (*relay == 0) {
                    msg_warn("%s: ignoring null lookup result for %s",
                             rp->snd_relay_maps_name, sender_key);
-                   relay = "DUNNO";
-               }
-               vstring_strcpy(nexthop, strcasecmp(relay, "DUNNO") == 0 ?
-                              rcpt_domain : relay);
+                   relay = 0;
+               } else if (strcasecmp(relay, "DUNNO") == 0)
+                   relay = 0;
            } else if (rp->snd_relay_info
                       && rp->snd_relay_info->error != 0) {
                msg_warn("%s lookup failure", rp->snd_relay_maps_name);
                *flags |= RESOLVE_FLAG_FAIL;
                FREE_MEMORY_AND_RETURN;
+           } else {
+               relay = 0;
+           }
+           /* Enforce all the relayhost precedences in one place. */
+           if (relay != 0) {
+               vstring_strcpy(nexthop, relay);
            } else if (*RES_PARAM_VALUE(rp->relayhost))
                vstring_strcpy(nexthop, RES_PARAM_VALUE(rp->relayhost));
            else

diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 00cbdc2e139f45e115389a2535e861da27db36a1..83ff4a2349b1edc37726fc0a467372062bd25ab5 100644 (file)
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -25,7 +25,7 @@
   */
 #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
     || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
-    || defined(FREEBSD8) || defined(FREEBSD9) \
+    || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
     || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
     || defined(OPENBSD5) \