svn commit: r402916 - branches/2015Q4/mail/cyrus-imapd25/files

[Hajimu UMEMOTO]

Author: ume
Date: Fri Dec  4 11:01:34 2015
New Revision: 402916
URL: https://svnweb.freebsd.org/changeset/ports/402916

Log:
  MFH: r402820
  
  Fix build on 9.X.
  
  Reported by:	Andrea Venturoli <ml__at__netfence.it>
  Approved by:	portmgr (feld@)

Added:
  branches/2015Q4/mail/cyrus-imapd25/files/patch-imap__tls.c
     - copied unchanged from r402820, head/mail/cyrus-imapd25/files/patch-imap__tls.c
  branches/2015Q4/mail/cyrus-imapd25/files/patch-imtest__imtest.c
     - copied unchanged from r402820, head/mail/cyrus-imapd25/files/patch-imtest__imtest.c
  branches/2015Q4/mail/cyrus-imapd25/files/patch-lib__imclient.c
     - copied unchanged from r402820, head/mail/cyrus-imapd25/files/patch-lib__imclient.c
Modified:
Directory Properties:
  branches/2015Q4/   (props changed)

Copied: branches/2015Q4/mail/cyrus-imapd25/files/patch-imap__tls.c (from r402820, head/mail/cyrus-imapd25/files/patch-imap__tls.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q4/mail/cyrus-imapd25/files/patch-imap__tls.c	Fri Dec  4 11:01:34 2015	(r402916, copy of r402820, head/mail/cyrus-imapd25/files/patch-imap__tls.c)
@@ -0,0 +1,22 @@
+--- imap/tls.c.orig	2015-11-30 06:30:33 UTC
++++ imap/tls.c
+@@ -683,7 +683,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 */
++#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+     off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */
++#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+ 
+     const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS);
+ 
+@@ -1399,7 +1401,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 */
++#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+     off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */
++#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+ 
+     SSL_CTX_set_options(c_ctx, off);
+     SSL_CTX_set_info_callback(c_ctx, apps_ssl_info_callback);

Copied: branches/2015Q4/mail/cyrus-imapd25/files/patch-imtest__imtest.c (from r402820, head/mail/cyrus-imapd25/files/patch-imtest__imtest.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q4/mail/cyrus-imapd25/files/patch-imtest__imtest.c	Fri Dec  4 11:01:34 2015	(r402916, copy of r402820, head/mail/cyrus-imapd25/files/patch-imtest__imtest.c)
@@ -0,0 +1,12 @@
+--- imtest/imtest.c.orig	2015-11-30 06:30:33 UTC
++++ imtest/imtest.c
+@@ -503,7 +503,9 @@ static 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 */
++#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+     off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */
++#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+     SSL_CTX_set_options(tls_ctx, off);
+     SSL_CTX_set_info_callback(tls_ctx, apps_ssl_info_callback);
+     

Copied: branches/2015Q4/mail/cyrus-imapd25/files/patch-lib__imclient.c (from r402820, head/mail/cyrus-imapd25/files/patch-lib__imclient.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q4/mail/cyrus-imapd25/files/patch-lib__imclient.c	Fri Dec  4 11:01:34 2015	(r402916, copy of r402820, head/mail/cyrus-imapd25/files/patch-lib__imclient.c)
@@ -0,0 +1,12 @@
+--- lib/imclient.c.orig	2015-11-30 06:30:33 UTC
++++ lib/imclient.c
+@@ -1641,7 +1641,9 @@ static int tls_init_clientengine(struct 
+     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)
+     off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */
++#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+     SSL_CTX_set_options(imclient->tls_ctx, off);
+     
+     /* debugging   SSL_CTX_set_info_callback(imclient->tls_ctx, apps_ssl_info_callback); */