Date: Wed, 15 Mar 2017 11:46:59 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436232 - head/mail/cyrus-imapd30/files Message-ID: <201703151146.v2FBkx31011590@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Wed Mar 15 11:46:58 2017 New Revision: 436232 URL: https://svnweb.freebsd.org/changeset/ports/436232 Log: Fix build with libressl. PR: 217793 Added: head/mail/cyrus-imapd30/files/patch-imap__tls.c - copied unchanged from r435814, head/mail/cyrus-imapd25/files/patch-imap__tls.c head/mail/cyrus-imapd30/files/patch-imtest__imtest.c - copied unchanged from r435814, head/mail/cyrus-imapd25/files/patch-imtest__imtest.c Copied: head/mail/cyrus-imapd30/files/patch-imap__tls.c (from r435814, head/mail/cyrus-imapd25/files/patch-imap__tls.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd30/files/patch-imap__tls.c Wed Mar 15 11:46:58 2017 (r436232, copy of r435814, head/mail/cyrus-imapd25/files/patch-imap__tls.c) @@ -0,0 +1,31 @@ +--- imap/tls.c.orig 2016-07-22 01:55:57 UTC ++++ imap/tls.c +@@ -222,7 +222,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu + } + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + /* replacements for new 1.1 API accessors */ + /* XXX probably put these somewhere central */ + static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) +@@ -723,7 +723,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); + +@@ -1441,7 +1443,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: head/mail/cyrus-imapd30/files/patch-imtest__imtest.c (from r435814, head/mail/cyrus-imapd25/files/patch-imtest__imtest.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd30/files/patch-imtest__imtest.c Wed Mar 15 11:46:58 2017 (r436232, copy of r435814, 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); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703151146.v2FBkx31011590>