www/h2o: fix for building with LibreSSL 3.5.3
PR: 266659 Sponsored by: SkunkWerks, GmbH
This commit is contained in:
parent
8bb719ffa3
commit
c145b6539b
2 changed files with 26 additions and 13 deletions
|
@ -1,13 +1,14 @@
|
||||||
PORTNAME= h2o
|
PORTNAME= h2o
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 2.2.6
|
DISTVERSION= 2.2.6
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
|
|
||||||
MAINTAINER= dch@FreeBSD.org
|
MAINTAINER= dch@FreeBSD.org
|
||||||
COMMENT= Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x
|
COMMENT= Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x
|
||||||
WWW= https://github.com/h2o/h2o
|
WWW= https://github.com/h2o/h2o
|
||||||
|
|
||||||
LICENSE= MIT BSD2CLAUSE
|
LICENSE= BSD2CLAUSE MIT
|
||||||
LICENSE_COMB= multi
|
LICENSE_COMB= multi
|
||||||
|
|
||||||
BROKEN_armv6= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported
|
BROKEN_armv6= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported
|
||||||
|
@ -16,7 +17,7 @@ BROKEN_FreeBSD_12_powerpc64= fails to link: unrecognized option '-Wl,-rpath=/usr
|
||||||
|
|
||||||
LIB_DEPENDS= libuv.so:devel/libuv
|
LIB_DEPENDS= libuv.so:devel/libuv
|
||||||
|
|
||||||
USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig
|
USES= cmake:noninja compiler:c11 cpe perl5 pkgconfig shebangfix ssl
|
||||||
USE_GITHUB= yes
|
USE_GITHUB= yes
|
||||||
USE_PERL5= run
|
USE_PERL5= run
|
||||||
USE_LDCONFIG= yes
|
USE_LDCONFIG= yes
|
||||||
|
@ -30,13 +31,13 @@ SHEBANG_FILES= share/h2o/start_server
|
||||||
PORTDOCS= README.md
|
PORTDOCS= README.md
|
||||||
|
|
||||||
SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample
|
SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample
|
||||||
SUB_LIST+= H2O_USER=${H2O_USER} \
|
SUB_LIST+= H2O_GROUP=${H2O_GROUP} \
|
||||||
H2O_GROUP=${H2O_GROUP} \
|
H2O_LOGDIR=${H2O_LOGDIR} \
|
||||||
H2O_LOGDIR=${H2O_LOGDIR}
|
H2O_USER=${H2O_USER}
|
||||||
|
|
||||||
PLIST_SUB= H2O_USER=${H2O_USER} \
|
PLIST_SUB= H2O_GROUP=${H2O_GROUP} \
|
||||||
H2O_GROUP=${H2O_GROUP} \
|
H2O_LOGDIR=${H2O_LOGDIR} \
|
||||||
H2O_LOGDIR=${H2O_LOGDIR}
|
H2O_USER=${H2O_USER}
|
||||||
|
|
||||||
H2O_USER?= www
|
H2O_USER?= www
|
||||||
H2O_GROUP?= www
|
H2O_GROUP?= www
|
||||||
|
@ -45,12 +46,13 @@ H2O_LOGDIR= /var/log/${PORTNAME}/
|
||||||
|
|
||||||
USE_RC_SUBR= ${PORTNAME}
|
USE_RC_SUBR= ${PORTNAME}
|
||||||
|
|
||||||
OPTIONS_DEFINE= MRUBY DOCS
|
OPTIONS_DEFINE= DOCS MRUBY
|
||||||
OPTIONS_DEFAULT= MRUBY
|
OPTIONS_DEFAULT= MRUBY
|
||||||
OPTIONS_SUB= yes
|
OPTIONS_SUB= yes
|
||||||
MRUBY_DESC= Build with embedded mruby handler support
|
MRUBY_DESC= Build with embedded mruby handler support
|
||||||
|
|
||||||
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON -DWITH_BUNDLED_SSL=OFF
|
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON \
|
||||||
|
-DWITH_BUNDLED_SSL=OFF
|
||||||
|
|
||||||
MRUBY_CMAKE_BOOL= WITH_MRUBY
|
MRUBY_CMAKE_BOOL= WITH_MRUBY
|
||||||
MRUBY_USES= bison
|
MRUBY_USES= bison
|
||||||
|
|
|
@ -1,6 +1,17 @@
|
||||||
--- deps/neverbleed/neverbleed.c.orig 2019-08-12 14:09:44 UTC
|
--- deps/neverbleed/neverbleed.c.orig 2019-08-12 14:09:44 UTC
|
||||||
+++ deps/neverbleed/neverbleed.c
|
+++ deps/neverbleed/neverbleed.c
|
||||||
@@ -630,7 +630,7 @@ static int sign_stub(struct expbuf_t *buf)
|
@@ -45,7 +45,9 @@
|
||||||
|
#endif
|
||||||
|
#include "neverbleed.h"
|
||||||
|
|
||||||
|
-#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
|
||||||
|
+#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL \
|
||||||
|
+ || (defined(LIBRESSL_VERSION_NUMBER) \
|
||||||
|
+ && LIBRESSL_VERSION_NUMBER >= 0x3050300fL))
|
||||||
|
#define OPENSSL_1_1_API 1
|
||||||
|
#else
|
||||||
|
#define OPENSSL_1_1_API 0
|
||||||
|
@@ -630,7 +632,7 @@ static int sign_stub(struct expbuf_t *buf)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue