parent
b59c7956da
commit
0c4ce3c8f3
2 changed files with 17 additions and 31 deletions
|
@ -1,27 +0,0 @@
|
||||||
ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5
|
|
||||||
--- a/src/event/ngx_event_openssl_stapling.c.org 2019-05-12 23:56:58.526833000 +0200
|
|
||||||
+++ b/src/event/ngx_event_openssl_stapling.c 2019-05-13 01:31:53.737800000 +0200
|
|
||||||
@@ -298,7 +298,10 @@
|
|
||||||
SSL_CTX_select_current_cert(ssl->ctx, cert);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
|
|
||||||
+#ifdef SSL_CTX_get0_chain_certs
|
|
||||||
+ /* OpenSSL 1.0.2+ */
|
|
||||||
+ SSL_CTX_get0_chain_certs(ssl->ctx, &chain);
|
|
||||||
+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
|
|
||||||
/* OpenSSL 1.0.1+ */
|
|
||||||
SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
|
|
||||||
#else
|
|
||||||
@@ -655,7 +658,10 @@
|
|
||||||
SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
|
|
||||||
+#ifdef SSL_CTX_get0_chain_certs
|
|
||||||
+ /* OpenSSL 1.0.2+ */
|
|
||||||
+ SSL_CTX_get0_chain_certs(staple->ssl_ctx, &chain);
|
|
||||||
+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
|
|
||||||
/* OpenSSL 1.0.1+ */
|
|
||||||
SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
|
|
||||||
#else
|
|
|
@ -1,16 +1,24 @@
|
||||||
# Template file for 'nginx'
|
# Template file for 'nginx'
|
||||||
pkgname=nginx
|
pkgname=nginx
|
||||||
version=1.18.0
|
version=1.20.2
|
||||||
revision=6
|
revision=1
|
||||||
|
_tests_commit=18ac4d9e5a2a
|
||||||
|
create_wrksrc=yes
|
||||||
|
build_wrksrc="nginx-${version}"
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
|
hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
|
||||||
makedepends="${hostmakedepends}"
|
makedepends="${hostmakedepends}"
|
||||||
|
checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which"
|
||||||
short_desc="High performance web and reverse proxy server"
|
short_desc="High performance web and reverse proxy server"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="BSD-2-Clause"
|
license="BSD-2-Clause"
|
||||||
homepage="https://nginx.org"
|
homepage="https://nginx.org"
|
||||||
distfiles="https://nginx.org/download/nginx-${version}.tar.gz"
|
distfiles="https://nginx.org/download/nginx-${version}.tar.gz
|
||||||
checksum=4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
|
https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz"
|
||||||
|
checksum="958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42
|
||||||
|
e34ef2f38512e1c04ee201c3b68f7ba7ec8f1537dc6a500278bc2219ab435228"
|
||||||
|
# Tests fail when nginx run as root and there is no nginx user
|
||||||
|
make_check=ci-skip
|
||||||
|
|
||||||
# NOTE:
|
# NOTE:
|
||||||
# On update, the pregenerated header file for ARM may need synchronization.
|
# On update, the pregenerated header file for ARM may need synchronization.
|
||||||
|
@ -94,6 +102,11 @@ pre_build() {
|
||||||
sed -i 's/-lcrypt/$(LDFLAGS) &/' objs/Makefile
|
sed -i 's/-lcrypt/$(LDFLAGS) &/' objs/Makefile
|
||||||
}
|
}
|
||||||
|
|
||||||
|
do_check() {
|
||||||
|
TEST_NGINX_BINARY="$PWD/objs/nginx" \
|
||||||
|
prove -j ${XBPS_MAKEJOBS} "../${pkgname}-tests-${_tests_commit}"
|
||||||
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
sed -e 's|\<user\s\+\w\+;|user html;|g' \
|
sed -e 's|\<user\s\+\w\+;|user html;|g' \
|
||||||
-e '44s|html|/usr/share/nginx/html|' \
|
-e '44s|html|/usr/share/nginx/html|' \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue