Date: Tue, 15 Jan 2019 12:35:35 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490368 - head/www/nginx Message-ID: <201901151235.x0FCZZVk006014@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Tue Jan 15 12:35:35 2019 New Revision: 490368 URL: https://svnweb.freebsd.org/changeset/ports/490368 Log: revert r490211 That deleted GeoIP. GeoIP is EOL 15.02.2019. It should not have been deleted from NGINX. Users had no chance to switch to GeoIP2. GeoIP will be deleted on 15.2.2019 again from NGINX Sponsored by: Netzkommune GmbH Modified: head/www/nginx/Makefile head/www/nginx/Makefile.options.desc head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Jan 15 12:22:06 2019 (r490367) +++ head/www/nginx/Makefile Tue Jan 15 12:35:35 2019 (r490368) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.14.2 -PORTREVISION?= 5 +PORTREVISION?= 6 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_GUNZIP_FILTER HTTP_GZIP_STATIC \ + HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GEOIP 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,6 +148,8 @@ HTTP_AUTH_REQ_CONFIGURE_ON= --with-http_auth_request_m 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 Modified: head/www/nginx/Makefile.options.desc ============================================================================== --- head/www/nginx/Makefile.options.desc Tue Jan 15 12:22:06 2019 (r490367) +++ head/www/nginx/Makefile.options.desc Tue Jan 15 12:35:35 2019 (r490368) @@ -40,6 +40,7 @@ HTTP_FANCYINDEX_DESC= 3rd party http_fancyindex modul 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 Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Tue Jan 15 12:22:06 2019 (r490367) +++ head/www/nginx/pkg-plist Tue Jan 15 12:35:35 2019 (r490368) @@ -28,6 +28,7 @@ %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901151235.x0FCZZVk006014>