From owner-svn-ports-head@freebsd.org Sun Apr 22 08:25:24 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2E31FA9D2D; Sun, 22 Apr 2018 08:25:24 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E87382FFA; Sun, 22 Apr 2018 08:25:24 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F5B113594; Sun, 22 Apr 2018 08:25:24 +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 w3M8PO04010808; Sun, 22 Apr 2018 08:25:24 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3M8PO6E010807; Sun, 22 Apr 2018 08:25:24 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201804220825.w3M8PO6E010807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 22 Apr 2018 08:25:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467918 - head/www/h2o/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/www/h2o/files X-SVN-Commit-Revision: 467918 X-SVN-Commit-Repository: ports 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.25 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: Sun, 22 Apr 2018 08:25:24 -0000 Author: brnrd Date: Sun Apr 22 08:25:23 2018 New Revision: 467918 URL: https://svnweb.freebsd.org/changeset/ports/467918 Log: www/h2o: Fix build with LibreSSL 2.7 - LibreSSL 2.7 implements OpenSSL 1.1 API - Use patch from upstream issue 1706 PR: 227169 Approved by: maintainer time-out Added: head/www/h2o/files/patch-issue1706 (contents, props changed) Added: head/www/h2o/files/patch-issue1706 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/h2o/files/patch-issue1706 Sun Apr 22 08:25:23 2018 (r467918) @@ -0,0 +1,55 @@ +https://github.com/h2o/h2o/issues/1706 + +--- include/h2o/openssl_backport.h.orig 2017-12-15 03:08:00 UTC ++++ include/h2o/openssl_backport.h +@@ -25,7 +25,7 @@ + #include + + /* backports for OpenSSL 1.0.2 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + #define BIO_get_data(bio) ((bio)->ptr) + #define BIO_set_data(bio, p) ((bio)->ptr = (p)) +@@ -57,7 +57,7 @@ static inline BIO_METHOD *BIO_meth_new(i + #endif + + /* backports for OpenSSL 1.0.1 and LibreSSL */ +-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + #define SSL_is_server(ssl) ((ssl)->server) + +--- deps/neverbleed/neverbleed.c.orig 2017-12-15 03:08:00 UTC ++++ deps/neverbleed/neverbleed.c +@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu + return 0; + } + +-#if !OPENSSL_1_1_API ++#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) + { +--- deps/picotls/lib/openssl.c.orig 2017-12-15 03:08:00 UTC ++++ deps/picotls/lib/openssl.c +@@ -35,13 +35,16 @@ + #include "picotls.h" + #include "picotls/openssl.h" + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) +-#define OPENSSL_1_0_API 1 ++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L ++#define OPENSSL_1_1_API 1 ++#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++#define OPENSSL_1_1_API 1 + #else + #define OPENSSL_1_0_API 0 ++#define OPENSSL_1_1_API 0 + #endif + +-#if OPENSSL_1_0_API ++#if !OPENSSL_1_1_API + + #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY) + #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE)