Tue Mar 10 08:20:31 2020 UTC ()
nginx: added geoip option; behave correctly with "make mdi"


(adam)
diff -r1.54 -r1.55 pkgsrc/www/nginx/options.mk
cvs diff -r1.54 -r1.55 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2020/02/20 23:34:38 1.54
+++ pkgsrc/www/nginx/options.mk 2020/03/10 08:20:31 1.55
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: options.mk,v 1.54 2020/02/20 23:34:38 abs Exp $ 1# $NetBSD: options.mk,v 1.55 2020/03/10 08:20:31 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \ 4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \
5 pcre push realip ssl sub uwsgi image-filter \ 5 geoip pcre push realip ssl sub uwsgi image-filter \
6 debug slice status nginx-autodetect-cflags echo \ 6 debug slice status nginx-autodetect-cflags echo \
7 set-misc headers-more array-var encrypted-session \ 7 set-misc headers-more array-var encrypted-session \
8 form-input perl gzip http2 auth-request secure-link rtmp \ 8 form-input perl gzip http2 auth-request secure-link rtmp \
9 stream-ssl-preread 9 stream-ssl-preread
10PKG_OPTIONS_LEGACY_OPTS+= v2:http2 10PKG_OPTIONS_LEGACY_OPTS+= v2:http2
11 11
12PKG_SUGGESTED_OPTIONS= inet6 pcre ssl 12PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
13 13
14PLIST_VARS+= naxsi perl uwsgi 14PLIST_VARS+= naxsi perl uwsgi
15 15
16.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
17 17
18# documentation says naxsi must be the first module 18# documentation says naxsi must be the first module
19.if !empty(PKG_OPTIONS:Mnaxsi) 19.if !empty(PKG_OPTIONS:Mnaxsi)
20PLIST.naxsi= yes 20PLIST.naxsi= yes
21CONFIGURE_ARGS+= --add-module=../${NAXSI_DISTNAME}/naxsi_src 21CONFIGURE_ARGS+= --add-module=../${NAXSI_DISTNAME}/naxsi_src
22.endif 22.endif
23.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) 23.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) || make(mdi)
24NAXSI_VERSION= 0.56 24NAXSI_VERSION= 0.56
25NAXSI_DISTNAME= naxsi-${NAXSI_VERSION} 25NAXSI_DISTNAME= naxsi-${NAXSI_VERSION}
26NAXSI_DISTFILE= ${NAXSI_DISTNAME}.tar.gz 26NAXSI_DISTFILE= ${NAXSI_DISTNAME}.tar.gz
27SITES.${NAXSI_DISTFILE}= -https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz 27SITES.${NAXSI_DISTFILE}= -https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz
28DISTFILES+= ${NAXSI_DISTFILE} 28DISTFILES+= ${NAXSI_DISTFILE}
29.endif 29.endif
30 30
31.if !empty(PKG_OPTIONS:Mdebug) 31.if !empty(PKG_OPTIONS:Mdebug)
32CONFIGURE_ARGS+= --with-debug 32CONFIGURE_ARGS+= --with-debug
33.endif 33.endif
34 34
35.if !empty(PKG_OPTIONS:Mssl) 35.if !empty(PKG_OPTIONS:Mssl)
36.include "../../security/openssl/buildlink3.mk" 36.include "../../security/openssl/buildlink3.mk"
@@ -44,26 +44,31 @@ CONFIGURE_ARGS+= --with-pcre-jit @@ -44,26 +44,31 @@ CONFIGURE_ARGS+= --with-pcre-jit
44.else 44.else
45CONFIGURE_ARGS+= --without-pcre 45CONFIGURE_ARGS+= --without-pcre
46CONFIGURE_ARGS+= --without-http_rewrite_module 46CONFIGURE_ARGS+= --without-http_rewrite_module
47.endif 47.endif
48 48
49.if !empty(PKG_OPTIONS:Mdav) 49.if !empty(PKG_OPTIONS:Mdav)
50CONFIGURE_ARGS+= --with-http_dav_module 50CONFIGURE_ARGS+= --with-http_dav_module
51.endif 51.endif
52 52
53.if !empty(PKG_OPTIONS:Mflv) 53.if !empty(PKG_OPTIONS:Mflv)
54CONFIGURE_ARGS+= --with-http_flv_module 54CONFIGURE_ARGS+= --with-http_flv_module
55.endif 55.endif
56 56
 57.if !empty(PKG_OPTIONS:Mgeoip)
 58.include "../../net/GeoIP/buildlink3.mk"
 59CONFIGURE_ARGS+= --with-http_geoip_module
 60.endif
 61
57.if !empty(PKG_OPTIONS:Mhttp2) 62.if !empty(PKG_OPTIONS:Mhttp2)
58CONFIGURE_ARGS+= --with-http_v2_module 63CONFIGURE_ARGS+= --with-http_v2_module
59.endif 64.endif
60 65
61.if !empty(PKG_OPTIONS:Msub) 66.if !empty(PKG_OPTIONS:Msub)
62CONFIGURE_ARGS+= --with-http_sub_module 67CONFIGURE_ARGS+= --with-http_sub_module
63.endif 68.endif
64 69
65.if !empty(PKG_OPTIONS:Mgtools) 70.if !empty(PKG_OPTIONS:Mgtools)
66CONFIGURE_ARGS+= --with-google_perftools_module 71CONFIGURE_ARGS+= --with-google_perftools_module
67.include "../../devel/gperftools/buildlink3.mk" 72.include "../../devel/gperftools/buildlink3.mk"
68.endif 73.endif
69 74
@@ -76,126 +81,126 @@ CONFIGURE_ARGS+= --without-http_memcache @@ -76,126 +81,126 @@ CONFIGURE_ARGS+= --without-http_memcache
76.endif 81.endif
77 82
78.if !empty(PKG_OPTIONS:Mrealip) 83.if !empty(PKG_OPTIONS:Mrealip)
79CONFIGURE_ARGS+= --with-http_realip_module 84CONFIGURE_ARGS+= --with-http_realip_module
80.endif 85.endif
81 86
82# NDK must be added once and before 3rd party modules needing it 87# NDK must be added once and before 3rd party modules needing it
83.for _ngx_mod in luajit set-misc array-var form-input encrypted-session 88.for _ngx_mod in luajit set-misc array-var form-input encrypted-session
84. if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${_ngx_mod}:O) 89. if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${_ngx_mod}:O)
85CONFIGURE_ARGS+= --add-module=../${NDK_DISTNAME} 90CONFIGURE_ARGS+= --add-module=../${NDK_DISTNAME}
86NEED_NDK= yes 91NEED_NDK= yes
87. endif 92. endif
88.endfor 93.endfor
89.if defined(NEED_NDK) || make(makesum) 94.if defined(NEED_NDK) || make(makesum) || make(mdi)
90NDK_VERSION= 0.3.1 95NDK_VERSION= 0.3.1
91NDK_DISTNAME= ngx_devel_kit-${NDK_VERSION} 96NDK_DISTNAME= ngx_devel_kit-${NDK_VERSION}
92NDK_DISTFILE= ${NDK_DISTNAME}.tar.gz 97NDK_DISTFILE= ${NDK_DISTNAME}.tar.gz
93SITES.${NDK_DISTFILE}= -https://github.com/simpl/ngx_devel_kit/archive/v${NDK_VERSION}.tar.gz 98SITES.${NDK_DISTFILE}= -https://github.com/simpl/ngx_devel_kit/archive/v${NDK_VERSION}.tar.gz
94DISTFILES+= ${NDK_DISTFILE} 99DISTFILES+= ${NDK_DISTFILE}
95.endif 100.endif
96 101
97.if !empty(PKG_OPTIONS:Mluajit) 102.if !empty(PKG_OPTIONS:Mluajit)
98.include "../../lang/LuaJIT2/buildlink3.mk" 103.include "../../lang/LuaJIT2/buildlink3.mk"
99CONFIGURE_ENV+= LUAJIT_LIB=${PREFIX}/lib 104CONFIGURE_ENV+= LUAJIT_LIB=${PREFIX}/lib
100CONFIGURE_ENV+= LUAJIT_INC=${PREFIX}/include/luajit-2.0 105CONFIGURE_ENV+= LUAJIT_INC=${PREFIX}/include/luajit-2.0
101CONFIGURE_ARGS+= --add-module=../${LUA_DISTNAME} 106CONFIGURE_ARGS+= --add-module=../${LUA_DISTNAME}
102.endif 107.endif
103.if !empty(PKG_OPTIONS:Mluajit) || make(makesum) 108.if !empty(PKG_OPTIONS:Mluajit) || make(makesum) || make(mdi)
104LUA_VERSION= 0.10.15 109LUA_VERSION= 0.10.15
105LUA_DISTNAME= lua-nginx-module-${LUA_VERSION} 110LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
106LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz 111LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
107SITES.${LUA_DISTFILE}= -https://github.com/openresty/lua-nginx-module/archive/v${LUA_VERSION}.tar.gz 112SITES.${LUA_DISTFILE}= -https://github.com/openresty/lua-nginx-module/archive/v${LUA_VERSION}.tar.gz
108DISTFILES+= ${LUA_DISTFILE} 113DISTFILES+= ${LUA_DISTFILE}
109.endif 114.endif
110 115
111.if !empty(PKG_OPTIONS:Mecho) 116.if !empty(PKG_OPTIONS:Mecho)
112CONFIGURE_ARGS+= --add-module=../${ECHOMOD_DISTNAME} 117CONFIGURE_ARGS+= --add-module=../${ECHOMOD_DISTNAME}
113.endif 118.endif
114.if !empty(PKG_OPTIONS:Mecho) || make(makesum) 119.if !empty(PKG_OPTIONS:Mecho) || make(makesum) || make(mdi)
115ECHOMOD_VERSION= 0.61 120ECHOMOD_VERSION= 0.61
116ECHOMOD_DISTNAME= echo-nginx-module-${ECHOMOD_VERSION} 121ECHOMOD_DISTNAME= echo-nginx-module-${ECHOMOD_VERSION}
117ECHOMOD_DISTFILE= ${ECHOMOD_DISTNAME}.tar.gz 122ECHOMOD_DISTFILE= ${ECHOMOD_DISTNAME}.tar.gz
118SITES.${ECHOMOD_DISTFILE}= -https://github.com/openresty/echo-nginx-module/archive/v${ECHOMOD_VERSION}.tar.gz 123SITES.${ECHOMOD_DISTFILE}= -https://github.com/openresty/echo-nginx-module/archive/v${ECHOMOD_VERSION}.tar.gz
119DISTFILES+= ${ECHOMOD_DISTFILE} 124DISTFILES+= ${ECHOMOD_DISTFILE}
120.endif 125.endif
121 126
122.if !empty(PKG_OPTIONS:Mset-misc) 127.if !empty(PKG_OPTIONS:Mset-misc)
123CONFIGURE_ARGS+= --add-module=../${SETMISC_DISTNAME} 128CONFIGURE_ARGS+= --add-module=../${SETMISC_DISTNAME}
124.endif 129.endif
125.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum) 130.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum) || make(mdi)
126SETMISC_VERSION= 0.32 131SETMISC_VERSION= 0.32
127SETMISC_DISTNAME= set-misc-nginx-module-${SETMISC_VERSION} 132SETMISC_DISTNAME= set-misc-nginx-module-${SETMISC_VERSION}
128SETMISC_DISTFILE= ${SETMISC_DISTNAME}.tar.gz 133SETMISC_DISTFILE= ${SETMISC_DISTNAME}.tar.gz
129SITES.${SETMISC_DISTFILE}= -https://github.com/openresty/set-misc-nginx-module/archive/v${SETMISC_VERSION}.tar.gz 134SITES.${SETMISC_DISTFILE}= -https://github.com/openresty/set-misc-nginx-module/archive/v${SETMISC_VERSION}.tar.gz
130DISTFILES+= ${SETMISC_DISTFILE} 135DISTFILES+= ${SETMISC_DISTFILE}
131.endif 136.endif
132 137
133.if !empty(PKG_OPTIONS:Marray-var) 138.if !empty(PKG_OPTIONS:Marray-var)
134CONFIGURE_ARGS+= --add-module=../${ARRAYVAR_DISTNAME} 139CONFIGURE_ARGS+= --add-module=../${ARRAYVAR_DISTNAME}
135.endif 140.endif
136.if !empty(PKG_OPTIONS:Marray-var) || make(makesum) 141.if !empty(PKG_OPTIONS:Marray-var) || make(makesum) || make(mdi)
137ARRAYVAR_VERSION= 0.05 142ARRAYVAR_VERSION= 0.05
138ARRAYVAR_DISTNAME= array-var-nginx-module-${ARRAYVAR_VERSION} 143ARRAYVAR_DISTNAME= array-var-nginx-module-${ARRAYVAR_VERSION}
139ARRAYVAR_DISTFILE= ${ARRAYVAR_DISTNAME}.tar.gz 144ARRAYVAR_DISTFILE= ${ARRAYVAR_DISTNAME}.tar.gz
140SITES.${ARRAYVAR_DISTFILE}= -https://github.com/openresty/array-var-nginx-module/archive/v${ARRAYVAR_VERSION}.tar.gz 145SITES.${ARRAYVAR_DISTFILE}= -https://github.com/openresty/array-var-nginx-module/archive/v${ARRAYVAR_VERSION}.tar.gz
141DISTFILES+= ${ARRAYVAR_DISTFILE} 146DISTFILES+= ${ARRAYVAR_DISTFILE}
142.endif 147.endif
143 148
144.if !empty(PKG_OPTIONS:Mencrypted-session) 149.if !empty(PKG_OPTIONS:Mencrypted-session)
145CONFIGURE_ARGS+= --add-module=../${ENCSESS_DISTNAME} 150CONFIGURE_ARGS+= --add-module=../${ENCSESS_DISTNAME}
146.endif 151.endif
147.if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum) 152.if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum) || make(mdi)
148ENCSESS_VERSION= 0.08 153ENCSESS_VERSION= 0.08
149ENCSESS_DISTNAME= encrypted-session-nginx-module-${ENCSESS_VERSION} 154ENCSESS_DISTNAME= encrypted-session-nginx-module-${ENCSESS_VERSION}
150ENCSESS_DISTFILE= ${ENCSESS_DISTNAME}.tar.gz 155ENCSESS_DISTFILE= ${ENCSESS_DISTNAME}.tar.gz
151SITES.${ENCSESS_DISTFILE}= -https://github.com/openresty/encrypted-session-nginx-module/archive/v${ENCSESS_VERSION}.tar.gz 156SITES.${ENCSESS_DISTFILE}= -https://github.com/openresty/encrypted-session-nginx-module/archive/v${ENCSESS_VERSION}.tar.gz
152DISTFILES+= ${ENCSESS_DISTFILE} 157DISTFILES+= ${ENCSESS_DISTFILE}
153.endif 158.endif
154 159
155.if !empty(PKG_OPTIONS:Mform-input) 160.if !empty(PKG_OPTIONS:Mform-input)
156CONFIGURE_ARGS+= --add-module=../${FORMINPUT_DISTNAME} 161CONFIGURE_ARGS+= --add-module=../${FORMINPUT_DISTNAME}
157.endif 162.endif
158.if !empty(PKG_OPTIONS:Mform-input) || make(makesum) 163.if !empty(PKG_OPTIONS:Mform-input) || make(makesum) || make(mdi)
159FORMINPUT_VERSION= 0.12 164FORMINPUT_VERSION= 0.12
160FORMINPUT_DISTNAME= form-input-nginx-module-${FORMINPUT_VERSION} 165FORMINPUT_DISTNAME= form-input-nginx-module-${FORMINPUT_VERSION}
161FORMINPUT_DISTFILE= ${FORMINPUT_DISTNAME}.tar.gz 166FORMINPUT_DISTFILE= ${FORMINPUT_DISTNAME}.tar.gz
162SITES.${FORMINPUT_DISTFILE}= -https://github.com/calio/form-input-nginx-module/archive/v${FORMINPUT_VERSION}.tar.gz 167SITES.${FORMINPUT_DISTFILE}= -https://github.com/calio/form-input-nginx-module/archive/v${FORMINPUT_VERSION}.tar.gz
163DISTFILES+= ${FORMINPUT_DISTFILE} 168DISTFILES+= ${FORMINPUT_DISTFILE}
164.endif 169.endif
165 170
166.if !empty(PKG_OPTIONS:Mheaders-more) 171.if !empty(PKG_OPTIONS:Mheaders-more)
167CONFIGURE_ARGS+= --add-module=../${HEADMORE_DISTNAME} 172CONFIGURE_ARGS+= --add-module=../${HEADMORE_DISTNAME}
168.endif 173.endif
169.if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum) 174.if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum) || make(mdi)
170HEADMORE_VERSION= 0.33 175HEADMORE_VERSION= 0.33
171HEADMORE_DISTNAME= headers-more-nginx-module-${HEADMORE_VERSION} 176HEADMORE_DISTNAME= headers-more-nginx-module-${HEADMORE_VERSION}
172HEADMORE_DISTFILE= ${HEADMORE_DISTNAME}.tar.gz 177HEADMORE_DISTFILE= ${HEADMORE_DISTNAME}.tar.gz
173SITES.${HEADMORE_DISTFILE}= -https://github.com/openresty/headers-more-nginx-module/archive/v${HEADMORE_VERSION}.tar.gz 178SITES.${HEADMORE_DISTFILE}= -https://github.com/openresty/headers-more-nginx-module/archive/v${HEADMORE_VERSION}.tar.gz
174DISTFILES+= ${HEADMORE_DISTFILE} 179DISTFILES+= ${HEADMORE_DISTFILE}
175.endif 180.endif
176 181
177.if !empty(PKG_OPTIONS:Muwsgi) 182.if !empty(PKG_OPTIONS:Muwsgi)
178EGFILES+= uwsgi_params 183EGFILES+= uwsgi_params
179PLIST.uwsgi= yes 184PLIST.uwsgi= yes
180CONFIGURE_ARGS+= --http-uwsgi-temp-path=${NGINX_DATADIR}/uwsgi_temp 185CONFIGURE_ARGS+= --http-uwsgi-temp-path=${NGINX_DATADIR}/uwsgi_temp
181.else 186.else
182CONFIGURE_ARGS+= --without-http_uwsgi_module 187CONFIGURE_ARGS+= --without-http_uwsgi_module
183.endif 188.endif
184 189
185.if !empty(PKG_OPTIONS:Mpush) 190.if !empty(PKG_OPTIONS:Mpush)
186CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION} 191CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION}
187.endif 192.endif
188.if !empty(PKG_OPTIONS:Mpush) || make(makesum) 193.if !empty(PKG_OPTIONS:Mpush) || make(makesum) || make(mdi)
189PUSH_VERSION= 1.2.6 194PUSH_VERSION= 1.2.6
190PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION} 195PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION}
191PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz 196PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz
192SITES.${PUSH_DISTFILE}= -https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz 197SITES.${PUSH_DISTFILE}= -https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz
193DISTFILES+= ${PUSH_DISTFILE} 198DISTFILES+= ${PUSH_DISTFILE}
194.endif 199.endif
195 200
196.if !empty(PKG_OPTIONS:Mimage-filter) 201.if !empty(PKG_OPTIONS:Mimage-filter)
197.include "../../graphics/gd/buildlink3.mk" 202.include "../../graphics/gd/buildlink3.mk"
198CONFIGURE_ARGS+= --with-http_image_filter_module 203CONFIGURE_ARGS+= --with-http_image_filter_module
199.endif 204.endif
200 205
201.if !empty(PKG_OPTIONS:Mslice) 206.if !empty(PKG_OPTIONS:Mslice)
@@ -224,20 +229,20 @@ CONFIGURE_ARGS+= --with-http_auth_reques @@ -224,20 +229,20 @@ CONFIGURE_ARGS+= --with-http_auth_reques
224.endif 229.endif
225 230
226.if !empty(PKG_OPTIONS:Msecure-link) 231.if !empty(PKG_OPTIONS:Msecure-link)
227CONFIGURE_ARGS+= --with-http_secure_link_module 232CONFIGURE_ARGS+= --with-http_secure_link_module
228.endif 233.endif
229 234
230.if !empty(PKG_OPTIONS:Mstream-ssl-preread) 235.if !empty(PKG_OPTIONS:Mstream-ssl-preread)
231CONFIGURE_ARGS+= --with-stream --with-stream_ssl_preread_module 236CONFIGURE_ARGS+= --with-stream --with-stream_ssl_preread_module
232.endif 237.endif
233 238
234.if !empty(PKG_OPTIONS:Mrtmp) 239.if !empty(PKG_OPTIONS:Mrtmp)
235CONFIGURE_ARGS+= --add-module=../${RTMP_DISTNAME} 240CONFIGURE_ARGS+= --add-module=../${RTMP_DISTNAME}
236.endif 241.endif
237.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum) 242.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum) || make(mdi)
238RTMP_VERSION= 1.2.1 243RTMP_VERSION= 1.2.1
239RTMP_DISTNAME= nginx-rtmp-module-${RTMP_VERSION} 244RTMP_DISTNAME= nginx-rtmp-module-${RTMP_VERSION}
240RTMP_DISTFILE= ${RTMP_DISTNAME}.tar.gz 245RTMP_DISTFILE= ${RTMP_DISTNAME}.tar.gz
241SITES.${RTMP_DISTFILE}= -https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_VERSION}.tar.gz 246SITES.${RTMP_DISTFILE}= -https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_VERSION}.tar.gz
242DISTFILES+= ${RTMP_DISTFILE} 247DISTFILES+= ${RTMP_DISTFILE}
243.endif 248.endif