aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2021-03-30 11:10:17 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2021-03-30 11:10:17 +0000
commit8c616ad3396c044ad1defcc4a6b73dfe1802bfc0 (patch)
treef6adbc0fac8346cb7e9abbd741ca48c2d77e15b8 /mail
parent42bf4c920b0b8b21c77d3a069a7db65a4f96e7a9 (diff)
downloadports-8c616ad3396c044ad1defcc4a6b73dfe1802bfc0.tar.gz
ports-8c616ad3396c044ad1defcc4a6b73dfe1802bfc0.zip
better macro checking.
Reported by: nork
Notes
Notes: svn path=/head/; revision=569547
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd25/Makefile2
-rw-r--r--mail/cyrus-imapd25/files/patch-imap__tls.c8
-rw-r--r--mail/cyrus-imapd25/files/patch-imtest__imtest.c4
-rw-r--r--mail/cyrus-imapd30/Makefile2
-rw-r--r--mail/cyrus-imapd30/files/patch-imap__tls.c8
-rw-r--r--mail/cyrus-imapd30/files/patch-imtest__imtest.c4
-rw-r--r--mail/cyrus-imapd32/Makefile2
-rw-r--r--mail/cyrus-imapd32/files/patch-imap__tls.c8
-rw-r--r--mail/cyrus-imapd32/files/patch-imtest__imtest.c4
9 files changed, 21 insertions, 21 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);
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index e26ed848d11d..919219940e30 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -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
diff --git a/mail/cyrus-imapd30/files/patch-imap__tls.c b/mail/cyrus-imapd30/files/patch-imap__tls.c
index 0d907d05f701..cc43b5c26384 100644
--- a/mail/cyrus-imapd30/files/patch-imap__tls.c
+++ b/mail/cyrus-imapd30/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-imapd30/files/patch-imtest__imtest.c b/mail/cyrus-imapd30/files/patch-imtest__imtest.c
index 2c80ed67bc66..0ae1041e4d5b 100644
--- a/mail/cyrus-imapd30/files/patch-imtest__imtest.c
+++ b/mail/cyrus-imapd30/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);
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index bafe9891a88a..7b31d35327de 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -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
diff --git a/mail/cyrus-imapd32/files/patch-imap__tls.c b/mail/cyrus-imapd32/files/patch-imap__tls.c
index 0d907d05f701..cc43b5c26384 100644
--- a/mail/cyrus-imapd32/files/patch-imap__tls.c
+++ b/mail/cyrus-imapd32/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-imapd32/files/patch-imtest__imtest.c b/mail/cyrus-imapd32/files/patch-imtest__imtest.c
index 2c80ed67bc66..0ae1041e4d5b 100644
--- a/mail/cyrus-imapd32/files/patch-imtest__imtest.c
+++ b/mail/cyrus-imapd32/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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 10:39:40 +0000