svn commit: r545592 - in head/www/nginx: . files

[Jochen Neumeister]

Author: joneum
Date: Fri Aug 21 11:35:04 2020
New Revision: 545592
URL: https://svnweb.freebsd.org/changeset/ports/545592

Log:
  - 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

Added:
  head/www/nginx/files/extra-patch-ip2proxy   (contents, props changed)
Modified:
  head/www/nginx/Makefile
  head/www/nginx/Makefile.extmod

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Fri Aug 21 11:06:47 2020	(r545591)
+++ head/www/nginx/Makefile	Fri Aug 21 11:35:04 2020	(r545592)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION?=	22
+PORTREVISION?=	23
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \

Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod	Fri Aug 21 11:06:47 2020	(r545591)
+++ head/www/nginx/Makefile.extmod	Fri Aug 21 11:35:04 2020	(r545592)
@@ -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_sr
 
 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

Added: head/www/nginx/files/extra-patch-ip2proxy
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-ip2proxy	Fri Aug 21 11:35:04 2020	(r545592)
@@ -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;
+ 		}