3 files changed, 7 insertions, 7 deletions
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index a4d1f7da255c..7b1e8e3810f1 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.5.17
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	25
diff --git a/mail/cyrus-imapd25/files/patch-imap__tls.c b/mail/cyrus-imapd25/files/patch-imap__tls.c
index 46f23994ce9b..48584e3a2409 100644
--- a/mail/cyrus-imapd25/files/patch-imap__tls.c
+++ b/mail/cyrus-imapd25/files/patch-imap__tls.c
@@ -4,9 +4,9 @@
      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 */
-+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
++#if defined(SSL_OP_NO_COMPRESSION)
      off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */
-+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
++#endif
  
      const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS);
  
@@ -14,9 +14,9 @@
      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 */
-+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
++#if defined(SSL_OP_NO_COMPRESSION)
      off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */
-+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
++#endif
  
      SSL_CTX_set_options(c_ctx, off);
      SSL_CTX_set_info_callback(c_ctx, apps_ssl_info_callback);
diff --git a/mail/cyrus-imapd25/files/patch-imtest__imtest.c b/mail/cyrus-imapd25/files/patch-imtest__imtest.c
index 2c80ed67bc66..0ae1041e4d5b 100644
--- a/mail/cyrus-imapd25/files/patch-imtest__imtest.c
+++ b/mail/cyrus-imapd25/files/patch-imtest__imtest.c
@@ -4,9 +4,9 @@
      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 */
-+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
++#if defined(SSL_OP_NO_COMPRESSION)
      off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */
-+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
++#endif
      SSL_CTX_set_options(tls_ctx, off);
      SSL_CTX_set_info_callback(tls_ctx, apps_ssl_info_callback);