kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix broken build after NJS update (missing USES+=libedit)

Browse source 
- Fix broken build when IP2PROXY is enabled (bad comparison)

PR:		248464
Reported by:	zi
Sponsored by:	Netzkommune GmbH
This commit is contained in:
Jochen Neumeister 2020-08-21 11:35:04 +00:00
parent 3e6cb79e0f
commit d7ef0060cd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=545592
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/nginx/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
PORTREVISION?= 22
PORTREVISION?= 23
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \

2
www/nginx/Makefile.extmod
View file

@ -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

11
www/nginx/files/extra-patch-ip2proxy Normal file
View file

@ -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;
}