summaryrefslogtreecommitdiff
path: root/mail/courier-imap
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-09-17 15:28:03 +0000
committerjlam <jlam@pkgsrc.org>2007-09-17 15:28:03 +0000
commit2f710b31e751ed6e608dba60d53060dad99d8579 (patch)
tree6d5673b8a66bd39b99a142dc0dced239fe01d61d /mail/courier-imap
parent3e50b17466d788c032c911b798c994047864de02 (diff)
downloadpkgsrc-2f710b31e751ed6e608dba60d53060dad99d8579.tar.gz
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.
Diffstat (limited to 'mail/courier-imap')
-rw-r--r--mail/courier-imap/Makefile5
-rw-r--r--mail/courier-imap/distinfo3
-rw-r--r--mail/courier-imap/patches/patch-am14
3 files changed, 19 insertions, 3 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)