diff --git a/srcpkgs/h2o/patches/fix-libressl-2.7.patch b/srcpkgs/h2o/patches/fix-libressl-2.7.patch new file mode 100644 index 00000000000..2c128f0cc93 --- /dev/null +++ b/srcpkgs/h2o/patches/fix-libressl-2.7.patch @@ -0,0 +1,35 @@ +--- include/h2o/openssl_backport.h.orig 2018-04-25 12:44:38.649149571 +0200 ++++ include/h2o/openssl_backport.h 2018-04-25 12:44:50.546167553 +0200 +@@ -25,7 +25,8 @@ + #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)) +--- deps/neverbleed/neverbleed.c.orig 2018-04-25 12:58:28.060403297 +0200 ++++ deps/neverbleed/neverbleed.c 2018-04-25 12:58:09.600375394 +0200 +@@ -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 2018-04-25 13:02:07.728735340 +0200 ++++ deps/picotls/lib/openssl.c 2018-04-25 13:01:39.228692266 +0200 +@@ -41,7 +41,7 @@ + #define OPENSSL_1_0_API 0 + #endif + +-#if OPENSSL_1_0_API ++#if OPENSSL_1_0_API && defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL + + #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) + diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template index 2cf6b324a11..e10731075c8 100644 --- a/srcpkgs/h2o/template +++ b/srcpkgs/h2o/template @@ -1,7 +1,7 @@ # Template file for 'h2o' pkgname=h2o version=2.2.4 -revision=2 +revision=3 build_style=cmake conf_files="/etc/h2o.conf" system_accounts="h2o"