From owner-svn-ports-head@freebsd.org Mon Feb 13 14:28:21 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10312CDDE0F; Mon, 13 Feb 2017 14:28:21 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D12491FE9; Mon, 13 Feb 2017 14:28:20 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1DESJU6081502; Mon, 13 Feb 2017 14:28:19 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1DESJjC081501; Mon, 13 Feb 2017 14:28:19 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201702131428.v1DESJjC081501@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 13 Feb 2017 14:28:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433993 - head/security/hitch/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2017 14:28:21 -0000 Author: brnrd Date: Mon Feb 13 14:28:19 2017 New Revision: 433993 URL: https://svnweb.freebsd.org/changeset/ports/433993 Log: security/hitch: Fix build with LibreSSL - Add upstream patch PR: 217029 Obtained from: https://github.com/varnish/hitch/commit/cc92c25 Approved by: zi (maintainer) Added: head/security/hitch/files/patch-src_hitch.c (contents, props changed) Added: head/security/hitch/files/patch-src_hitch.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/hitch/files/patch-src_hitch.c Mon Feb 13 14:28:19 2017 (r433993) @@ -0,0 +1,22 @@ +From cc92c25a5fcbc1d3e4ebb8771fe87d961f2079bf Mon Sep 17 00:00:00 2001 +From: Vanilla Hsu +Date: Sat, 14 Jan 2017 09:36:57 +0800 +Subject: [PATCH] Fix building with libressl. + +--- + src/hitch.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hitch.c b/src/hitch.c +index 5b48680..03b4580 100644 +--- src/hitch.c.orig 2016-12-22 13:48:49 UTC ++++ src/hitch.c +@@ -683,7 +683,7 @@ load_privatekey(SSL_CTX *ctx, const char + return NULL; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define SSL_CTX_get_default_passwd_cb(ctx) (ctx->default_passwd_callback) + #define SSL_CTX_get_default_passwd_cb_userdata(ctx) (ctx->default_passwd_callback_userdata) + #endif