Date: Tue, 3 Jan 2017 14:12:28 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430473 - in head/irc/hexchat: . files Message-ID: <201701031412.v03ECS6G022935@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Tue Jan 3 14:12:28 2017 New Revision: 430473 URL: https://svnweb.freebsd.org/changeset/ports/430473 Log: Fix build with libressl PR: 215363 Submitted by: w.schwarzenfeld@utanet.at Reviewed by: pkubaj@anongoth.pl (maintainer) Approved by: jadawin (mentor) Differential Revision: https://reviews.freebsd.org/D8824 Modified: head/irc/hexchat/Makefile head/irc/hexchat/files/patch-src__common__ssl.c Modified: head/irc/hexchat/Makefile ============================================================================== --- head/irc/hexchat/Makefile Tue Jan 3 14:07:28 2017 (r430472) +++ head/irc/hexchat/Makefile Tue Jan 3 14:12:28 2017 (r430473) @@ -78,10 +78,6 @@ TEXTFE_CONFIGURE_ENABLE=textfe .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - .if ${PORT_OPTIONS:MCA_BUNDLE} CA_BUNDLE= "${LOCALBASE}/share/certs/ca-root-nss.crt" .else Modified: head/irc/hexchat/files/patch-src__common__ssl.c ============================================================================== --- head/irc/hexchat/files/patch-src__common__ssl.c Tue Jan 3 14:07:28 2017 (r430472) +++ head/irc/hexchat/files/patch-src__common__ssl.c Tue Jan 3 14:12:28 2017 (r430473) @@ -1,5 +1,23 @@ --- src/common/ssl.c.orig 2016-12-10 14:30:51 UTC +++ src/common/ssl.c +@@ -176,7 +176,7 @@ _SSL_get_cert_info (struct cert_info *ce + return 1; + + alg = OBJ_obj2nid (algor->algorithm); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER + sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm); + #else + sign_alg = X509_get_signature_nid (peer_cert); +@@ -306,7 +306,7 @@ _SSL_socket (SSL_CTX *ctx, int sd) + + SSL_set_fd (ssl, sd); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER + method = ctx->method; + #else + method = SSL_CTX_get_ssl_method (ctx); @@ -328,7 +328,7 @@ _SSL_set_verify (SSL_CTX *ctx, void *ver __SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths"); return (err_buf);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701031412.v03ECS6G022935>