cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cope with the upcoming SSLv3 removal.

Browse Source 
ok sthen@ giovanni@ (maintainer)
This commit is contained in:
jca 2015-07-20 07:17:40 +00:00
parent c15d46a158
commit 8c31ac27f7
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/courier-imap/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.97 2015/07/15 21:14:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.98 2015/07/20 07:17:40 jca Exp $
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
@ -29,7 +29,8 @@ WANTLIB-pop3+= idn pcre ${MODGETTEXT_WANTLIB}
USE_GMAKE= Yes
USE_GROFF= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf autoheader
AUTOCONF_VERSION= 2.69
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CXXFLAGS="-I${LOCALBASE}/include" \

12
mail/courier-imap/patches/patch-libs_tcpd_configure_ac Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libs_tcpd_configure_ac,v 1.1 2015/07/20 07:17:40 jca Exp $
--- libs/tcpd/configure.ac.orig Sat Jul 18 19:01:58 2015
+++ libs/tcpd/configure.ac Sat Jul 18 19:03:20 2015
@@ -507,7 +507,7 @@ RAND_pseudo_bytes(dummy, 1);
]
)
LIBS="-lssl $LIBS"
- AC_CHECK_FUNCS(TLSv1_1_method TLSv1_2_method)
+ AC_CHECK_FUNCS(SSLv3_method TLSv1_1_method TLSv1_2_method)
LIBS="$save_LIBS"
TLSLIBRARY="$LIBCOURIERTLSOPENSSL"

13
mail/courier-imap/patches/patch-libs_tcpd_libcouriertls_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libs_tcpd_libcouriertls_c,v 1.3 2015/07/20 07:17:40 jca Exp $
--- libs/tcpd/libcouriertls.c.orig Wed Oct 22 02:00:12 2014
+++ libs/tcpd/libcouriertls.c Sat Jul 18 19:12:58 2015
@@ -74,7 +74,9 @@ struct proto_ops op_list[] =
{ "TLSv1", &TLSv1_method, SSL_OP_ALL },
{ "TLS1", &TLSv1_method, SSL_OP_ALL },
{ "SSL3+", &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2 },
+#ifdef HAVE_SSLV3_METHOD
{ "SSL3", &SSLv3_method, SSL_OP_ALL },
+#endif
{ "SSL23", &SSLv23_method, SSL_OP_ALL },
{ "", &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
{ NULL, &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },