1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00

Upgrade third-party modules:

o) arrayvar from 0.03 to 0.05;
o) devel_kit from 0.2.19 to 0.3.0;
o) echo from 4f7aa50 to 46334b3;
o) encryptsession from 0.03 to 0.05;
o) forminput from 0.07 to 0.12;
o) iconv from 0.10 to 0.14;
o) lua from 0.10.5 to 0.10.6rc1;
o) set_misc from 6582fb4 to f808ef4;
o) sflow from 0.9.7 to 543c72a;
o) small_light from 0.6.15 to 0.8.0;
o) xss from 0.04 to 0.05.

Do not bump PORTREVISION.
This commit is contained in:
Sergey A. Osokin 2016-08-07 02:03:59 +00:00
parent f3636df6bd
commit 941b257cb9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419758
12 changed files with 136 additions and 138 deletions

View File

@ -333,7 +333,7 @@ CONFIGURE_ARGS+=--with-http_addition_module
.endif
.if ${PORT_OPTIONS:MHTTP_AUTH_DIGEST}
GIT_AUTH_DIGEST_VERSION= 4edfb18
GIT_AUTH_DIGEST_VERSION= cc61b4a
GH_ACCOUNT+= atomx:auth_digest
GH_PROJECT+= nginx-http-auth-digest:auth_digest
GH_TAGNAME+= ${GIT_AUTH_DIGEST_VERSION}:auth_digest
@ -435,7 +435,7 @@ USE_HTTP_SSL= yes
.endif
.if ${PORT_OPTIONS:MECHO}
NGINX_ECHO_VERSION= 4f7aa50
NGINX_ECHO_VERSION= 46334b3
GH_ACCOUNT+= openresty:echo
GH_PROJECT+= echo-nginx-module:echo
GH_TAGNAME+= ${NGINX_ECHO_VERSION}:echo
@ -578,7 +578,7 @@ USES+= perl5
.endif
.if ${PORT_OPTIONS:MHTTP_PUSH}
GIT_PUSH_VERSION= 0.99.15
GIT_PUSH_VERSION= 0.99.16
GH_ACCOUNT+= slact:push
GH_PROJECT+= nchan:push
GH_TAGNAME+= v${GIT_PUSH_VERSION}:push
@ -759,7 +759,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_inet_slab.c
.endif
.if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
NGINX_DEVEL_KIT_VERSION= 0.2.19
NGINX_DEVEL_KIT_VERSION= 0.3.0
GH_ACCOUNT+= simpl:devel_kit
GH_PROJECT+= ngx_devel_kit:devel_kit
GH_TAGNAME+= v${NGINX_DEVEL_KIT_VERSION}:devel_kit
@ -767,7 +767,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_devel_kit}
.endif
.if ${PORT_OPTIONS:MENCRYPTSESSION}
NGINX_ENCRYPTSESSION_VERSION= 0.03
NGINX_ENCRYPTSESSION_VERSION= 0.05
GH_ACCOUNT+= openresty:encryptsession
GH_PROJECT+= encrypted-session-nginx-module:encryptsession
GH_TAGNAME+= v${NGINX_ENCRYPTSESSION_VERSION}:encryptsession
@ -795,7 +795,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
LIB_DEPENDS+= libluajit-5.1.so:lang/luajit
CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"
NGINX_LUA_VERSION= 0.10.5
NGINX_LUA_VERSION= 0.10.6rc1
GH_ACCOUNT+= openresty:lua
GH_PROJECT+= lua-nginx-module:lua
GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua
@ -905,7 +905,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_rtmp}
.endif
.if ${PORT_OPTIONS:MSET_MISC}
NGINX_SET_MISC_VERSION= 6582fb4
NGINX_SET_MISC_VERSION= f808ef4
GH_ACCOUNT+= openresty:setmisc
GH_PROJECT+= set-misc-nginx-module:setmisc
GH_TAGNAME+= ${NGINX_SET_MISC_VERSION}:setmisc
@ -917,10 +917,10 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc}
.endif
.if ${PORT_OPTIONS:MSFLOW}
NGINX_SFLOW_VERSION= 0.9.7
MASTER_SITES+= http://nginx-sflow-module.googlecode.com/files/:sflow
DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}
NGINX_SFLOW_VERSION= 543c72a
GH_ACCOUNT+= sflow:sflow
GH_PROJECT+= nginx-sflow-module:sflow
GH_TAGNAME+= ${NGINX_SFLOW_VERSION}:sflow
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \
${PATCHDIR}/extra-patch-ngx_http_sflow_config.h \
${PATCHDIR}/extra-patch-ngx_http_sflow_module.c
@ -942,7 +942,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
.endif
.if ${PORT_OPTIONS:MSMALL_LIGHT}
NGINX_SMALL_LIGHT_VERSION= 0.6.15
NGINX_SMALL_LIGHT_VERSION= 0.8.0
LIB_DEPENDS+= libMagickCore-6.so:graphics/ImageMagick \
libMagickWand-6.so:graphics/ImageMagick \
libpcre.so:devel/pcre
@ -989,7 +989,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_xrid}
.endif
.if ${PORT_OPTIONS:MXSS}
NGINX_XSS_VERSION= 0.04
NGINX_XSS_VERSION= 0.05
GH_ACCOUNT+= openresty:xss
GH_PROJECT+= xss-nginx-module:xss
GH_TAGNAME+= v${NGINX_XSS_VERSION}:xss
@ -1068,7 +1068,7 @@ CONFIGURE_ARGS+=--with-http_ssl_module
.endif
.if ${PORT_OPTIONS:MARRAYVAR}
NGINX_ARRAYVAR_VERSION= 0.03
NGINX_ARRAYVAR_VERSION= 0.05
GH_ACCOUNT+= openresty:arrayvar
GH_PROJECT+= array-var-nginx-module:arrayvar
GH_TAGNAME+= v${NGINX_ARRAYVAR_VERSION}:arrayvar
@ -1090,7 +1090,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_brotli}
.endif
.if ${PORT_OPTIONS:MFORMINPUT}
NGINX_FORMINPUT_VERSION= 0.07
NGINX_FORMINPUT_VERSION= 0.12
GH_ACCOUNT+= calio:forminput
GH_PROJECT+= form-input-nginx-module:forminput
GH_TAGNAME+= v${NGINX_FORMINPUT_VERSION}:forminput
@ -1099,7 +1099,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_forminput}
.if ${PORT_OPTIONS:MICONV}
USES+= iconv
NGINX_ICONV_VERSION= 0.10
NGINX_ICONV_VERSION= 0.14
GH_ACCOUNT+= calio:iconv
GH_PROJECT+= iconv-nginx-module:iconv
GH_TAGNAME+= v${NGINX_ICONV_VERSION}:iconv

View File

@ -1,4 +1,4 @@
TIMESTAMP = 1470005526
TIMESTAMP = 1470533467
SHA256 (nginx-1.11.3.tar.gz) = 4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610
SIZE (nginx-1.11.3.tar.gz) = 938045
SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
@ -25,16 +25,14 @@ SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cd
SIZE (modsecurity-2.9.1.tar.gz) = 4261212
SHA256 (passenger-5.0.30.tar.gz) = f367e0c1d808d7356c3749222194a72ea03efe61a3bf1b682bd05d47f087b4e3
SIZE (passenger-5.0.30.tar.gz) = 5588130
SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659
SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284
SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
SHA256 (atomx-nginx-http-auth-digest-4edfb18_GH0.tar.gz) = 8b831fccda3ce9bdf854a3aefa1e466a8da97ca0a5feb33a28b4f117f517b82e
SIZE (atomx-nginx-http-auth-digest-4edfb18_GH0.tar.gz) = 16007
SHA256 (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = e68b34e03516a4ab43006eb4c481d6bc5e813e0d40876359c606a26c5c68ccf6
SIZE (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = 16060
SHA256 (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = b47b23a362aa338c377d6163d15abee6f33ff16bac5f86ee4d9543293fe8c4d1
SIZE (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = 18120
SHA256 (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) = 0ec4f099e50cc12a6319e37700e71540498d354831d1f09e113ee046ee0bb7b2
@ -47,8 +45,8 @@ SHA256 (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 642ebf4724fa7c3efd5349e
SIZE (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 603856
SHA256 (grahamedgecombe-nginx-ct-f3cad5e_GH0.tar.gz) = 846e148f09ffea2ffc1b09b20c84408e23c170313f967513a85009717227c13a
SIZE (grahamedgecombe-nginx-ct-f3cad5e_GH0.tar.gz) = 5521
SHA256 (openresty-echo-nginx-module-4f7aa50_GH0.tar.gz) = 7b8bb5139001306a46f8e9ce0b7d09befff2f49741ecc6eb47299518764defcd
SIZE (openresty-echo-nginx-module-4f7aa50_GH0.tar.gz) = 52144
SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0
SIZE (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 52766
SHA256 (openresty-headers-more-nginx-module-f5559ec_GH0.tar.gz) = 422b12414a6f850cbb3ee96c225e5259eef4e949f70e63e27e6583ce3eb836ff
SIZE (openresty-headers-more-nginx-module-f5559ec_GH0.tar.gz) = 27400
SHA256 (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d
@ -63,8 +61,8 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e
SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
SHA256 (slact-nchan-v0.99.15_GH0.tar.gz) = eb43ec3ed3f088c104fdf55eb2c48e9b6867f07f54d4d6eca554dcdc1297c69b
SIZE (slact-nchan-v0.99.15_GH0.tar.gz) = 376521
SHA256 (slact-nchan-v0.99.16_GH0.tar.gz) = 200cc1b02931a067c3edb07243a7faac80265ce6aab37af680cf7373011efc41
SIZE (slact-nchan-v0.99.16_GH0.tar.gz) = 378626
SHA256 (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = a95f31e80120fd7324795b92a0d94c0b43e1265df7fd0f1eba11a337c1e0a626
SIZE (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = 175263
SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3
@ -83,18 +81,18 @@ SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec02302
SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = 59024
SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = bf60cf196c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b
SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = 10921
SHA256 (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679
SIZE (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 65029
SHA256 (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 4d0da617b3122b145dd46ec8618c6248db79c992704b23ed78e01bddf14173d3
SIZE (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 8949
SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619
SIZE (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 66455
SHA256 (openresty-encrypted-session-nginx-module-v0.05_GH0.tar.gz) = 5aea148410d647ca1d5b4e6164a19fde989a4da332fa118e003071d87bf6eae4
SIZE (openresty-encrypted-session-nginx-module-v0.05_GH0.tar.gz) = 10462
SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883
SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172
SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
SHA256 (openresty-lua-nginx-module-v0.10.5_GH0.tar.gz) = 4f0292c37ab3d7cb980c994825040be1bda2c769cbd800e79c43eb37458347d4
SIZE (openresty-lua-nginx-module-v0.10.5_GH0.tar.gz) = 579793
SHA256 (openresty-lua-nginx-module-v0.10.6rc1_GH0.tar.gz) = 86806a1893c775d813a58912b6f3b99b55efa7ab126ac5f28a57bc9a10b6044e
SIZE (openresty-lua-nginx-module-v0.10.6rc1_GH0.tar.gz) = 581366
SHA256 (openresty-memc-nginx-module-v0.16_GH0.tar.gz) = 24f3c3270831aed2d157c01ef74cb26eab26b832971fe7b9f42a03dbfac10ce4
SIZE (openresty-memc-nginx-module-v0.16_GH0.tar.gz) = 38560
SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5
@ -109,27 +107,29 @@ SHA256 (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = baf5274c815a5f27854747
SIZE (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = 28981
SHA256 (arut-nginx-rtmp-module-v1.1.8_GH0.tar.gz) = de5866111a5b18c9dfb1c10f3a0e84b56af77f7005a41807368f7769b8a50965
SIZE (arut-nginx-rtmp-module-v1.1.8_GH0.tar.gz) = 519647
SHA256 (openresty-set-misc-nginx-module-6582fb4_GH0.tar.gz) = cc325830477dfcdbb355fc7b19cbc2f4e55c179b3b56fdfe0613b5a7b926235e
SIZE (openresty-set-misc-nginx-module-6582fb4_GH0.tar.gz) = 35961
SHA256 (openresty-set-misc-nginx-module-f808ef4_GH0.tar.gz) = 5f32c484b29b9047dfa65fd3eec511c0f7c65f0f3ec0a4e0453359cf4642d405
SIZE (openresty-set-misc-nginx-module-f808ef4_GH0.tar.gz) = 29340
SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f693eb6795c6f21ae062842bf84fe762d8b842955
SIZE (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 29504
SHA256 (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = c25f284bc934f59a267d319385a3e11858efef786c84b49a77d09e7f5274bbf1
SIZE (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = 16688
SHA256 (cubicdaiya-ngx_small_light-v0.6.15_GH0.tar.gz) = 9bc9c221287a6db56a4a0eb7ac35a560fc15dfd6dafcb500fdea49a583527716
SIZE (cubicdaiya-ngx_small_light-v0.6.15_GH0.tar.gz) = 54695
SHA256 (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 8f513d6d3df32c3b05327d40e16efd020532a911d3eeca8015eb6271f2d4fd1c
SIZE (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 55918
SHA256 (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = e34b1ab5f5007661f73819f9c20fd6c2a46ed3e53364e9449b02ef2bd3628633
SIZE (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = 58777
SHA256 (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) = 4c5886edb1fbeb0b9a83c879b4be4b15a620627a18978aef636da3feafb284fe
SIZE (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) = 6636
SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = de784142d867a35ecc5443fa347c2903af0935669cdf2eaa9274f5253aac2267
SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711
SHA256 (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 4e5230a644779b8298063d5c0bd7dc19531496369456d69dc5281ae1cca4d6ec
SIZE (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 10536
SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
SHA256 (nginx-njs-f71f005_GH0.tar.gz) = d1051a0ef8e6f99b51ed02cf93d8255fad03b6de11fc5eb147c4dcb3e7094b9a
SIZE (nginx-njs-f71f005_GH0.tar.gz) = 164982
SHA256 (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = f9892ec9a2e872d8aabeb2234d0d4c66cf85b8dbb2ca5c108a20c3d8c2111189
SIZE (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = 9520
SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776
SIZE (google-ngx_brotli-ada972b_GH0.tar.gz) = 11128
SHA256 (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = c0c56cc697a290e98b88d4888bac8828041ef6f3049247d3cd3c63f2808d1e20
SIZE (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = 10563
SHA256 (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 88e326eba7fdf9fd2376b1ba033b48cb0eee45136528cf5430ac9340088ce324
SIZE (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 12513
SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133

View File

@ -1,5 +1,5 @@
--- ../iconv-nginx-module-0.10/config.orig 2013-04-16 17:57:17.000000000 -0700
+++ ../iconv-nginx-module-0.10/config 2013-05-01 17:16:28.134624745 -0700
--- ../iconv-nginx-module-0.14/config.orig 2013-04-16 17:57:17.000000000 -0700
+++ ../iconv-nginx-module-0.14/config 2013-05-01 17:16:28.134624745 -0700
@@ -39,12 +39,12 @@
fi

View File

@ -1,5 +1,5 @@
--- ../nginx-sflow-module-0.9.7/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400
+++ ../nginx-sflow-module-0.9.7/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400
--- ../nginx-sflow-module-543c72a/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400
+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400
@@ -26,7 +26,6 @@
ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() failed: %s", gai_strerror(err));
switch(err) {

View File

@ -1,5 +1,5 @@
--- ../nginx-sflow-module-0.9.7/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400
+++ ../nginx-sflow-module-0.9.7/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400
--- ../nginx-sflow-module-543c72a/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400
+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400
@@ -17,7 +17,7 @@
-----------------___________________________------------------
*/

View File

@ -1,17 +1,16 @@
--- ../nginx-sflow-module-0.9.7/ngx_http_sflow_module.c.orig 2015-04-21 21:21:17.020547000 +0300
+++ ../nginx-sflow-module-0.9.7/ngx_http_sflow_module.c 2015-04-21 21:22:26.994714000 +0300
@@ -8,10 +8,6 @@
--- ../nginx-sflow-module-543c72a/ngx_http_sflow_module.c.orig 2014-09-24 18:20:41.000000000 -0400
+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_module.c 2016-08-06 21:26:24.515559000 -0400
@@ -8,9 +8,6 @@
#include <ngx_http.h>
#include <nginx.h>
-#if (NGX_THREADS)
-#include <ngx_thread.h>
-#endif
-
#include "ngx_http_sflow_api.h"
#include "ngx_http_sflow_config.h"
@@ -42,18 +38,10 @@
@@ -74,18 +71,10 @@
/* keep log ptr for callbacks */
ngx_log_t *log;
@ -28,12 +27,12 @@
#define SFWB_COUNTDOWN(_c) (--(_c) == 0)
-#endif
/* delegate acquiring the sflow config */
SFWBConfigManager *config_manager;
@@ -411,13 +399,8 @@
static int32_t ngx_http_sflow_add_random_skip(SFWB *sm)
/* skip countdown is handled per-worker to reduce lock contention.
* If all processes sample at 1:N it's the same as having only one
@@ -645,13 +634,8 @@
{
ngx_atomic_t next_skip = sfl_sampler_next_skip(sm->sampler);
sm->random_seed = ((sm->random_seed * 32719) + 3) % 32749;
ngx_atomic_t next_skip = (sm->random_seed % ((2 * sm->sampling_rate) - 1)) + 1;
-#if (NGX_THREADS)
- ngx_atomic_int_t test_skip = ngx_atomic_fetch_add(&sm->sflow_skip, next_skip);
- return (test_skip + next_skip);
@ -44,17 +43,17 @@
}
/*_________________---------------------------__________________
@@ -528,13 +511,6 @@
/* a pool to use for the agent so we can recycle the memory easily on a config change */
sm->masterPool = ngx_create_pool(SFWB_POOL_SIZ, cf->log);
@@ -864,13 +848,6 @@
{
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "sflow: sfwb_init()");
-#if (NGX_THREADS)
- /* a mutex to lock the sFlow agent when taking a sample (only needed if there
- is more that one worker thread - right now it seems like threads are not even
- an option in the configure script) */
- * is more that one worker thread - right now it seems like threads are not even
- * an option in the configure script)
- */
- sm->mut = ngx_mutex_init(cf->log, 0);
-#endif
-
/* create and initialze the config_manager */
sm->config_manager = ngx_pcalloc(cf->pool, sizeof(SFWBConfigManager));
sfwb_config_init(sm->config_manager, cf->log);
/* look up some vars by name and cache the index numbers -- see ngx_http_variables.c */
ngx_str_t str_uri = ngx_string("request_uri"); /* the "unparsed" variant */

View File

@ -333,7 +333,7 @@ CONFIGURE_ARGS+=--with-http_addition_module
.endif
.if ${PORT_OPTIONS:MHTTP_AUTH_DIGEST}
GIT_AUTH_DIGEST_VERSION= 4edfb18
GIT_AUTH_DIGEST_VERSION= cc61b4a
GH_ACCOUNT+= atomx:auth_digest
GH_PROJECT+= nginx-http-auth-digest:auth_digest
GH_TAGNAME+= ${GIT_AUTH_DIGEST_VERSION}:auth_digest
@ -434,7 +434,7 @@ USE_HTTP_SSL= yes
.endif
.if ${PORT_OPTIONS:MECHO}
NGINX_ECHO_VERSION= 4f7aa50
NGINX_ECHO_VERSION= 46334b3
GH_ACCOUNT+= openresty:echo
GH_PROJECT+= echo-nginx-module:echo
GH_TAGNAME+= ${NGINX_ECHO_VERSION}:echo
@ -577,7 +577,7 @@ USES+= perl5
.endif
.if ${PORT_OPTIONS:MHTTP_PUSH}
GIT_PUSH_VERSION= 0.99.15
GIT_PUSH_VERSION= 0.99.16
GH_ACCOUNT+= slact:push
GH_PROJECT+= nchan:push
GH_TAGNAME+= v${GIT_PUSH_VERSION}:push
@ -755,7 +755,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_dyn_upstream}
.endif
.if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
NGINX_DEVEL_KIT_VERSION= 0.2.19
NGINX_DEVEL_KIT_VERSION= 0.3.0
GH_ACCOUNT+= simpl:devel_kit
GH_PROJECT+= ngx_devel_kit:devel_kit
GH_TAGNAME+= v${NGINX_DEVEL_KIT_VERSION}:devel_kit
@ -763,7 +763,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_devel_kit}
.endif
.if ${PORT_OPTIONS:MENCRYPTSESSION}
NGINX_ENCRYPTSESSION_VERSION= 0.03
NGINX_ENCRYPTSESSION_VERSION= 0.05
GH_ACCOUNT+= openresty:encryptsession
GH_PROJECT+= encrypted-session-nginx-module:encryptsession
GH_TAGNAME+= v${NGINX_ENCRYPTSESSION_VERSION}:encryptsession
@ -791,7 +791,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
LIB_DEPENDS+= libluajit-5.1.so:lang/luajit
CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"
NGINX_LUA_VERSION= 0.10.5
NGINX_LUA_VERSION= 0.10.6rc1
GH_ACCOUNT+= openresty:lua
GH_PROJECT+= lua-nginx-module:lua
GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua
@ -901,7 +901,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_rtmp}
.endif
.if ${PORT_OPTIONS:MSET_MISC}
NGINX_SET_MISC_VERSION= 6582fb4
NGINX_SET_MISC_VERSION= f808ef4
GH_ACCOUNT+= openresty:setmisc
GH_PROJECT+= set-misc-nginx-module:setmisc
GH_TAGNAME+= ${NGINX_SET_MISC_VERSION}:setmisc
@ -913,10 +913,10 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc}
.endif
.if ${PORT_OPTIONS:MSFLOW}
NGINX_SFLOW_VERSION= 0.9.7
MASTER_SITES+= http://nginx-sflow-module.googlecode.com/files/:sflow
DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}
NGINX_SFLOW_VERSION= 543c72a
GH_ACCOUNT+= sflow:sflow
GH_PROJECT+= nginx-sflow-module:sflow
GH_TAGNAME+= ${NGINX_SFLOW_VERSION}:sflow
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \
${PATCHDIR}/extra-patch-ngx_http_sflow_config.h \
${PATCHDIR}/extra-patch-ngx_http_sflow_module.c
@ -938,7 +938,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
.endif
.if ${PORT_OPTIONS:MSMALL_LIGHT}
NGINX_SMALL_LIGHT_VERSION= 0.6.15
NGINX_SMALL_LIGHT_VERSION= 0.8.0
LIB_DEPENDS+= libMagickCore-6.so:graphics/ImageMagick \
libMagickWand-6.so:graphics/ImageMagick \
libpcre.so:devel/pcre
@ -985,7 +985,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_xrid}
.endif
.if ${PORT_OPTIONS:MXSS}
NGINX_XSS_VERSION= 0.04
NGINX_XSS_VERSION= 0.05
GH_ACCOUNT+= openresty:xss
GH_PROJECT+= xss-nginx-module:xss
GH_TAGNAME+= v${NGINX_XSS_VERSION}:xss
@ -1064,7 +1064,7 @@ CONFIGURE_ARGS+=--with-http_ssl_module
.endif
.if ${PORT_OPTIONS:MARRAYVAR}
NGINX_ARRAYVAR_VERSION= 0.03
NGINX_ARRAYVAR_VERSION= 0.05
GH_ACCOUNT+= openresty:arrayvar
GH_PROJECT+= array-var-nginx-module:arrayvar
GH_TAGNAME+= v${NGINX_ARRAYVAR_VERSION}:arrayvar
@ -1086,7 +1086,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_brotli}
.endif
.if ${PORT_OPTIONS:MFORMINPUT}
NGINX_FORMINPUT_VERSION= 0.07
NGINX_FORMINPUT_VERSION= 0.12
GH_ACCOUNT+= calio:forminput
GH_PROJECT+= form-input-nginx-module:forminput
GH_TAGNAME+= v${NGINX_FORMINPUT_VERSION}:forminput
@ -1095,7 +1095,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_forminput}
.if ${PORT_OPTIONS:MICONV}
USES+= iconv
NGINX_ICONV_VERSION= 0.10
NGINX_ICONV_VERSION= 0.14
GH_ACCOUNT+= calio:iconv
GH_PROJECT+= iconv-nginx-module:iconv
GH_TAGNAME+= v${NGINX_ICONV_VERSION}:iconv

View File

@ -1,4 +1,4 @@
TIMESTAMP = 1470005526
TIMESTAMP = 1470533467
SHA256 (nginx-1.10.1.tar.gz) = 1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801
SIZE (nginx-1.10.1.tar.gz) = 909077
SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
@ -25,16 +25,14 @@ SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cd
SIZE (modsecurity-2.9.1.tar.gz) = 4261212
SHA256 (passenger-5.0.30.tar.gz) = f367e0c1d808d7356c3749222194a72ea03efe61a3bf1b682bd05d47f087b4e3
SIZE (passenger-5.0.30.tar.gz) = 5588130
SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659
SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284
SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393
SHA256 (atomx-nginx-http-auth-digest-4edfb18_GH0.tar.gz) = 8b831fccda3ce9bdf854a3aefa1e466a8da97ca0a5feb33a28b4f117f517b82e
SIZE (atomx-nginx-http-auth-digest-4edfb18_GH0.tar.gz) = 16007
SHA256 (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = e68b34e03516a4ab43006eb4c481d6bc5e813e0d40876359c606a26c5c68ccf6
SIZE (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = 16060
SHA256 (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = b47b23a362aa338c377d6163d15abee6f33ff16bac5f86ee4d9543293fe8c4d1
SIZE (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = 18120
SHA256 (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) = 0ec4f099e50cc12a6319e37700e71540498d354831d1f09e113ee046ee0bb7b2
@ -47,8 +45,8 @@ SHA256 (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 642ebf4724fa7c3efd5349e
SIZE (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 603856
SHA256 (grahamedgecombe-nginx-ct-f3cad5e_GH0.tar.gz) = 846e148f09ffea2ffc1b09b20c84408e23c170313f967513a85009717227c13a
SIZE (grahamedgecombe-nginx-ct-f3cad5e_GH0.tar.gz) = 5521
SHA256 (openresty-echo-nginx-module-4f7aa50_GH0.tar.gz) = 7b8bb5139001306a46f8e9ce0b7d09befff2f49741ecc6eb47299518764defcd
SIZE (openresty-echo-nginx-module-4f7aa50_GH0.tar.gz) = 52144
SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0
SIZE (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 52766
SHA256 (openresty-headers-more-nginx-module-f5559ec_GH0.tar.gz) = 422b12414a6f850cbb3ee96c225e5259eef4e949f70e63e27e6583ce3eb836ff
SIZE (openresty-headers-more-nginx-module-f5559ec_GH0.tar.gz) = 27400
SHA256 (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d
@ -63,8 +61,8 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e
SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
SHA256 (slact-nchan-v0.99.15_GH0.tar.gz) = eb43ec3ed3f088c104fdf55eb2c48e9b6867f07f54d4d6eca554dcdc1297c69b
SIZE (slact-nchan-v0.99.15_GH0.tar.gz) = 376521
SHA256 (slact-nchan-v0.99.16_GH0.tar.gz) = 200cc1b02931a067c3edb07243a7faac80265ce6aab37af680cf7373011efc41
SIZE (slact-nchan-v0.99.16_GH0.tar.gz) = 378626
SHA256 (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = a95f31e80120fd7324795b92a0d94c0b43e1265df7fd0f1eba11a337c1e0a626
SIZE (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = 175263
SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3
@ -83,18 +81,18 @@ SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec02302
SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = 59024
SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = bf60cf196c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b
SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = 10921
SHA256 (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679
SIZE (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 65029
SHA256 (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 4d0da617b3122b145dd46ec8618c6248db79c992704b23ed78e01bddf14173d3
SIZE (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 8949
SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619
SIZE (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 66455
SHA256 (openresty-encrypted-session-nginx-module-v0.05_GH0.tar.gz) = 5aea148410d647ca1d5b4e6164a19fde989a4da332fa118e003071d87bf6eae4
SIZE (openresty-encrypted-session-nginx-module-v0.05_GH0.tar.gz) = 10462
SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a
SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883
SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172
SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
SHA256 (openresty-lua-nginx-module-v0.10.5_GH0.tar.gz) = 4f0292c37ab3d7cb980c994825040be1bda2c769cbd800e79c43eb37458347d4
SIZE (openresty-lua-nginx-module-v0.10.5_GH0.tar.gz) = 579793
SHA256 (openresty-lua-nginx-module-v0.10.6rc1_GH0.tar.gz) = 86806a1893c775d813a58912b6f3b99b55efa7ab126ac5f28a57bc9a10b6044e
SIZE (openresty-lua-nginx-module-v0.10.6rc1_GH0.tar.gz) = 581366
SHA256 (openresty-memc-nginx-module-v0.16_GH0.tar.gz) = 24f3c3270831aed2d157c01ef74cb26eab26b832971fe7b9f42a03dbfac10ce4
SIZE (openresty-memc-nginx-module-v0.16_GH0.tar.gz) = 38560
SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5
@ -109,27 +107,29 @@ SHA256 (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = baf5274c815a5f27854747
SIZE (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = 28981
SHA256 (arut-nginx-rtmp-module-v1.1.8_GH0.tar.gz) = de5866111a5b18c9dfb1c10f3a0e84b56af77f7005a41807368f7769b8a50965
SIZE (arut-nginx-rtmp-module-v1.1.8_GH0.tar.gz) = 519647
SHA256 (openresty-set-misc-nginx-module-6582fb4_GH0.tar.gz) = cc325830477dfcdbb355fc7b19cbc2f4e55c179b3b56fdfe0613b5a7b926235e
SIZE (openresty-set-misc-nginx-module-6582fb4_GH0.tar.gz) = 35961
SHA256 (openresty-set-misc-nginx-module-f808ef4_GH0.tar.gz) = 5f32c484b29b9047dfa65fd3eec511c0f7c65f0f3ec0a4e0453359cf4642d405
SIZE (openresty-set-misc-nginx-module-f808ef4_GH0.tar.gz) = 29340
SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f693eb6795c6f21ae062842bf84fe762d8b842955
SIZE (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 29504
SHA256 (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = c25f284bc934f59a267d319385a3e11858efef786c84b49a77d09e7f5274bbf1
SIZE (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = 16688
SHA256 (cubicdaiya-ngx_small_light-v0.6.15_GH0.tar.gz) = 9bc9c221287a6db56a4a0eb7ac35a560fc15dfd6dafcb500fdea49a583527716
SIZE (cubicdaiya-ngx_small_light-v0.6.15_GH0.tar.gz) = 54695
SHA256 (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 8f513d6d3df32c3b05327d40e16efd020532a911d3eeca8015eb6271f2d4fd1c
SIZE (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 55918
SHA256 (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = e34b1ab5f5007661f73819f9c20fd6c2a46ed3e53364e9449b02ef2bd3628633
SIZE (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = 58777
SHA256 (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) = 4c5886edb1fbeb0b9a83c879b4be4b15a620627a18978aef636da3feafb284fe
SIZE (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) = 6636
SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = de784142d867a35ecc5443fa347c2903af0935669cdf2eaa9274f5253aac2267
SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711
SHA256 (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 4e5230a644779b8298063d5c0bd7dc19531496369456d69dc5281ae1cca4d6ec
SIZE (openresty-xss-nginx-module-v0.04_GH0.tar.gz) = 10536
SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
SHA256 (nginx-njs-f71f005_GH0.tar.gz) = d1051a0ef8e6f99b51ed02cf93d8255fad03b6de11fc5eb147c4dcb3e7094b9a
SIZE (nginx-njs-f71f005_GH0.tar.gz) = 164982
SHA256 (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = f9892ec9a2e872d8aabeb2234d0d4c66cf85b8dbb2ca5c108a20c3d8c2111189
SIZE (openresty-array-var-nginx-module-v0.03_GH0.tar.gz) = 9520
SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776
SIZE (google-ngx_brotli-ada972b_GH0.tar.gz) = 11128
SHA256 (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = c0c56cc697a290e98b88d4888bac8828041ef6f3049247d3cd3c63f2808d1e20
SIZE (calio-form-input-nginx-module-v0.07_GH0.tar.gz) = 10563
SHA256 (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 88e326eba7fdf9fd2376b1ba033b48cb0eee45136528cf5430ac9340088ce324
SIZE (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 12513
SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133

View File

@ -1,5 +1,5 @@
--- ../iconv-nginx-module-0.10/config.orig 2013-04-16 17:57:17.000000000 -0700
+++ ../iconv-nginx-module-0.10/config 2013-05-01 17:16:28.134624745 -0700
--- ../iconv-nginx-module-0.14/config.orig 2013-04-16 17:57:17.000000000 -0700
+++ ../iconv-nginx-module-0.14/config 2013-05-01 17:16:28.134624745 -0700
@@ -39,12 +39,12 @@
fi

View File

@ -1,5 +1,5 @@
--- ../nginx-sflow-module-0.9.7/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400
+++ ../nginx-sflow-module-0.9.7/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400
--- ../nginx-sflow-module-543c72a/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400
+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400
@@ -26,7 +26,6 @@
ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() failed: %s", gai_strerror(err));
switch(err) {

View File

@ -1,5 +1,5 @@
--- ../nginx-sflow-module-0.9.7/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400
+++ ../nginx-sflow-module-0.9.7/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400
--- ../nginx-sflow-module-543c72a/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400
+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400
@@ -17,7 +17,7 @@
-----------------___________________________------------------
*/

View File

@ -1,17 +1,16 @@
--- ../nginx-sflow-module-0.9.7/ngx_http_sflow_module.c.orig 2015-04-21 21:21:17.020547000 +0300
+++ ../nginx-sflow-module-0.9.7/ngx_http_sflow_module.c 2015-04-21 21:22:26.994714000 +0300
@@ -8,10 +8,6 @@
--- ../nginx-sflow-module-543c72a/ngx_http_sflow_module.c.orig 2014-09-24 18:20:41.000000000 -0400
+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_module.c 2016-08-06 21:26:24.515559000 -0400
@@ -8,9 +8,6 @@
#include <ngx_http.h>
#include <nginx.h>
-#if (NGX_THREADS)
-#include <ngx_thread.h>
-#endif
-
#include "ngx_http_sflow_api.h"
#include "ngx_http_sflow_config.h"
@@ -42,18 +38,10 @@
@@ -74,18 +71,10 @@
/* keep log ptr for callbacks */
ngx_log_t *log;
@ -28,12 +27,12 @@
#define SFWB_COUNTDOWN(_c) (--(_c) == 0)
-#endif
/* delegate acquiring the sflow config */
SFWBConfigManager *config_manager;
@@ -411,13 +399,8 @@
static int32_t ngx_http_sflow_add_random_skip(SFWB *sm)
/* skip countdown is handled per-worker to reduce lock contention.
* If all processes sample at 1:N it's the same as having only one
@@ -645,13 +634,8 @@
{
ngx_atomic_t next_skip = sfl_sampler_next_skip(sm->sampler);
sm->random_seed = ((sm->random_seed * 32719) + 3) % 32749;
ngx_atomic_t next_skip = (sm->random_seed % ((2 * sm->sampling_rate) - 1)) + 1;
-#if (NGX_THREADS)
- ngx_atomic_int_t test_skip = ngx_atomic_fetch_add(&sm->sflow_skip, next_skip);
- return (test_skip + next_skip);
@ -44,17 +43,17 @@
}
/*_________________---------------------------__________________
@@ -528,13 +511,6 @@
/* a pool to use for the agent so we can recycle the memory easily on a config change */
sm->masterPool = ngx_create_pool(SFWB_POOL_SIZ, cf->log);
@@ -864,13 +848,6 @@
{
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "sflow: sfwb_init()");
-#if (NGX_THREADS)
- /* a mutex to lock the sFlow agent when taking a sample (only needed if there
- is more that one worker thread - right now it seems like threads are not even
- an option in the configure script) */
- * is more that one worker thread - right now it seems like threads are not even
- * an option in the configure script)
- */
- sm->mut = ngx_mutex_init(cf->log, 0);
-#endif
-
/* create and initialze the config_manager */
sm->config_manager = ngx_pcalloc(cf->pool, sizeof(SFWBConfigManager));
sfwb_config_init(sm->config_manager, cf->log);
/* look up some vars by name and cache the index numbers -- see ngx_http_variables.c */
ngx_str_t str_uri = ngx_string("request_uri"); /* the "unparsed" variant */