git: fd546b136ecc - main - www/nginx: Unbreak ip2proxy/ip2location modules

The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fd546b136ecc9e0241bb0a628ffdb8bdaec78ce5

commit fd546b136ecc9e0241bb0a628ffdb8bdaec78ce5
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2022-04-09 12:31:25 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2022-04-09 12:33:40 +0000

    www/nginx: Unbreak ip2proxy/ip2location modules
    
    PR:             263174
    Reported By:    Alessandro Sagratini <ale_sagra@hotmail.com>
    Approved by:    blanket
---
 www/nginx/Makefile.extmod            |  5 ++---
 www/nginx/distinfo                   |  8 ++++----
 www/nginx/files/extra-patch-ip2proxy | 11 -----------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index e363c39b0d17..8128f5908b9d 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -109,14 +109,13 @@ HTTP_GEOIP2_CFLAGS=		-I${LOCALBASE}/include
 HTTP_GEOIP2_VARS=		DSO_EXTMODS+=geoip2
 HTTP_GEOIP2_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
-HTTP_IP2LOCATION_GH_TUPLE=	ip2location:ip2location-nginx:7aa49ce:ip2location
+HTTP_IP2LOCATION_GH_TUPLE=	ip2location:ip2location-nginx:710214c:ip2location
 HTTP_IP2LOCATION_LIB_DEPENDS=	libIP2Location.so:net/ip2location
 HTTP_IP2LOCATION_VARS=		DSO_EXTMODS+=ip2location
 
-HTTP_IP2PROXY_GH_TUPLE=		ip2location:ip2proxy-nginx:f9815e3:ip2proxy
+HTTP_IP2PROXY_GH_TUPLE=		ip2location:ip2proxy-nginx:931599f: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
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 67591357acda..047eeab687f4 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -67,10 +67,10 @@ SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f
 SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934
 SHA256 (leev-ngx_http_geoip2_module-3.3_GH0.tar.gz) = 41378438c833e313a18869d0c4a72704b4835c30acaf7fd68013ab6732ff78a7
 SIZE (leev-ngx_http_geoip2_module-3.3_GH0.tar.gz) = 8509
-SHA256 (ip2location-ip2location-nginx-7aa49ce_GH0.tar.gz) = 588e31def37aacd9afd19f4bf0892e80dcc26e0824f6cce6fa69cf6d44923b29
-SIZE (ip2location-ip2location-nginx-7aa49ce_GH0.tar.gz) = 5932
-SHA256 (ip2location-ip2proxy-nginx-f9815e3_GH0.tar.gz) = 46d6609130724cf6310515a97bf016395aa07781babfb99f092e624dc9e43488
-SIZE (ip2location-ip2proxy-nginx-f9815e3_GH0.tar.gz) = 4954
+SHA256 (ip2location-ip2location-nginx-710214c_GH0.tar.gz) = 06f11b743ee26e5b508b71f3524e8a5c8754078f837d75b648012c921b264183
+SIZE (ip2location-ip2location-nginx-710214c_GH0.tar.gz) = 5323
+SHA256 (ip2location-ip2proxy-nginx-931599f_GH0.tar.gz) = 7b08713caabf254816830aef115cf8755719d8b663f088882d62c21a9ffd0450
+SIZE (ip2location-ip2proxy-nginx-931599f_GH0.tar.gz) = 5043
 SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997
 SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
diff --git a/www/nginx/files/extra-patch-ip2proxy b/www/nginx/files/extra-patch-ip2proxy
deleted file mode 100644
index d87f389dc751..000000000000
--- a/www/nginx/files/extra-patch-ip2proxy
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../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;
- 		}