Date: Sun, 8 Apr 2018 02:13:01 +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: r466767 - head/mail/cyrus-imapd30/files Message-ID: <201804080213.w382D12L063634@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Sun Apr 8 02:13:01 2018 New Revision: 466767 URL: https://svnweb.freebsd.org/changeset/ports/466767 Log: Fix build with LibreSSL 2.7 PR: 227166 Submitted by: brnrd Modified: head/mail/cyrus-imapd30/files/patch-imap__tls.c Modified: head/mail/cyrus-imapd30/files/patch-imap__tls.c ============================================================================== --- head/mail/cyrus-imapd30/files/patch-imap__tls.c Sun Apr 8 02:11:53 2018 (r466766) +++ head/mail/cyrus-imapd30/files/patch-imap__tls.c Sun Apr 8 02:13:01 2018 (r466767) @@ -1,15 +1,15 @@ ---- imap/tls.c.orig 2016-07-22 01:55:57 UTC +--- imap/tls.c.orig 2018-01-03 02:10:17 UTC +++ imap/tls.c -@@ -222,7 +222,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu +@@ -227,7 +227,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu } #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* 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 +@@ -734,7 +734,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 */ @@ -19,7 +19,7 @@ const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS); -@@ -1441,7 +1443,9 @@ HIDDEN int tls_init_clientengine(int ver +@@ -1465,7 +1467,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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804080213.w382D12L063634>