From 8c31ac27f785bba096db8a9006e7c7960402b852 Mon Sep 17 00:00:00 2001 From: jca Date: Mon, 20 Jul 2015 07:17:40 +0000 Subject: [PATCH] Cope with the upcoming SSLv3 removal. ok sthen@ giovanni@ (maintainer) --- mail/courier-imap/Makefile | 5 +++-- .../patches/patch-libs_tcpd_configure_ac | 12 ++++++++++++ .../patches/patch-libs_tcpd_libcouriertls_c | 13 +++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 mail/courier-imap/patches/patch-libs_tcpd_configure_ac create mode 100644 mail/courier-imap/patches/patch-libs_tcpd_libcouriertls_c diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 4fbe326fbc2..fed1614853a 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -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" \ diff --git a/mail/courier-imap/patches/patch-libs_tcpd_configure_ac b/mail/courier-imap/patches/patch-libs_tcpd_configure_ac new file mode 100644 index 00000000000..103bf1a4d55 --- /dev/null +++ b/mail/courier-imap/patches/patch-libs_tcpd_configure_ac @@ -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" diff --git a/mail/courier-imap/patches/patch-libs_tcpd_libcouriertls_c b/mail/courier-imap/patches/patch-libs_tcpd_libcouriertls_c new file mode 100644 index 00000000000..dfb65327dda --- /dev/null +++ b/mail/courier-imap/patches/patch-libs_tcpd_libcouriertls_c @@ -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 },