Sat Oct 28 10:57:29 2017 UTC ()
nginx: updated to 1.12.2

Changes with nginx 1.12.2:

*) Bugfix: client SSL connections were immediately closed if deferred
   accept and the "proxy_protocol" parameter of the "listen" directive
   were used.

*) Bugfix: client connections might be dropped during configuration
   testing when using the "reuseport" parameter of the "listen"
   directive on Linux.

*) Bugfix: incorrect response length was returned on 32-bit platforms
   when requesting more than 4 gigabytes with multiple ranges.

*) Bugfix: switching to the next upstream server in the stream module
   did not work when using the "ssl_preread" directive.

*) Bugfix: when using HTTP/2 client request body might be corrupted.

*) Bugfix: in handling of client addresses when using unix domain
   sockets.


(adam)
diff -r1.73 -r1.74 pkgsrc/www/nginx/Makefile
diff -r1.11 -r1.12 pkgsrc/www/nginx/Makefile.common
diff -r1.58 -r1.59 pkgsrc/www/nginx/distinfo
diff -r1.41 -r1.42 pkgsrc/www/nginx/options.mk
diff -r1.1 -r1.2 pkgsrc/www/nginx/patches/patch-auto_lib_pcre_conf
cvs diff -r1.73 -r1.74 pkgsrc/www/nginx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nginx/Makefile 2017/07/23 21:08:18 1.73
+++ pkgsrc/www/nginx/Makefile 2017/10/28 10:57:29 1.74
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: Makefile,v 1.73 2017/07/23 21:08:18 adam Exp $ 1# $NetBSD: Makefile,v 1.74 2017/10/28 10:57:29 adam Exp $
2 2
3DISTNAME= nginx-1.12.1 3DISTNAME= nginx-1.12.2
4MAINTAINER= joerg@NetBSD.org 4MAINTAINER= joerg@NetBSD.org
5 5
6.include "../../www/nginx/Makefile.common" 6.include "../../www/nginx/Makefile.common"
cvs diff -r1.11 -r1.12 pkgsrc/www/nginx/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/nginx/Attic/Makefile.common 2017/07/23 21:08:18 1.11
+++ pkgsrc/www/nginx/Attic/Makefile.common 2017/10/28 10:57:29 1.12
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile.common,v 1.11 2017/07/23 21:08:18 adam Exp $ 1# $NetBSD: Makefile.common,v 1.12 2017/10/28 10:57:29 adam Exp $
2# used by www/nginx/Makefile 2# used by www/nginx/Makefile
3# used by www/nginx-devel/Makefile 3# used by www/nginx-devel/Makefile
4 4
5# Used by both www/nginx and www/nginx-devel 5# Used by both www/nginx and www/nginx-devel
6# Do *not* add any version-specific data here, any change 6# Do *not* add any version-specific data here, any change
7# in this file will affect both packages 7# in this file will affect both packages
8 8
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES= http://nginx.org/download/ 10MASTER_SITES= http://nginx.org/download/
11DISTFILES= ${DEFAULT_DISTFILES} 11DISTFILES= ${DEFAULT_DISTFILES}
12 12
13HOMEPAGE= http://nginx.org/ 13HOMEPAGE= http://nginx.org/
14COMMENT= Lightweight HTTP server and mail proxy server 14COMMENT= Lightweight HTTP server and mail proxy server
15LICENSE= 2-clause-bsd 15LICENSE= 2-clause-bsd
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19NGINX_USER?= nginx 19NGINX_USER?= nginx
20NGINX_GROUP?= nginx 20NGINX_GROUP?= nginx
21NGINX_DATADIR?= ${VARBASE}/db/nginx 21NGINX_DATADIR?= ${VARBASE}/db/nginx
22NGINX_LOGDIR?= ${VARBASE}/log/nginx 22NGINX_LOGDIR?= ${VARBASE}/log/nginx
23NGINX_PIDDIR?= ${VARBASE}/run 23NGINX_PIDDIR?= ${VARBASE}/run
24 24
25BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE 25BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE
26 26
27PKG_USERS_VARS+= NGINX_USER 27PKG_USERS_VARS+= NGINX_USER
28PKG_GROUPS_VARS+= NGINX_GROUP 28PKG_GROUPS_VARS+= NGINX_GROUP
cvs diff -r1.58 -r1.59 pkgsrc/www/nginx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nginx/distinfo 2017/07/23 21:22:28 1.58
+++ pkgsrc/www/nginx/distinfo 2017/10/28 10:57:29 1.59
@@ -1,54 +1,54 @@ @@ -1,54 +1,54 @@
1$NetBSD: distinfo,v 1.58 2017/07/23 21:22:28 adam Exp $ 1$NetBSD: distinfo,v 1.59 2017/10/28 10:57:29 adam Exp $
2 2
3SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26 3SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
4RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733 4RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
5SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84 5SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
6Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes 6Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes
7SHA1 (echo-nginx-module-0.60.tar.gz) = 28e960fd496ac67d815fd9f622448412889d9307 7SHA1 (echo-nginx-module-0.61.tar.gz) = 58a0b5430497cf9e13be5f52e46cad6f48ec251a
8RMD160 (echo-nginx-module-0.60.tar.gz) = 9bdad6a73b26c3d4ab99c3a2b31e6d17d4a9233f 8RMD160 (echo-nginx-module-0.61.tar.gz) = 65bfe167de019826c44479bd413324e1cf686bba
9SHA512 (echo-nginx-module-0.60.tar.gz) = c455bee73cebd0752449472452d15614b9587ddd199263d366484ede890c4d108eacbbeaef31adc9dc7732b56ef2bfc73c0fef3366366db03a8ec3fdc27a985c 9SHA512 (echo-nginx-module-0.61.tar.gz) = c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b
10Size (echo-nginx-module-0.60.tar.gz) = 52771 bytes 10Size (echo-nginx-module-0.61.tar.gz) = 53155 bytes
11SHA1 (encrypted-session-nginx-module-0.06.tar.gz) = 4a95344a16abb34ffd4913b37b2651372abb046d 11SHA1 (encrypted-session-nginx-module-0.06.tar.gz) = 4a95344a16abb34ffd4913b37b2651372abb046d
12RMD160 (encrypted-session-nginx-module-0.06.tar.gz) = b42990e6aae92b1bfe65d10c4f87495b405b3ba2 12RMD160 (encrypted-session-nginx-module-0.06.tar.gz) = b42990e6aae92b1bfe65d10c4f87495b405b3ba2
13SHA512 (encrypted-session-nginx-module-0.06.tar.gz) = 60e3531c7f35c9f19dd1e78d3cad9db6ea1a89ba6610a8a94491fcc54e4d4db46c92c90de31e05a693069656caf27c8707408b90212e80d93559486fbfe445c6 13SHA512 (encrypted-session-nginx-module-0.06.tar.gz) = 60e3531c7f35c9f19dd1e78d3cad9db6ea1a89ba6610a8a94491fcc54e4d4db46c92c90de31e05a693069656caf27c8707408b90212e80d93559486fbfe445c6
14Size (encrypted-session-nginx-module-0.06.tar.gz) = 11128 bytes 14Size (encrypted-session-nginx-module-0.06.tar.gz) = 11128 bytes
15SHA1 (form-input-nginx-module-0.12.tar.gz) = 03d3befb5ecc6aba5f4f871d18c490e206906022 15SHA1 (form-input-nginx-module-0.12.tar.gz) = 03d3befb5ecc6aba5f4f871d18c490e206906022
16RMD160 (form-input-nginx-module-0.12.tar.gz) = 954f13e7ef7afe0d859b543a57482c3dbdf33ced 16RMD160 (form-input-nginx-module-0.12.tar.gz) = 954f13e7ef7afe0d859b543a57482c3dbdf33ced
17SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e 17SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
18Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes 18Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
19SHA1 (headers-more-nginx-module-0.32.tar.gz) = aadb7f0b6c5b5b9cae2af72984e03dc2fbf3fecb 19SHA1 (headers-more-nginx-module-0.32.tar.gz) = aadb7f0b6c5b5b9cae2af72984e03dc2fbf3fecb
20RMD160 (headers-more-nginx-module-0.32.tar.gz) = a0fd69817659321c2d51d9143de413e43cb049b4 20RMD160 (headers-more-nginx-module-0.32.tar.gz) = a0fd69817659321c2d51d9143de413e43cb049b4
21SHA512 (headers-more-nginx-module-0.32.tar.gz) = e42582b45c3111de3940bbeb67ce161aca2d55adcfb00c61c12256fa0e36221d38723013f36edbcf6d1b520f8dfb49d4657df8a956e66d36e68425afad382bd1 21SHA512 (headers-more-nginx-module-0.32.tar.gz) = e42582b45c3111de3940bbeb67ce161aca2d55adcfb00c61c12256fa0e36221d38723013f36edbcf6d1b520f8dfb49d4657df8a956e66d36e68425afad382bd1
22Size (headers-more-nginx-module-0.32.tar.gz) = 28033 bytes 22Size (headers-more-nginx-module-0.32.tar.gz) = 28033 bytes
23SHA1 (lua-nginx-module-0.10.8.tar.gz) = 1538ff4a3e6ffa182fae87a87d36f3c62b670397 23SHA1 (lua-nginx-module-0.10.10.tar.gz) = d9f40448e7fb24e5c14901fb35c166981819ce55
24RMD160 (lua-nginx-module-0.10.8.tar.gz) = 7e0959c91c439c679a8c2276d9817b279fed5315 24RMD160 (lua-nginx-module-0.10.10.tar.gz) = 9388cf1b6811720010f2d17814bae9e9baa44637
25SHA512 (lua-nginx-module-0.10.8.tar.gz) = ad621cec178eb37109f16ebc30dbab7b1ea344ac4b523ff1e6ad62364b8cf437488a89c593ca44b446b729a1c578e3a97685851847b4b16a147ac9eca8f23a2a 25SHA512 (lua-nginx-module-0.10.10.tar.gz) = 3440e3fe714407f0ff61e0da207669655b443f7b70ef8a91693ea05ed96d8fde349d9c8ea30d5ff53ea3f8e4a5c7d0a2834e136c340b1b1365d62006339a1e4d
26Size (lua-nginx-module-0.10.8.tar.gz) = 606643 bytes 26Size (lua-nginx-module-0.10.10.tar.gz) = 611973 bytes
27SHA1 (naxsi-0.55.3.tar.gz) = 93c2be1f50e5e86a44c54ee02fc6a6faca16707f 27SHA1 (naxsi-0.55.3.tar.gz) = 93c2be1f50e5e86a44c54ee02fc6a6faca16707f
28RMD160 (naxsi-0.55.3.tar.gz) = 45dcedc7961e487c2c659064abdeaf5b91dc75d2 28RMD160 (naxsi-0.55.3.tar.gz) = 45dcedc7961e487c2c659064abdeaf5b91dc75d2
29SHA512 (naxsi-0.55.3.tar.gz) = 9e8f41a5cd1342cc9b8aa334a603842d14a256aab1f4a21205bb1278aecbb0c49e39c889d8113a5b41aad2efeaa2ed9f11cba6929173f50add91f54c4c59c8a0 29SHA512 (naxsi-0.55.3.tar.gz) = 9e8f41a5cd1342cc9b8aa334a603842d14a256aab1f4a21205bb1278aecbb0c49e39c889d8113a5b41aad2efeaa2ed9f11cba6929173f50add91f54c4c59c8a0
30Size (naxsi-0.55.3.tar.gz) = 187416 bytes 30Size (naxsi-0.55.3.tar.gz) = 187416 bytes
31SHA1 (nginx-1.12.1.tar.gz) = 71000022267589f50e83b0d6743923c1b7e64238 31SHA1 (nginx-1.12.2.tar.gz) = 6b41d63befa4f52b0724b533e6292a6671b71fdc
32RMD160 (nginx-1.12.1.tar.gz) = 2763d528651e383a2b8dd391e3ba68a1813d9951 32RMD160 (nginx-1.12.2.tar.gz) = d339de3ae1e05740810314e5c5884d67f622d302
33SHA512 (nginx-1.12.1.tar.gz) = 3a2ad2a559b366dda92dd58c0fe40ee84dd60a3eaf72071454110e032c3e9a03f2a63b28fe3a615b527950521eeb533c687a2cc4c87524e1d8f3a0a5f043fdb6 33SHA512 (nginx-1.12.2.tar.gz) = 3faa2043e237a7e1d15cc5661ac9d002a965220a78c25a863be9f19e01007347e53f776b61c229f6bd3d916cc1ccf92de260811f7b8092ec1b747fba7c0061f7
34Size (nginx-1.12.1.tar.gz) = 981093 bytes 34Size (nginx-1.12.2.tar.gz) = 981687 bytes
35SHA1 (nginx-rtmp-module-1.2.0.tar.gz) = f22b89944c93cdd8a3e6e5632ace54013df5c7ff 35SHA1 (nginx-rtmp-module-1.2.0.tar.gz) = f22b89944c93cdd8a3e6e5632ace54013df5c7ff
36RMD160 (nginx-rtmp-module-1.2.0.tar.gz) = 851b9570e4afd85acb4945772a8b46f298336892 36RMD160 (nginx-rtmp-module-1.2.0.tar.gz) = 851b9570e4afd85acb4945772a8b46f298336892
37SHA512 (nginx-rtmp-module-1.2.0.tar.gz) = 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8 37SHA512 (nginx-rtmp-module-1.2.0.tar.gz) = 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8
38Size (nginx-rtmp-module-1.2.0.tar.gz) = 519895 bytes 38Size (nginx-rtmp-module-1.2.0.tar.gz) = 519895 bytes
39SHA1 (nginx_http_push_module-1.1.7.tar.gz) = ece7090a54140f81bb5bc8ae3dc3ea21f241b078 39SHA1 (nginx_http_push_module-1.1.8.tar.gz) = f48aa1452631b447eb6c231397e4fcb914d2904e
40RMD160 (nginx_http_push_module-1.1.7.tar.gz) = e56ada4758b6018521c763a25291eda98dfcbf8c 40RMD160 (nginx_http_push_module-1.1.8.tar.gz) = aa687d25a72bb0e734dbdf997141c5e4b2b7c4fe
41SHA512 (nginx_http_push_module-1.1.7.tar.gz) = 1e9b029912ef6e89dba8e3aed57d50848b52fbeb1077d965ca39aea14c2b34c11092ee53db47fb1df9e5adaf466f849c5a33cade881fddb420c1a036bc659d4b 41SHA512 (nginx_http_push_module-1.1.8.tar.gz) = 5ae506fe967dba956a06bcc903dabc00c83c305ae8705d9a123870df5b3cb799f1889aa1599f293872cb11486775f85075a1090ec9b09042552dbd6b37448ba4
42Size (nginx_http_push_module-1.1.7.tar.gz) = 608690 bytes 42Size (nginx_http_push_module-1.1.8.tar.gz) = 623400 bytes
43SHA1 (ngx_devel_kit-0.3.0.tar.gz) = b556d068db23037be30436af559795f45dd93c67 43SHA1 (ngx_devel_kit-0.3.0.tar.gz) = b556d068db23037be30436af559795f45dd93c67
44RMD160 (ngx_devel_kit-0.3.0.tar.gz) = beb2736eb06e8e26f60643623553789346f653da 44RMD160 (ngx_devel_kit-0.3.0.tar.gz) = beb2736eb06e8e26f60643623553789346f653da
45SHA512 (ngx_devel_kit-0.3.0.tar.gz) = 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614 45SHA512 (ngx_devel_kit-0.3.0.tar.gz) = 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614
46Size (ngx_devel_kit-0.3.0.tar.gz) = 66455 bytes 46Size (ngx_devel_kit-0.3.0.tar.gz) = 66455 bytes
47SHA1 (set-misc-nginx-module-0.31.tar.gz) = 181b04a9264dd503de4c7d80ccc240e80c85b071 47SHA1 (set-misc-nginx-module-0.31.tar.gz) = 181b04a9264dd503de4c7d80ccc240e80c85b071
48RMD160 (set-misc-nginx-module-0.31.tar.gz) = bba92dfdfb63f8f654e7546a8f476221a7aa95bd 48RMD160 (set-misc-nginx-module-0.31.tar.gz) = bba92dfdfb63f8f654e7546a8f476221a7aa95bd
49SHA512 (set-misc-nginx-module-0.31.tar.gz) = c853b041cecc3521f888be3d0483c6cf23d239259ac4f5d35b10d4483b0fb06d1d22060adedcf6605b220d99f9051faf300d06989736d510b4486f943d3a675e 49SHA512 (set-misc-nginx-module-0.31.tar.gz) = c853b041cecc3521f888be3d0483c6cf23d239259ac4f5d35b10d4483b0fb06d1d22060adedcf6605b220d99f9051faf300d06989736d510b4486f943d3a675e
50Size (set-misc-nginx-module-0.31.tar.gz) = 29359 bytes 50Size (set-misc-nginx-module-0.31.tar.gz) = 29359 bytes
51SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c 51SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
52SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763 52SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763
53SHA1 (patch-auto_lib_pcre_conf) = 500f16808c07ae2fd4016dd662b6f1b0b1efbb91 53SHA1 (patch-auto_lib_pcre_conf) = 500f16808c07ae2fd4016dd662b6f1b0b1efbb91
54SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2 54SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2
cvs diff -r1.41 -r1.42 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2017/07/23 21:08:18 1.41
+++ pkgsrc/www/nginx/options.mk 2017/10/28 10:57:29 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.41 2017/07/23 21:08:18 adam Exp $ 1# $NetBSD: options.mk,v 1.42 2017/10/28 10:57:29 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 pcre push realip ssl sub uwsgi image-filter \
6 debug status nginx-autodetect-cflags echo \ 6 debug 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 rtmp 8 form-input perl gzip http2 auth-request rtmp
9PKG_OPTIONS_LEGACY_OPTS+= v2:http2 9PKG_OPTIONS_LEGACY_OPTS+= v2:http2
10 10
11PKG_SUGGESTED_OPTIONS= inet6 pcre ssl 11PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
12 12
13PLIST_VARS+= naxsi perl uwsgi 13PLIST_VARS+= naxsi perl uwsgi
14 14
@@ -94,38 +94,38 @@ NDK_VERSION= 0.3.0 @@ -94,38 +94,38 @@ NDK_VERSION= 0.3.0
94NDK_DISTNAME= ngx_devel_kit-${NDK_VERSION} 94NDK_DISTNAME= ngx_devel_kit-${NDK_VERSION}
95NDK_DISTFILE= ${NDK_DISTNAME}.tar.gz 95NDK_DISTFILE= ${NDK_DISTNAME}.tar.gz
96SITES.${NDK_DISTFILE}= -https://github.com/simpl/ngx_devel_kit/archive/v${NDK_VERSION}.tar.gz 96SITES.${NDK_DISTFILE}= -https://github.com/simpl/ngx_devel_kit/archive/v${NDK_VERSION}.tar.gz
97DISTFILES+= ${NDK_DISTFILE} 97DISTFILES+= ${NDK_DISTFILE}
98.endif 98.endif
99 99
100.if !empty(PKG_OPTIONS:Mluajit) 100.if !empty(PKG_OPTIONS:Mluajit)
101.include "../../lang/LuaJIT2/buildlink3.mk" 101.include "../../lang/LuaJIT2/buildlink3.mk"
102CONFIGURE_ENV+= LUAJIT_LIB=${PREFIX}/lib 102CONFIGURE_ENV+= LUAJIT_LIB=${PREFIX}/lib
103CONFIGURE_ENV+= LUAJIT_INC=${PREFIX}/include/luajit-2.0 103CONFIGURE_ENV+= LUAJIT_INC=${PREFIX}/include/luajit-2.0
104CONFIGURE_ARGS+= --add-module=../${LUA_DISTNAME} 104CONFIGURE_ARGS+= --add-module=../${LUA_DISTNAME}
105.endif 105.endif
106.if !empty(PKG_OPTIONS:Mluajit) || make(makesum) 106.if !empty(PKG_OPTIONS:Mluajit) || make(makesum)
107LUA_VERSION= 0.10.8 107LUA_VERSION= 0.10.10
108LUA_DISTNAME= lua-nginx-module-${LUA_VERSION} 108LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
109LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz 109LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
110SITES.${LUA_DISTFILE}= -https://github.com/openresty/lua-nginx-module/archive/v${LUA_VERSION}.tar.gz 110SITES.${LUA_DISTFILE}= -https://github.com/openresty/lua-nginx-module/archive/v${LUA_VERSION}.tar.gz
111DISTFILES+= ${LUA_DISTFILE} 111DISTFILES+= ${LUA_DISTFILE}
112.endif 112.endif
113 113
114.if !empty(PKG_OPTIONS:Mecho) 114.if !empty(PKG_OPTIONS:Mecho)
115CONFIGURE_ARGS+= --add-module=../${ECHOMOD_DISTNAME} 115CONFIGURE_ARGS+= --add-module=../${ECHOMOD_DISTNAME}
116.endif 116.endif
117.if !empty(PKG_OPTIONS:Mecho) || make(makesum) 117.if !empty(PKG_OPTIONS:Mecho) || make(makesum)
118ECHOMOD_VERSION= 0.60 118ECHOMOD_VERSION= 0.61
119ECHOMOD_DISTNAME= echo-nginx-module-${ECHOMOD_VERSION} 119ECHOMOD_DISTNAME= echo-nginx-module-${ECHOMOD_VERSION}
120ECHOMOD_DISTFILE= ${ECHOMOD_DISTNAME}.tar.gz 120ECHOMOD_DISTFILE= ${ECHOMOD_DISTNAME}.tar.gz
121SITES.${ECHOMOD_DISTFILE}= -https://github.com/openresty/echo-nginx-module/archive/v${ECHOMOD_VERSION}.tar.gz 121SITES.${ECHOMOD_DISTFILE}= -https://github.com/openresty/echo-nginx-module/archive/v${ECHOMOD_VERSION}.tar.gz
122DISTFILES+= ${ECHOMOD_DISTFILE} 122DISTFILES+= ${ECHOMOD_DISTFILE}
123.endif 123.endif
124 124
125.if !empty(PKG_OPTIONS:Mset-misc) 125.if !empty(PKG_OPTIONS:Mset-misc)
126CONFIGURE_ARGS+= --add-module=../${SETMISC_DISTNAME} 126CONFIGURE_ARGS+= --add-module=../${SETMISC_DISTNAME}
127.endif 127.endif
128.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum) 128.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum)
129SETMISC_VERSION= 0.31 129SETMISC_VERSION= 0.31
130SETMISC_DISTNAME= set-misc-nginx-module-${SETMISC_VERSION} 130SETMISC_DISTNAME= set-misc-nginx-module-${SETMISC_VERSION}
131SETMISC_DISTFILE= ${SETMISC_DISTNAME}.tar.gz 131SETMISC_DISTFILE= ${SETMISC_DISTNAME}.tar.gz
@@ -178,27 +178,27 @@ DISTFILES+= ${HEADMORE_DISTFILE} @@ -178,27 +178,27 @@ DISTFILES+= ${HEADMORE_DISTFILE}
178.endif 178.endif
179 179
180.if !empty(PKG_OPTIONS:Muwsgi) 180.if !empty(PKG_OPTIONS:Muwsgi)
181EGFILES+= uwsgi_params 181EGFILES+= uwsgi_params
182PLIST.uwsgi= yes 182PLIST.uwsgi= yes
183.else 183.else
184CONFIGURE_ARGS+= --without-http_uwsgi_module 184CONFIGURE_ARGS+= --without-http_uwsgi_module
185.endif 185.endif
186 186
187.if !empty(PKG_OPTIONS:Mpush) 187.if !empty(PKG_OPTIONS:Mpush)
188CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION} 188CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION}
189.endif 189.endif
190.if !empty(PKG_OPTIONS:Mpush) || make(makesum) 190.if !empty(PKG_OPTIONS:Mpush) || make(makesum)
191PUSH_VERSION= 1.1.7 191PUSH_VERSION= 1.1.8
192PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION} 192PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION}
193PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz 193PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz
194SITES.${PUSH_DISTFILE}= -https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz 194SITES.${PUSH_DISTFILE}= -https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz
195DISTFILES+= ${PUSH_DISTFILE} 195DISTFILES+= ${PUSH_DISTFILE}
196.endif 196.endif
197 197
198.if !empty(PKG_OPTIONS:Mimage-filter) 198.if !empty(PKG_OPTIONS:Mimage-filter)
199.include "../../graphics/gd/buildlink3.mk" 199.include "../../graphics/gd/buildlink3.mk"
200CONFIGURE_ARGS+= --with-http_image_filter_module 200CONFIGURE_ARGS+= --with-http_image_filter_module
201.endif 201.endif
202 202
203.if !empty(PKG_OPTIONS:Mstatus) 203.if !empty(PKG_OPTIONS:Mstatus)
204CONFIGURE_ARGS+= --with-http_stub_status_module 204CONFIGURE_ARGS+= --with-http_stub_status_module
cvs diff -r1.1 -r1.2 pkgsrc/www/nginx/patches/Attic/patch-auto_lib_pcre_conf (expand / switch to unified diff)

--- pkgsrc/www/nginx/patches/Attic/patch-auto_lib_pcre_conf 2016/11/24 11:35:23 1.1
+++ pkgsrc/www/nginx/patches/Attic/patch-auto_lib_pcre_conf 2017/10/28 10:57:29 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-auto_lib_pcre_conf,v 1.1 2016/11/24 11:35:23 maya Exp $ 1$NetBSD: patch-auto_lib_pcre_conf,v 1.2 2017/10/28 10:57:29 adam Exp $
 2
 3Use correct PREFIX.
2 4
3--- auto/lib/pcre/conf.orig 2016-05-31 13:47:01.000000000 +0000 5--- auto/lib/pcre/conf.orig 2016-05-31 13:47:01.000000000 +0000
4+++ auto/lib/pcre/conf 6+++ auto/lib/pcre/conf
5@@ -139,13 +139,13 @@ else 7@@ -139,13 +139,13 @@ else
6  8
7 # NetBSD port 9 # NetBSD port
8  10
9- ngx_feature="PCRE library in /usr/pkg/" 11- ngx_feature="PCRE library in /usr/pkg/"
10- ngx_feature_path="/usr/pkg/include" 12- ngx_feature_path="/usr/pkg/include"
11+ ngx_feature="PCRE library in @PREFIX@" 13+ ngx_feature="PCRE library in @PREFIX@"
12+ ngx_feature_path="@PREFIX@/include" 14+ ngx_feature_path="@PREFIX@/include"
13  15
14 if [ $NGX_RPATH = YES ]; then 16 if [ $NGX_RPATH = YES ]; then