diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2020-08-21 11:35:04 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2020-08-21 11:35:04 +0000 |
| commit | d7ef0060cdb675fd89121951280ee4af881f7135 (patch) | |
| tree | 1ab1026e6a1acbafa87941122a5ba67c6cf2150a /www/nginx | |
| parent | Update devel/etcd34 to version 3.4.12. (diff) | |
- Fix broken build after NJS update (missing USES+=libedit)
- Fix broken build when IP2PROXY is enabled (bad comparison)
PR: 248464
Reported by: zi
Sponsored by: Netzkommune GmbH
Notes
Notes:
svn path=/head/; revision=545592
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 2 | ||||
| -rw-r--r-- | www/nginx/Makefile.extmod | 2 | ||||
| -rw-r--r-- | www/nginx/files/extra-patch-ip2proxy | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 1b1d4610c94d..5248553368e6 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 22 +PORTREVISION?= 23 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index c454187dfafc..0362c896c69f 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -111,6 +111,7 @@ HTTP_IP2LOCATION_VARS= DSO_EXTMODS+=ip2location HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:f9815e3:ip2proxy HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/ip2proxy HTTP_IP2PROXY_VARS= DSO_EXTMODS+=ip2proxy +HTTP_IP2PROXY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ip2proxy HTTP_JSON_STATUS_GH_TUPLE= nginx-modules:ngx_http_json_status_module:1d2f303:json_status HTTP_JSON_STATUS_VARS= DSO_EXTMODS+=json_status @@ -230,6 +231,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src NJS_GH_TUPLE= nginx:njs:b12fc23:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx +NJS_USES= libedit OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:2d81c29:opentracing OPENTRACING_LIB_DEPENDS= libopentracing.so:devel/libopentracing diff --git a/www/nginx/files/extra-patch-ip2proxy b/www/nginx/files/extra-patch-ip2proxy new file mode 100644 index 000000000000..d87f389dc751 --- /dev/null +++ b/www/nginx/files/extra-patch-ip2proxy @@ -0,0 +1,11 @@ +--- ../ip2proxy-nginx-f9815e3/ngx_http_ip2proxy.c.orig 2020-08-04 06:47:10.018483000 -0400 ++++ ../ip2proxy-nginx-f9815e3/ngx_http_ip2proxy.c 2020-08-04 06:47:20.081413000 -0400 +@@ -537,7 +537,7 @@ + + v->data = *(u_char **) ((char *) ctx->record + data); + +- if (ngx_strcmp(v->data, NOT_SUPPORTED) == 0 || ngx_strcmp(v->data, INVALID_IPV4_ADDRESS) == 0) { ++ if (ngx_strcmp(v->data, NOT_SUPPORTED) == 0 || ngx_strcmp(v->data, INVALID_IP_ADDRESS) == 0) { + v->not_found = 1; + return NGX_OK; + } |