[pkgsrc/trunk]: pkgsrc/mail/postfix Fix default value of smtp_sasl_tls_securi...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a53d52578159
branches:  trunk
changeset: 515194:a53d52578159
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jun 27 04:40:49 2006 +0000

description:
Fix default value of smtp_sasl_tls_security_options to use
$smtp_sasl_security_options (as documented in postconf(5)) instead of
$var_smtp_sasl_opts, which is never defined.  This is a bug that exists
in the Postfix-2.2.x series but has been fixed in the (current)
Postfix-2.3.x series.  This fixes PR pkg/29631 by Christoph Badura.
Bump the PKGREVISION to 1.

diffstat:

 mail/postfix/Makefile         |   4 ++--
 mail/postfix/distinfo         |   3 ++-
 mail/postfix/patches/patch-ae |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r d9e26d5ce3b5 -r a53d52578159 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Mon Jun 26 23:28:51 2006 +0000
+++ b/mail/postfix/Makefile     Tue Jun 27 04:40:49 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.181 2006/05/01 02:57:03 jlam Exp $
+# $NetBSD: Makefile,v 1.182 2006/06/27 04:40:49 jlam Exp $
 
 DISTNAME=      postfix-2.2.10
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff -r d9e26d5ce3b5 -r a53d52578159 mail/postfix/distinfo
--- a/mail/postfix/distinfo     Mon Jun 26 23:28:51 2006 +0000
+++ b/mail/postfix/distinfo     Tue Jun 27 04:40:49 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.97 2006/04/07 09:08:29 martti Exp $
+$NetBSD: distinfo,v 1.98 2006/06/27 04:40:50 jlam Exp $
 
 SHA1 (postfix/postfix-2.2.10.tar.gz) = a432bd45f0c7098482394dd7b9c97100e8a040e1
 RMD160 (postfix/postfix-2.2.10.tar.gz) = 12376298eef12cbe127687328ebfb9166cfee5d6
 Size (postfix/postfix-2.2.10.tar.gz) = 2443513 bytes
 SHA1 (patch-aa) = 49d2bf6c7e5bbe5aac4d950ac69c7b6b32a98ef3
+SHA1 (patch-ae) = eec6e9c9eb0a979d06ff2c62e7a1f66cb8274c84
 SHA1 (patch-ai) = 80db725720eb46083f69785ce3616b7a461e850a
diff -r d9e26d5ce3b5 -r a53d52578159 mail/postfix/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix/patches/patch-ae     Tue Jun 27 04:40:49 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.11 2006/06/27 04:40:50 jlam Exp $
+
+--- src/global/mail_params.h.orig      2006-02-03 11:06:52.000000000 -0500
++++ src/global/mail_params.h
+@@ -1186,7 +1186,7 @@ extern char *var_smtpd_sasl_opts;
+ extern char *var_smtpd_sasl_appname;
+ 
+ #define VAR_SMTPD_SASL_TLS_OPTS       "smtpd_sasl_tls_security_options"
+-#define DEF_SMTPD_SASL_TLS_OPTS       "$smtpd_sasl_security_options"
++#define DEF_SMTPD_SASL_TLS_OPTS       "$" VAR_SMTPD_SASL_OPTS
+ extern char *var_smtpd_sasl_tls_opts;
+ 
+ #define VAR_SMTPD_SASL_REALM  "smtpd_sasl_local_domain"
+@@ -1227,7 +1227,7 @@ extern char *var_smtp_sasl_opts;
+ extern char *var_smtp_sasl_mechs;
+ 
+ #define VAR_SMTP_SASL_TLS_OPTS        "smtp_sasl_tls_security_options"
+-#define DEF_SMTP_SASL_TLS_OPTS        "$var_smtp_sasl_opts"
++#define DEF_SMTP_SASL_TLS_OPTS        "$" VAR_SMTP_SASL_OPTS
+ extern char *var_smtp_sasl_tls_opts;
+ 
+  /*