CVS commit: pkgsrc/www/nginx

["Travis Paul" <tpaul%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tpaul
Date:           Wed Apr  7 13:09:14 UTC 2021

Modified Files:
        pkgsrc/www/nginx: distinfo options.mk

Log Message:
nginx: Add support for the geoip2 module


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.67 -r1.68 pkgsrc/www/nginx/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.83 pkgsrc/www/nginx/distinfo:1.84
--- pkgsrc/www/nginx/distinfo:1.83      Wed Dec 16 20:32:01 2020
+++ pkgsrc/www/nginx/distinfo   Wed Apr  7 13:09:13 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.83 2020/12/16 20:32:01 otis Exp $
+$NetBSD: distinfo,v 1.84 2021/04/07 13:09:13 tpaul Exp $
 
 SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
 RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
@@ -52,6 +52,10 @@ SHA1 (ngx_devel_kit-0.3.1.tar.gz) = e153
 RMD160 (ngx_devel_kit-0.3.1.tar.gz) = 5c52a463544294096611aa9dec1c76e937a1aa23
 SHA512 (ngx_devel_kit-0.3.1.tar.gz) = de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9
 Size (ngx_devel_kit-0.3.1.tar.gz) = 66542 bytes
+SHA1 (ngx_http_geoip2_module-3.3.tar.gz) = 6970ae247494c3890e166747752927c6450d0b32
+RMD160 (ngx_http_geoip2_module-3.3.tar.gz) = 7b272aad1a402ae6ca8fac873d4555afbeab7b75
+SHA512 (ngx_http_geoip2_module-3.3.tar.gz) = 06963b598c54e22d75ce837fb222f5aa6c9494c29e558ff46f1205d7159fc305414bfac4ed3288c836dcbf7628d92f26458e1992d34fc2f4b73275a32847bdc0
+Size (ngx_http_geoip2_module-3.3.tar.gz) = 8509 bytes
 SHA1 (njs-0.5.0.tar.gz) = a9cb186dbbfad7901a83f9b267cdf9eee84af374
 RMD160 (njs-0.5.0.tar.gz) = 0cb82b7930bf500e81471b9d44d87924a6043e57
 SHA512 (njs-0.5.0.tar.gz) = 182a64ba519b1a1d29ac71ffe2c9ef8e5a6f9aaf3db9f327ac926114db73b339a424801b558068fc7ae06ae88a4dea0a601c749db4b6f2b579e427181e41d11b

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.67 pkgsrc/www/nginx/options.mk:1.68
--- pkgsrc/www/nginx/options.mk:1.67    Wed Dec 16 20:32:01 2020
+++ pkgsrc/www/nginx/options.mk Wed Apr  7 13:09:13 2021
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.67 2020/12/16 20:32:01 otis Exp $
+# $NetBSD: options.mk,v 1.68 2021/04/07 13:09:13 tpaul Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
 PKG_SUPPORTED_OPTIONS+=        echo encrypted-session flv form-input
-PKG_SUPPORTED_OPTIONS+=        geoip gtools gzip headers-more http2
+PKG_SUPPORTED_OPTIONS+=        geoip geoip2 gtools gzip headers-more http2
 PKG_SUPPORTED_OPTIONS+=        image-filter luajit mail-proxy memcache
 PKG_SUPPORTED_OPTIONS+=        naxsi njs pcre perl push realip rtmp
 PKG_SUPPORTED_OPTIONS+=        secure-link set-misc slice ssl status
@@ -156,6 +156,16 @@ DISTFILES+=                        ${SETMISC_DISTFILE}
 CONFIGURE_ARGS+=               --add-module=../${SETMISC_DISTNAME}
 .endif
 
+.if !empty(PKG_OPTIONS:Mgeoip2) || make(makesum) || make(mdi) || make(distclean)
+GEOIP2_VERSION=                        3.3
+GEOIP2_DISTNAME=               ngx_http_geoip2_module-${GEOIP2_VERSION}
+GEOIP2_DISTFILE=               ${GEOIP2_DISTNAME}.tar.gz
+SITES.${GEOIP2_DISTFILE}=      -${MASTER_SITE_GITHUB:=leev/ngx_http_geoip2_module/archive/}${GEOIP2_VERSION}.tar.gz
+DISTFILES+=                    ${GEOIP2_DISTFILE}
+CONFIGURE_ARGS+=               --add-module=../${GEOIP2_DISTNAME}
+.include "../../geography/libmaxminddb/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Marray-var) || make(makesum) || make(mdi) || make(distclean)
 ARRAYVAR_VERSION=              0.05
 ARRAYVAR_DISTNAME=             array-var-nginx-module-${ARRAYVAR_VERSION}