From b5f4678b8a5e893c7458b2eace11fa3ab9d64b46 Mon Sep 17 00:00:00 2001
From: martin <martin@pkgsrc.org>
Date: Tue, 20 Jan 2004 19:37:45 +0000
Subject: Apply the SASL2 cure to smtp and lmtp to. This makes outgoing
 authenticated mail work.

---
 mail/postfix/distinfo         |  6 +++---
 mail/postfix/patches/patch-ab | 23 +++++++++++++++++++++++
 mail/postfix/patches/patch-ac | 23 +++++++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 mail/postfix/patches/patch-ab
 create mode 100644 mail/postfix/patches/patch-ac

(limited to 'mail')

diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index ce4b1838916..2d4ca3eb6c7 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.48 2003/10/03 15:04:52 christos Exp $
+$NetBSD: distinfo,v 1.49 2004/01/20 19:37:45 martin Exp $
 
 SHA1 (postfix/postfix-2.0.16.tar.gz) = 6272be8b87df1142a467f2a4e13c4e27d00bf952
 Size (postfix/postfix-2.0.16.tar.gz) = 1353520 bytes
-SHA1 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = c974934914aac2ec4fae1c20ad937713fac1ccc7
-Size (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = 253429 bytes
 SHA1 (patch-aa) = 39a89a28cec3fd264dbda97633e34695eaad01e9
+SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
+SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
 SHA1 (patch-ad) = 2f83cc6108eea4a1c401fe9e549d93430166f7fa
 SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
 SHA1 (patch-af) = 4d3a6c21d284dce1c75dcd4fc537af17a28a5e66
diff --git a/mail/postfix/patches/patch-ab b/mail/postfix/patches/patch-ab
new file mode 100644
index 00000000000..b161debce4d
--- /dev/null
+++ b/mail/postfix/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.8 2004/01/20 19:37:45 martin Exp $
+
+--- src/lmtp/lmtp.h.orig	2003-09-10 02:48:03.000000000 +0200
++++ src/lmtp/lmtp.h	2004-01-20 20:30:12.000000000 +0100
+@@ -11,10 +11,18 @@
+  /*
+   * SASL library.
+   */
++#ifdef USE_SASL2_AUTH
++#ifndef USE_SASL_AUTH
++#define USE_SASL_AUTH
++#endif
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
++#else
+ #ifdef USE_SASL_AUTH
+ #include <sasl.h>
+ #include <saslutil.h>
+ #endif
++#endif
+ 
+  /*
+   * Utility library.
diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac
new file mode 100644
index 00000000000..ce2d6c65faa
--- /dev/null
+++ b/mail/postfix/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.6 2004/01/20 19:37:45 martin Exp $
+
+--- src/smtp/smtp.h.orig	2002-05-23 21:18:02.000000000 +0200
++++ src/smtp/smtp.h	2004-01-20 20:29:21.000000000 +0100
+@@ -11,10 +11,18 @@
+  /*
+   * SASL library.
+   */
++#ifdef USE_SASL2_AUTH
++#ifndef USE_SASL_AUTH
++#define USE_SASL_AUTH
++#endif
++#include <sasl/sasl.h>
++#include <sasl/saslutil.h>
++#else
+ #ifdef USE_SASL_AUTH
+ #include <sasl.h>
+ #include <saslutil.h>
+ #endif
++#endif
+ 
+  /*
+   * Utility library.
-- 
cgit v1.2.3