www/nginx: partially sync with upstream

Taken from: HardenedBSD
opnsense2 · Jan 14, 2019 · 1001706 · 1001706
1 parent 9d9909b
commit 1001706
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.14.2
-PORTREVISION?=	4
+PORTREVISION?=	5
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/ \
@@ -70,7 +70,7 @@ NO_OPTIONS_SORT=	yes
 OPTIONS_GROUP=	MAILGRP HTTPGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
-	HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GEOIP HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \
+	HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \
 	HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL HTTP_RANDOM_INDEX HTTP_REALIP \
 	HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS HTTP_SUB \
 	HTTP_XSLT HTTPV2 STREAM STREAM_SSL STREAM_SSL_PREREAD
@@ -148,8 +148,6 @@ HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
 HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
-HTTP_GEOIP_LIB_DEPENDS=		libGeoIP.so:net/GeoIP
-HTTP_GEOIP_VARS=		DSO_BASEMODS+=http_geoip_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd

diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc
@@ -40,7 +40,6 @@ HTTP_FANCYINDEX_DESC=		3rd party http_fancyindex module
 HTTP_FLV_DESC=			Enable http_flv module
 HTTP_FOOTER_DESC=		3rd party http_footer module
 HTTP_GEOIP2_DESC=		3rd party geoip2 module
-HTTP_GEOIP_DESC=		Enable http_geoip module
 HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
 HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
 HTTP_IMAGE_FILTER_DESC=		Enable http_image_filter module

diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
@@ -28,7 +28,6 @@
 %%DSO%%%%HTTP_AUTH_PAM%%libexec/nginx/ngx_http_auth_pam_module.so
 %%DSO%%%%HTTP_EVAL%%libexec/nginx/ngx_http_eval_module.so
 %%DSO%%%%HTTP_FANCYINDEX%%libexec/nginx/ngx_http_fancyindex_module.so
-%%DSO%%%%HTTP_GEOIP%%libexec/nginx/ngx_http_geoip_module.so
 %%DSO%%%%HTTP%%%%HTTP_GEOIP2%%libexec/nginx/ngx_http_geoip2_module.so
 %%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so
 %%DSO%%%%HTTP_IMAGE_FILTER%%libexec/nginx/ngx_http_image_filter_module.so