summaryrefslogtreecommitdiff
path: root/mail/courier-mta
diff options
context:
space:
mode:
authorjlam <jlam>2007-09-17 15:28:03 +0000
committerjlam <jlam>2007-09-17 15:28:03 +0000
commitc5e0726ccaa23ad7085c103e4a97f51ba096f6ff (patch)
tree6d5673b8a66bd39b99a142dc0dced239fe01d61d /mail/courier-mta
parent0b1aafc3d987fa952bfe5b127cb403dac80fdb7d (diff)
downloadpkgsrc-c5e0726ccaa23ad7085c103e4a97f51ba096f6ff.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-mta')
-rw-r--r--mail/courier-mta/Makefile6
-rw-r--r--mail/courier-mta/distinfo3
-rw-r--r--mail/courier-mta/patches/patch-av12
3 files changed, 17 insertions, 4 deletions
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)