svn commit: r569547 - in head/mail: cyrus-imapd25 cyrus-imapd25/files cyrus-imapd30 cyrus-imapd30/files cyrus-imapd32 cyrus-imapd32/files
Hajimu UMEMOTO
ume at FreeBSD.org
Tue Mar 30 11:10:20 UTC 2021
Author: ume
Date: Tue Mar 30 11:10:17 2021
New Revision: 569547
URL: https://svnweb.freebsd.org/changeset/ports/569547
Log:
better macro checking.
Reported by: nork
Modified:
head/mail/cyrus-imapd25/Makefile
head/mail/cyrus-imapd25/files/patch-imap__tls.c
head/mail/cyrus-imapd25/files/patch-imtest__imtest.c
head/mail/cyrus-imapd30/Makefile
head/mail/cyrus-imapd30/files/patch-imap__tls.c
head/mail/cyrus-imapd30/files/patch-imtest__imtest.c
head/mail/cyrus-imapd32/Makefile
head/mail/cyrus-imapd32/files/patch-imap__tls.c
head/mail/cyrus-imapd32/files/patch-imtest__imtest.c
Modified: head/mail/cyrus-imapd25/Makefile
==============================================================================
--- head/mail/cyrus-imapd25/Makefile Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd25/Makefile Tue Mar 30 11:10:17 2021 (r569547)
@@ -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
Modified: head/mail/cyrus-imapd25/files/patch-imap__tls.c
==============================================================================
--- head/mail/cyrus-imapd25/files/patch-imap__tls.c Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd25/files/patch-imap__tls.c Tue Mar 30 11:10:17 2021 (r569547)
@@ -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);
Modified: head/mail/cyrus-imapd25/files/patch-imtest__imtest.c
==============================================================================
--- head/mail/cyrus-imapd25/files/patch-imtest__imtest.c Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd25/files/patch-imtest__imtest.c Tue Mar 30 11:10:17 2021 (r569547)
@@ -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);
Modified: head/mail/cyrus-imapd30/Makefile
==============================================================================
--- head/mail/cyrus-imapd30/Makefile Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd30/Makefile Tue Mar 30 11:10:17 2021 (r569547)
@@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.0.15
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 30
Modified: head/mail/cyrus-imapd30/files/patch-imap__tls.c
==============================================================================
--- head/mail/cyrus-imapd30/files/patch-imap__tls.c Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd30/files/patch-imap__tls.c Tue Mar 30 11:10:17 2021 (r569547)
@@ -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);
Modified: head/mail/cyrus-imapd30/files/patch-imtest__imtest.c
==============================================================================
--- head/mail/cyrus-imapd30/files/patch-imtest__imtest.c Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd30/files/patch-imtest__imtest.c Tue Mar 30 11:10:17 2021 (r569547)
@@ -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);
Modified: head/mail/cyrus-imapd32/Makefile
==============================================================================
--- head/mail/cyrus-imapd32/Makefile Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd32/Makefile Tue Mar 30 11:10:17 2021 (r569547)
@@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.2.6
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 32
Modified: head/mail/cyrus-imapd32/files/patch-imap__tls.c
==============================================================================
--- head/mail/cyrus-imapd32/files/patch-imap__tls.c Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd32/files/patch-imap__tls.c Tue Mar 30 11:10:17 2021 (r569547)
@@ -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);
Modified: head/mail/cyrus-imapd32/files/patch-imtest__imtest.c
==============================================================================
--- head/mail/cyrus-imapd32/files/patch-imtest__imtest.c Tue Mar 30 10:24:25 2021 (r569546)
+++ head/mail/cyrus-imapd32/files/patch-imtest__imtest.c Tue Mar 30 11:10:17 2021 (r569547)
@@ -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);
More information about the svn-ports-head
mailing list