Skip to content
GitLab
Commit bd068fb3 authored by ume's avatar ume
Browse files

better macro checking. 

Reported by:	nork
parent a39d3a54
Hide whitespace changes
Inline Side-by-side
mail/cyrus-imapd25/Makefile
View file @ bd068fb3
......@@ -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
......
mail/cyrus-imapd25/files/patch-imap__tls.c
View file @ bd068fb3
......@@ -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);
mail/cyrus-imapd25/files/patch-imtest__imtest.c
View file @ bd068fb3
......@@ -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);
mail/cyrus-imapd30/Makefile
View file @ bd068fb3
......@@ -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
......
mail/cyrus-imapd30/files/patch-imap__tls.c
View file @ bd068fb3
......@@ -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);
mail/cyrus-imapd30/files/patch-imtest__imtest.c
View file @ bd068fb3
......@@ -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);
mail/cyrus-imapd32/Makefile
View file @ bd068fb3
......@@ -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
......
mail/cyrus-imapd32/files/patch-imap__tls.c
View file @ bd068fb3
......@@ -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);
mail/cyrus-imapd32/files/patch-imtest__imtest.c
View file @ bd068fb3
......@@ -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);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment