diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-05 12:22:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-06 05:19:28 +0000 |
| commit | 4926e23d21a45d6eac9201029b6799c58b5ecb22 (patch) | |
| tree | 5e4210137672d9750c952ff3b2de94721529d969 /community/h2o | |
| parent | 53a2ede7c4814fc1d6bcf1307cf88dd1a48a016d (diff) | |
| download | aports-4926e23d21a45d6eac9201029b6799c58b5ecb22.tar.bz2 aports-4926e23d21a45d6eac9201029b6799c58b5ecb22.tar.xz | |
community/h2o: rebuild against libressl-2.7
Diffstat (limited to 'community/h2o')
| -rw-r--r-- | community/h2o/APKBUILD | 10 | ||||
| -rw-r--r-- | community/h2o/libressl-2.7.patch | 58 |
2 files changed, 62 insertions, 6 deletions
diff --git a/community/h2o/APKBUILD b/community/h2o/APKBUILD index 6eb039b455..2d318b6de6 100644 --- a/community/h2o/APKBUILD +++ b/community/h2o/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bennett Goble <nivardus@gmail.com> pkgname=h2o pkgver=2.2.4 -pkgrel=0 +pkgrel=1 pkgdesc="An optimized HTTP/1, HTTP/2 server written in C" url="https://h2o.examp1e.net" arch="all" @@ -12,12 +12,13 @@ makedepends="cmake ruby ruby-dev bison zlib-dev wslay-dev libressl-dev libuv-dev install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz + libressl-2.7.patch h2o.conf h2o.initd h2o.logrotate" builddir="$srcdir/$pkgname-$pkgver" -prepare() { +build() { cd "$builddir" cmake \ -DBUILD_SHARED_LIBS=on \ @@ -25,10 +26,6 @@ prepare() { -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_MRUBY=on \ . -} - -build() { - cd "$builddir" make -j1 make libh2o } @@ -53,6 +50,7 @@ package() { } sha512sums="508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5 h2o-2.2.4.tar.gz +5e30cadf7ad0fcecadb56c60eb71f8e4eee2f6f46977d48744a5f0e965251948dc9c5543295211c695d440f9568e04b13108c1c163f092ac6cae718fd2b02ef7 libressl-2.7.patch 444f55c3eaae1f349223036086e45c983ea8be89e793068537ec25488c4065174bc509d0987ddc65a0357cb8acfec272e90d13ea7cdadf9cf112953d857aa574 h2o.conf e93e66a6b00b1bff94e37489c5fdf99d9d657adc63975ec54be30f8da23dafe7d7389f02a6452ed819efc9d8398aa716782a7fd6d8509621a975ed954b73bef9 h2o.initd 3d2c9e36c48cbb974d0691e4af8e9eb8f13e3bebb98a30417cdc87e76a4b5cddc4e4f665ebea26b95174287b95d002fdc3363f30ffcf15247fcd0530fe1abfcc h2o.logrotate" diff --git a/community/h2o/libressl-2.7.patch b/community/h2o/libressl-2.7.patch new file mode 100644 index 0000000000..2cd722ff82 --- /dev/null +++ b/community/h2o/libressl-2.7.patch @@ -0,0 +1,58 @@ +From 85b7f561f3bb546b13718f495a354a6b9ecd5d03 Mon Sep 17 00:00:00 2001 +From: AIZAWA Hina <hina@bouhime.com> +Date: Fri, 23 Mar 2018 23:30:20 +0900 +Subject: [PATCH] Add supporting LibreSSL 2.7 + +Signed-off-by: AIZAWA Hina <hina@bouhime.com> +--- + include/h2o/openssl_backport.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/h2o/openssl_backport.h b/include/h2o/openssl_backport.h +index b24440e80..72cc43c45 100644 +--- a/include/h2o/openssl_backport.h ++++ b/include/h2o/openssl_backport.h +@@ -25,7 +25,7 @@ + #include <stdlib.h> + + /* 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(int type, const char *name) + #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) + +diff --git a/deps/neverbleed/neverbleed.c b/deps/neverbleed/neverbleed.c +index 29b35a9..2caea00 100644 +--- a/deps/neverbleed/neverbleed.c ++++ b/deps/neverbleed/neverbleed.c +@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf) + 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) + { +diff --git a/deps/picotls/lib/openssl.c b/deps/picotls/lib/openssl.c +index 70ec0d0..50db1cf 100644 +--- a/deps/picotls/lib/openssl.c ++++ b/deps/picotls/lib/openssl.c +@@ -35,7 +35,7 @@ + #include "picotls.h" + #include "picotls/openssl.h" + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + #define OPENSSL_1_0_API 1 + #else + #define OPENSSL_1_0_API 0 |