Include a patch taken from the main Courier CVS repository that adds

a new TLS_PROTOCOL selection "SSL23" that allows for trying to negotiate
initially with SSLv3 but falling back to SSLv2:

	courier/tcpd/libcouriertls.c:1.21

This allows Courier to interoperate with older mail servers and clients
that are still using SSLv2 when advertising or attempting to use
advertised STARTTLS capabilities.

This change modifies the following packages and bumps their PKGREVISIONs:

	mail/courier-imap	to 1.
	mail/courier-mta	to 6.
	meta-pkgs/courier	to 2.
	net/couriertcpd		to 1.

6 files changed, 36 insertions, 7 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index ad03a439add..acfd965dce7 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2007/08/10 17:56:57 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2007/09/17 15:28:04 jlam Exp $
 
 DISTNAME=	courier-imap-4.1.3
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +11,7 @@ COMMENT=	IMAP server for access to maildir-style mailboxes
 HOMEPAGE=	http://www.courier-mta.org/imap/
 
 DEPENDS+=	courier-maildir>=0.53.1:../../mail/courier-maildir
-DEPENDS+=	couriertcpd>=0.53.2nb2:../../net/couriertcpd
+DEPENDS+=	couriertcpd>=0.56.0nb1:../../net/couriertcpd
 
 USE_TOOLS+=		env gmake openssl:run perl
 USE_LANGUAGES=		c c++
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index ac876183101..02813990ff1 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2007/08/10 17:56:57 jlam Exp $
+$NetBSD: distinfo,v 1.21 2007/09/17 15:28:04 jlam Exp $
 
 SHA1 (courier-imap-4.1.3.tar.bz2) = d0042e585d6df658a41a1768887d135c89e51ac0
 RMD160 (courier-imap-4.1.3.tar.bz2) = b1422973a7c3b13cf35e895a8494761aa4b80834
@@ -11,3 +11,4 @@ SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
 SHA1 (patch-ah) = 1870daea8320cc9748961fc7e37237bd5cde1b3c
 SHA1 (patch-ak) = 8919d48a0bc8093f30e2cc8316ff242752bcbc4a
 SHA1 (patch-al) = 5e3d549c96a0d25f963ecd08f8bf9f077263cd38
+SHA1 (patch-am) = dad09106cda99b6f43f5dff01ee7b33fc33def51
diff --git a/mail/courier-imap/patches/patch-am b/mail/courier-imap/patches/patch-am
new file mode 100644
index 00000000000..48a53e6cd72
--- /dev/null
+++ b/mail/courier-imap/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.1 2007/09/17 15:28:04 jlam Exp $
+
+--- tcpd/libcouriertls.c.orig	Sat Oct 28 17:47:32 2006
++++ tcpd/libcouriertls.c
+@@ -418,7 +418,8 @@ SSL_CTX *tls_create(int isserver, const 
+ 
+ 	ctx=SSL_CTX_new(protocol && strcmp(protocol, "SSL2") == 0
+ 							? SSLv2_method():
+-		protocol && strcmp(protocol, "SSL3") == 0 ? SSLv23_method():
++		protocol && strcmp(protocol, "SSL3") == 0 ? SSLv3_method():
++		protocol && strcmp(protocol, "SSL23") == 0 ? SSLv23_method():
+ 		TLSv1_method());
+ 
+ 	if (!ctx)
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index ab64437d6ab..aab43e667e3 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2007/09/11 02:35:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/17 15:28:04 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +14,7 @@ COMMENT=	Courier mail transport agent
 HOMEPAGE=	http://www.courier-mta.org/
 
 DEPENDS+=	courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
-DEPENDS+=	couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
+DEPENDS+=	couriertcpd>=${COURIER_VERSION}nb1:../../net/couriertcpd
 DEPENDS+=	maildrop>=2.0.4:../../mail/maildrop
 
 USE_TOOLS+=		gmake openssl:run perl:run
diff --git a/mail/courier-mta/distinfo b/mail/courier-mta/distinfo
index 60d15cf41d1..26a2a5eea5a 100644
--- a/mail/courier-mta/distinfo
+++ b/mail/courier-mta/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/09/06 04:05:39 jlam Exp $
+$NetBSD: distinfo,v 1.7 2007/09/17 15:28:04 jlam Exp $
 
 SHA1 (courier-0.56.0.tar.bz2) = 536f24db9f33f8d93445c03dd4edb50c7ec2f6b2
 RMD160 (courier-0.56.0.tar.bz2) = ce8e2d99f5b7baf500d748c18fbd126df8331398
@@ -22,3 +22,4 @@ SHA1 (patch-ar) = ab2c3e40928933eced0856a7c378c908e8a4689d
 SHA1 (patch-as) = 08bd540d92a3ef9db533a92b48c653ed2a256f9b
 SHA1 (patch-at) = 7c93cabfe5b1164c6699111cd74e612af887881c
 SHA1 (patch-au) = 794fdd49f7994689e4e4ee809293d2e67d9bc4c2
+SHA1 (patch-av) = df4847bcf1127766f35cfecd65a293fa2bf7d6c9
diff --git a/mail/courier-mta/patches/patch-av b/mail/courier-mta/patches/patch-av
new file mode 100644
index 00000000000..5f2568b276c
--- /dev/null
+++ b/mail/courier-mta/patches/patch-av
@@ -0,0 +1,12 @@
+$NetBSD: patch-av,v 1.1 2007/09/17 15:28:05 jlam Exp $
+
+--- tcpd/libcouriertls.c.orig	Tue May 22 10:59:26 2007
++++ tcpd/libcouriertls.c
+@@ -419,6 +419,7 @@ SSL_CTX *tls_create(int isserver, const 
+ 	ctx=SSL_CTX_new(protocol && strcmp(protocol, "SSL2") == 0
+ 							? SSLv2_method():
+ 		protocol && strcmp(protocol, "SSL3") == 0 ? SSLv3_method():
++		protocol && strcmp(protocol, "SSL23") == 0 ? SSLv23_method():
+ 		TLSv1_method());
+ 
+ 	if (!ctx)