[src/trunk]: src/external/ibm-public/postfix/dist Resolve conflict from last ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/96add080f86e
branches:  trunk
changeset: 763531:96add080f86e
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Mar 23 19:10:44 2011 +0000

description:
Resolve conflict from last import.

diffstat:

 external/ibm-public/postfix/dist/makedefs                 |   6 +++
 external/ibm-public/postfix/dist/src/global/mail_params.h |  29 ++++----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diffs (66 lines):

diff -r 222f84b7e87e -r 96add080f86e external/ibm-public/postfix/dist/makedefs
--- a/external/ibm-public/postfix/dist/makedefs Wed Mar 23 19:06:45 2011 +0000
+++ b/external/ibm-public/postfix/dist/makedefs Wed Mar 23 19:10:44 2011 +0000
@@ -230,6 +230,12 @@
                done
                ;;
        AIX.*)  case "`uname -v`" in
+               6)      SYSTYPE=AIX6
+                       case "$CC" in
+                       cc|*/cc|xlc|*/xlc) CCARGS="$CCARGS -w -blibpath:/usr/lib:/lib:/usr/local/lib";;
+                       esac
+                       CCARGS="$CCARGS -D_ALL_SOURCE -DHAS_POSIX_REGEXP"
+                       ;;
                5)      SYSTYPE=AIX5
                        case "$CC" in
                        cc|*/cc|xlc|*/xlc) CCARGS="$CCARGS -w -blibpath:/usr/lib:/lib:/usr/local/lib";;
diff -r 222f84b7e87e -r 96add080f86e external/ibm-public/postfix/dist/src/global/mail_params.h
--- a/external/ibm-public/postfix/dist/src/global/mail_params.h Wed Mar 23 19:06:45 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/global/mail_params.h Wed Mar 23 19:10:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mail_params.h,v 1.6 2011/03/02 19:56:38 tron Exp $     */
+/*     $NetBSD: mail_params.h,v 1.7 2011/03/23 19:10:44 tron Exp $     */
 
 #ifndef _MAIL_PARAMS_H_INCLUDED_
 #define _MAIL_PARAMS_H_INCLUDED_
@@ -2990,33 +2990,20 @@
 #define DEF_TLS_PREEMPT_CLIST  0
 extern bool var_tls_preempt_clist;
 
-#ifdef USE_TLS
-
- /*
-  * The tweak for CVE-2005-2969 is needed in some versions prior to 1.0.0
-  */
+ /* The tweak for CVE-2010-4180 is needed in some versions prior to 1.0.1 */
+ /* The tweak for CVE-2005-2969 is needed in some versions prior to 1.0.0 */
+#if defined(USE_TLS) && (OPENSSL_VERSION_NUMBER < 0x1000100fL)
 #if (OPENSSL_VERSION_NUMBER < 0x1000000fL)
-#define TLS_BUG_TWEAK_A        " CVE-2005-2969"
+#define TLS_BUG_TWEAKS         "CVE-2005-2969 CVE-2010-4180"
 #else
-#define TLS_BUG_TWEAK_A ""
+#define TLS_BUG_TWEAKS         "CVE-2010-4180"
 #endif
-
- /*
-  * The tweak for CVE-2010-4180 is needed in some versions prior to 1.0.1
-  */
-#if (OPENSSL_VERSION_NUMBER < 0x1000100fL)
-#define TLS_BUG_TWEAK_B        " CVE-2010-4180"
 #else
-#define TLS_BUG_TWEAK_B        " "
+#define TLS_BUG_TWEAKS         ""
 #endif
 
-#else /* USE_TLS */
-#define TLS_BUG_TWEAK_A        ""
-#define TLS_BUG_TWEAK_B        " "
-#endif /* USE_TLS */
-
 #define VAR_TLS_BUG_TWEAKS     "tls_disable_workarounds"
-#define DEF_TLS_BUG_TWEAKS     ((TLS_BUG_TWEAK_A TLS_BUG_TWEAK_B)+1)
+#define DEF_TLS_BUG_TWEAKS     TLS_BUG_TWEAKS
 extern char *var_tls_bug_tweaks;
 
  /*