Date: Tue, 5 Dec 2017 03:17:30 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455563 - in head/www/nginx-devel: . files Message-ID: <201712050317.vB53HUpY057213@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue Dec 5 03:17:30 2017 New Revision: 455563 URL: https://svnweb.freebsd.org/changeset/ports/455563 Log: Upgrade next third-party modules to their recent versions: o) njs; o) echo; o) lua; o) nchan; o) redis2; o) srcache; o) tarantul; o) vod. Remove needless patches cause most of them have been added to their upstreams. Deleted: head/www/nginx-devel/files/extra-patch-ngx_http_echo_request_info.c head/www/nginx-devel/files/extra-patch-ngx_http_lua_common.h head/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.c head/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.h head/www/nginx-devel/files/extra-patch-ngx_http_lua_ssl_ocsp.c head/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Dec 5 03:03:38 2017 (r455562) +++ head/www/nginx-devel/Makefile Tue Dec 5 03:17:30 2017 (r455563) @@ -457,7 +457,7 @@ IGNORE= CT option requires OpenSSL 1.0.2, add DEFAULT .endif .if ${PORT_OPTIONS:MECHO} -NGINX_ECHO_VERSION= 46334b3 +NGINX_ECHO_VERSION= d95da35 GH_ACCOUNT+= openresty:echo GH_PROJECT+= echo-nginx-module:echo GH_TAGNAME+= ${NGINX_ECHO_VERSION}:echo @@ -466,7 +466,6 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_echo} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_echo} .endif -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c .endif .if ${PORT_OPTIONS:MFASTDFS} @@ -635,7 +634,7 @@ USES+= perl5 .endif .if ${PORT_OPTIONS:MHTTP_PUSH} -GIT_PUSH_VERSION= 0.99.16 +GIT_PUSH_VERSION= 1.1.13 GH_ACCOUNT+= slact:push GH_PROJECT+= nchan:push GH_TAGNAME+= v${GIT_PUSH_VERSION}:push @@ -689,7 +688,7 @@ LIB_DEPENDS+= libmsgpuck.so:devel/msgpuck \ libyajl.so:devel/yajl GH_ACCOUNT+= tarantool:nginx_tarantool GH_PROJECT+= nginx_upstream_module:nginx_tarantool -GH_TAGNAME+= 1278ee5:nginx_tarantool +GH_TAGNAME+= 4ca8684:nginx_tarantool .if ${PORT_OPTIONS:MDSO} CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool} .else @@ -857,7 +856,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.8 +NGINX_LUA_VERSION= 0.10.11 GH_ACCOUNT+= openresty:lua GH_PROJECT+= lua-nginx-module:lua GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua @@ -866,11 +865,6 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_lua} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_lua} .endif -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_common.h \ - ${PATCHDIR}/extra-patch-ngx_http_lua_headers.c \ - ${PATCHDIR}/extra-patch-ngx_http_lua_headers.h \ - ${PATCHDIR}/extra-patch-ngx_http_lua_module.c \ - ${PATCHDIR}/extra-patch-ngx_http_lua_ssl_ocsp.c .endif .if ${PORT_OPTIONS:MMEMC} @@ -963,12 +957,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_rdsjson} .endif .if ${PORT_OPTIONS:MREDIS2} -NGINX_REDIS2_VERSION= 0.12 +NGINX_REDIS2_VERSION= 0.14 GH_ACCOUNT+= openresty:redis2 GH_PROJECT+= redis2-nginx-module:redis2 GH_TAGNAME+= v${NGINX_REDIS2_VERSION}:redis2 CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_redis2_util.c .endif .if ${PORT_OPTIONS:MRTMP} @@ -1031,7 +1024,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_small_light} .endif .if ${PORT_OPTIONS:MSRCACHE} -NGINX_SRCACHE_VERSION= 0.30 +NGINX_SRCACHE_VERSION= 0.31 GH_ACCOUNT+= openresty:srcache GH_PROJECT+= srcache-nginx-module:srcache GH_TAGNAME+= v${NGINX_SRCACHE_VERSION}:srcache @@ -1039,7 +1032,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache} .endif .if ${PORT_OPTIONS:MVOD} -NGINX_VOD_VERSION= 1.18 +NGINX_VOD_VERSION= 1.22 GH_ACCOUNT+= kaltura:vod GH_PROJECT+= nginx-vod-module:vod GH_TAGNAME+= ${NGINX_VOD_VERSION}:vod @@ -1067,7 +1060,7 @@ CONFIGURE_ARGS+=--with-http_v2_module .if ${PORT_OPTIONS:MNJS} GH_ACCOUNT+= nginx:njs GH_PROJECT+= njs:njs -GH_TAGNAME+= bd40aea:njs +GH_TAGNAME+= 4ed8a0b:njs .if ${PORT_OPTIONS:MDSO} CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx .else Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Dec 5 03:03:38 2017 (r455562) +++ head/www/nginx-devel/distinfo Tue Dec 5 03:17:30 2017 (r455563) @@ -1,4 +1,4 @@ -TIMESTAMP = 1512438369 +TIMESTAMP = 1512443241 SHA256 (nginx-1.13.7.tar.gz) = beb732bc7da80948c43fd0bf94940a21a21b1c1ddfba0bd99a4b88e026220f5c SIZE (nginx-1.13.7.tar.gz) = 990836 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -37,8 +37,8 @@ SHA256 (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) SIZE (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = 602064 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844 -SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0 -SIZE (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 52766 +SHA256 (openresty-echo-nginx-module-d95da35_GH0.tar.gz) = d1cd947c9ab3174857781e7e8a481125e3f05596be76a6114ba4a6e19ee5e902 +SIZE (openresty-echo-nginx-module-d95da35_GH0.tar.gz) = 53162 SHA256 (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 58daa08a5ab9b9de5459817fc088230f4092fb818b87a2cb61b217952a5af54d SIZE (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 17980 SHA256 (openresty-headers-more-nginx-module-84241e4_GH0.tar.gz) = d3442be9058682ed0ad1d294ab27effcb245c0a320fcf418c452dc923f714531 @@ -57,14 +57,14 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f 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.16_GH0.tar.gz) = 200cc1b02931a067c3edb07243a7faac80265ce6aab37af680cf7373011efc41 -SIZE (slact-nchan-v0.99.16_GH0.tar.gz) = 378626 +SHA256 (slact-nchan-v1.1.13_GH0.tar.gz) = 8e869ea92fd885f5d9755f926e809ee81ca21967044b98e9932a8eb661d91709 +SIZE (slact-nchan-v1.1.13_GH0.tar.gz) = 629850 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 SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230 -SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a -SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 +SHA256 (tarantool-nginx_upstream_module-4ca8684_GH0.tar.gz) = e1ce39052f2df4972dc7ce827a3ff774660586955c5894cf38997c6f687d8fa4 +SIZE (tarantool-nginx_upstream_module-4ca8684_GH0.tar.gz) = 59005 SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 @@ -91,8 +91,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 55 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.8_GH0.tar.gz) = d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd -SIZE (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = 606643 +SHA256 (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = c0fb91fcfd1c6e7dec34ca64826ef81ffebafdef6174d254467636f380566626 +SIZE (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = 616653 SHA256 (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d SIZE (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 37113 SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 @@ -103,8 +103,8 @@ SHA256 (openresty-rds-csv-nginx-module-v0.07_GH0.tar.g SIZE (openresty-rds-csv-nginx-module-v0.07_GH0.tar.gz) = 19444 SHA256 (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 99aedf222a9664484918392988cce41b1a6238240d42f8bd44f5ff102c05c36c SIZE (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 33496 -SHA256 (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = baf5274c815a5f27854747df09ff5bcd6d82e0baa2f224a9db6450d2f3a35a4f -SIZE (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = 28981 +SHA256 (openresty-redis2-nginx-module-v0.14_GH0.tar.gz) = d830e072fcb4acee8490ba3e38eee6034fd884a954d17ad4efeb397032c58a71 +SIZE (openresty-redis2-nginx-module-v0.14_GH0.tar.gz) = 27924 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-f808ef4_GH0.tar.gz) = 5f32c484b29b9047dfa65fd3eec511c0f7c65f0f3ec0a4e0453359cf4642d405 @@ -115,14 +115,14 @@ SHA256 (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.t SIZE (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = 16688 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 (kaltura-nginx-vod-module-1.18_GH0.tar.gz) = cba0673725f66279671d9dc0ac7bea6ea78cf963ce1b6582320d10a857a818d3 -SIZE (kaltura-nginx-vod-module-1.18_GH0.tar.gz) = 388548 +SHA256 (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 3f9729e73a8340926fa9d9fc15707c2f287cd27b6a9fe42e83f660ca48a5972d +SIZE (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 48310 +SHA256 (kaltura-nginx-vod-module-1.22_GH0.tar.gz) = 79214a1c2f9b133e039ae78d6a09635ad2bec183c77e2a32bf03003841b3c35b +SIZE (kaltura-nginx-vod-module-1.22_GH0.tar.gz) = 438203 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-bd40aea_GH0.tar.gz) = 0fea9022d79db2b74d2da1b44f6366a3c60fe47475b77a80c506ef02ad976151 -SIZE (nginx-njs-bd40aea_GH0.tar.gz) = 203897 +SHA256 (nginx-njs-4ed8a0b_GH0.tar.gz) = 44cd86b48bf6a65e6faf76b59cbf75b6317d62d33081671d192632baaf43f165 +SIZE (nginx-njs-4ed8a0b_GH0.tar.gz) = 229162 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 (eustas-ngx_brotli-14dede1_GH0.tar.gz) = 655e47be5d947b105b7fd53303c5a94b78e9c8ed9cd96fc786cedc7445fbf539 Modified: head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config ============================================================================== --- head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config Tue Dec 5 03:03:38 2017 (r455562) +++ head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config Tue Dec 5 03:17:30 2017 (r455563) @@ -1,20 +1,24 @@ ---- ../nginx_upstream_module-1278ee5/config.orig 2016-08-07 15:39:47.000000000 -0400 -+++ ../nginx_upstream_module-1278ee5/config 2016-08-07 16:38:59.298414000 -0400 -@@ -1,14 +1,14 @@ - ngx_addon_name="ngx_http_tnt_module" - --__lib_yajl="$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a" -+__lib_yajl="%%PREFIX%%/lib/libyajl.so" - - __module_src_dir="$ngx_addon_dir/src" - - __include_paths=" \ - $ngx_addon_dir/src \ +--- ../nginx_upstream_module-4ca8684/config.orig 2017-09-18 11:54:00.000000000 -0400 ++++ ../nginx_upstream_module-4ca8684/config 2017-12-04 21:56:41.978227000 -0500 +@@ -7,18 +7,10 @@ $ngx_addon_dir/third_party \ + " + +-test -f $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a && +-test -f $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a && { +- libs=" \ +- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \ +- $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a \ +- " +- +- include_paths="${include_paths} \ - $ngx_addon_dir/third_party/msgpuck \ - $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \ ++include_paths="${include_paths} \ + %%PREFIX%%/include/msgpuck \ + %%PREFIX%%/include/yajl \ " +-} - __sources=" \ + module_src_dir="$ngx_addon_dir/src" +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712050317.vB53HUpY057213>