Date: Tue, 2 Jun 2020 18:11:21 +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: r537565 - in head/www/nginx-devel: . files Message-ID: <202006021811.052IBLjJ056698@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue Jun 2 18:11:21 2020 New Revision: 537565 URL: https://svnweb.freebsd.org/changeset/ports/537565 Log: Merge r537527 and r537550 from www/nginx: 1. Switch with the nginx-upload-module to fdintino, they support http/2: https://github.com/fdintino/nginx-upload-module/. 2. Update 3rd party module nginx-link-function to 3.2.2. Bump PORTREVISION. PR: 246746 [1] 246897 [2] Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-nginx-link-function-config head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Jun 2 18:10:52 2020 (r537564) +++ head/www/nginx-devel/Makefile Tue Jun 2 18:11:21 2020 (r537565) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.19.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Jun 2 18:10:52 2020 (r537564) +++ head/www/nginx-devel/Makefile.extmod Tue Jun 2 18:11:21 2020 (r537565) @@ -157,7 +157,7 @@ HTTP_TARANTOOL_GH_TUPLE= tarantool:nginx_upstream_modu HTTP_TARANTOOL_VARS= DSO_EXTMODS+=nginx_tarantool HTTP_TARANTOOL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config -HTTP_UPLOAD_GH_TUPLE= Austinb:nginx-upload-module:72ec037:upload +HTTP_UPLOAD_GH_TUPLE= fdintino:nginx-upload-module:aa42509:upload HTTP_UPLOAD_VARS= DSO_EXTMODS+=upload HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:afb2d31:uploadprogress @@ -207,7 +207,7 @@ LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/lua LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.15:lua LUA_VARS= DSO_EXTMODS+=lua -LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.1:link +LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.2:link LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \ ${PATCHDIR}/extra-patch-ngx_link_func_module.c LINK_VARS= DSO_EXTMODS+=link Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Jun 2 18:10:52 2020 (r537564) +++ head/www/nginx-devel/distinfo Tue Jun 2 18:11:21 2020 (r537565) @@ -1,4 +1,4 @@ -TIMESTAMP = 1590505781 +TIMESTAMP = 1591120787 SHA256 (nginx-1.19.0.tar.gz) = 44a616171fcd7d7ad7c6af3e6f3ad0879b54db5a5d21be874cd458b5691e36c8 SIZE (nginx-1.19.0.tar.gz) = 1043748 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -81,8 +81,8 @@ SHA256 (yaoweibin-ngx_http_substitutions_filter_module SIZE (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 94039 SHA256 (tarantool-nginx_upstream_module-27836e4_GH0.tar.gz) = c098747380444ddc9cf428010578bc6ef70b8c3a77a801c9e01617b05462e57b SIZE (tarantool-nginx_upstream_module-27836e4_GH0.tar.gz) = 74010 -SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd -SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303 +SHA256 (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 2285245bdef11656e5bcc866e693e48f84b7443d36924f45a6fb8647cd35319a +SIZE (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 42221 SHA256 (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 6318851cc3a624aaad3b1f4cd9f51f79c86575c53dfe0c28bbdcf9470b6a33e6 SIZE (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 17269 SHA256 (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 4404c64e845e19feeb07a37976347987892a8e8680a961f793ff0d3ef96c07f4 @@ -99,8 +99,8 @@ SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050 SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617 -SHA256 (Taymindis-nginx-link-function-3.2.1_GH0.tar.gz) = d5460002dcda8e67a10027866255842a064225bb1dbcddb2db8cb18bb3fa511a -SIZE (Taymindis-nginx-link-function-3.2.1_GH0.tar.gz) = 127676 +SHA256 (Taymindis-nginx-link-function-3.2.2_GH0.tar.gz) = ef6c17bad33af15d816e21a3c82a5feb8769564e6b52c10384cffd35f757ee5d +SIZE (Taymindis-nginx-link-function-3.2.2_GH0.tar.gz) = 145304 SHA256 (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 7d5f3439c8df56046d0564b5857fd8a30296ab1bd6df0f048aed7afb56a0a4c2 SIZE (openresty-lua-nginx-module-v0.10.15_GH0.tar.gz) = 655110 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 Modified: head/www/nginx-devel/files/extra-patch-nginx-link-function-config ============================================================================== --- head/www/nginx-devel/files/extra-patch-nginx-link-function-config Tue Jun 2 18:10:52 2020 (r537564) +++ head/www/nginx-devel/files/extra-patch-nginx-link-function-config Tue Jun 2 18:11:21 2020 (r537565) @@ -1,5 +1,5 @@ ---- ../nginx-link-function-3.2.1/config.orig 2019-02-22 21:19:02.000000000 -0500 -+++ ../nginx-link-function-3.2.1/config 2020-01-24 10:29:53.871805000 -0500 +--- ../nginx-link-function-3.2.2/config.orig 2019-02-22 21:19:02.000000000 -0500 ++++ ../nginx-link-function-3.2.2/config 2020-01-24 10:29:53.871805000 -0500 @@ -15,24 +15,6 @@ #echo "#define NGINX_HTTP_HTTP_LINK_FUNC_VERSION \""$HTTP_LINK_FUNC_VERSION"\"" > $NGX_OBJS/ngx_vod_version.h Modified: head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c ============================================================================== --- head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c Tue Jun 2 18:10:52 2020 (r537564) +++ head/www/nginx-devel/files/extra-patch-ngx_link_func_module.c Tue Jun 2 18:11:21 2020 (r537565) @@ -1,5 +1,5 @@ ---- ../nginx-link-function-3.2.1/src/ngx_link_func_module.c.orig 2020-01-24 10:32:50.550797000 -0500 -+++ ../nginx-link-function-3.2.1/src/ngx_link_func_module.c 2020-01-24 10:33:17.135348000 -0500 +--- ../nginx-link-function-3.2.2/src/ngx_link_func_module.c.orig 2020-01-24 10:32:50.550797000 -0500 ++++ ../nginx-link-function-3.2.2/src/ngx_link_func_module.c 2020-01-24 10:33:17.135348000 -0500 @@ -35,7 +35,7 @@ #include <ngx_config.h> #include <ngx_core.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006021811.052IBLjJ056698>