Index: mail/cyrus-imapd25/Makefile
===================================================================
--- mail/cyrus-imapd25/Makefile	(revision 465230)
+++ mail/cyrus-imapd25/Makefile	(working copy)
@@ -96,7 +96,7 @@
 OSMAJOR=	${UNAMER:C/[.-].*//}
 
 OPTIONS_RADIO=			GSSAPI
-OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT
+OPTIONS_RADIO_GSSAPI=		GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=		GSSAPI_BASE
 .if ${OSMAJOR} >= 9
@@ -112,6 +112,7 @@
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
+GSSAPI_NONE_CONFIGURE_ON=	--disable-gssapi --without-gss_impl
 
 MANDIRS=	${CYRUS_PREFIX}/man
 
Index: mail/cyrus-imapd25/files/patch-imap__tls.c
===================================================================
--- mail/cyrus-imapd25/files/patch-imap__tls.c	(revision 465230)
+++ mail/cyrus-imapd25/files/patch-imap__tls.c	(working copy)
@@ -1,15 +1,16 @@
---- imap/tls.c.orig	2016-07-22 01:55:57 UTC
+--- imap/tls.c.orig	2017-05-09 00:40:13 UTC
 +++ imap/tls.c
-@@ -222,7 +222,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
+@@ -222,7 +222,8 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
  }
  #endif
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  /* replacements for new 1.1 API accessors */
  /* XXX probably put these somewhere central */
  static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-@@ -723,7 +723,9 @@ EXPORTED int     tls_init_serverengine(c
+@@ -726,7 +727,9 @@ EXPORTED int     tls_init_serverengine(c
      off |= SSL_OP_ALL;            /* Work around all known bugs */
      off |= SSL_OP_NO_SSLv2;       /* Disable insecure SSLv2 */
      off |= SSL_OP_NO_SSLv3;       /* Disable insecure SSLv3 */
@@ -19,7 +20,7 @@
  
      const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS);
  
-@@ -1441,7 +1443,9 @@ HIDDEN int tls_init_clientengine(int ver
+@@ -1448,7 +1451,9 @@ HIDDEN int tls_init_clientengine(int ver
      off |= SSL_OP_ALL;            /* Work around all known bugs */
      off |= SSL_OP_NO_SSLv2;       /* Disable insecure SSLv2 */
      off |= SSL_OP_NO_SSLv3;       /* Disable insecure SSLv3 */