Date: Wed, 24 Jan 2018 17:54:43 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459848 - in head/www/nginx: . files Message-ID: <201801241754.w0OHshY6063290@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Wed Jan 24 17:54:43 2018 New Revision: 459848 URL: https://svnweb.freebsd.org/changeset/ports/459848 Log: ModSecurity: back to 2.9.1 Tarantool back to 1278ee5 Drizzle back to 0.1.9 Dynamic Upstream back to 0.1.3 - fix patches for fastdfs - remove needless patch Approved by: tz (mentor) Differential Revision: https://reviews.freebsd.org/D14007 Deleted: head/www/nginx/files/extra-patch-ngx_http_lua_common.h head/www/nginx/files/extra-patch-ngx_http_lua_headers.c head/www/nginx/files/extra-patch-ngx_http_lua_headers.h head/www/nginx/files/extra-patch-ngx_http_lua_module.c head/www/nginx/files/extra-patch-ngx_http_lua_ssl_ocsp.c head/www/nginx/files/extra-patch-ngx_http_redis2_util.c Modified: head/www/nginx/Makefile head/www/nginx/distinfo head/www/nginx/files/extra-patch-fastdfs-src-config head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Wed Jan 24 17:29:57 2018 (r459847) +++ head/www/nginx/Makefile Wed Jan 24 17:54:43 2018 (r459848) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.12.2 -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -695,13 +695,13 @@ LIB_DEPENDS+= libmsgpuck.so:devel/msgpuck \ libyajl.so:devel/yajl GH_ACCOUNT+= tarantool:nginx_tarantool GH_PROJECT+= nginx_upstream_module:nginx_tarantool -GH_TAGNAME+= 9e38881:nginx_tarantool +GH_TAGNAME+= 1278ee5:nginx_tarantool .if ${PORT_OPTIONS:MDSO} CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool} .endif -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config .endif .if ${PORT_OPTIONS:MHTTP_SECURE_LINK} @@ -804,7 +804,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX LIB_DEPENDS+= libdrizzle.so:databases/libdrizzle CONFIGURE_ENV+= "LIBDRIZZLE_INC=${LOCALBASE}/include" CONFIGURE_ENV+= "LIBDRIZZLE_LIB=${LOCALBASE}/lib" -NGINX_DRIZZLE_VERSION= 0.1.10 +NGINX_DRIZZLE_VERSION= 0.1.9 GH_ACCOUNT+= openresty:drizzle GH_PROJECT+= drizzle-nginx-module:drizzle GH_TAGNAME+= v${NGINX_DRIZZLE_VERSION}:drizzle @@ -814,7 +814,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-driz .endif .if ${PORT_OPTIONS:MDYNAMIC_UPSTREAM} -NGINX_DYNAMIC_UPSTREAM_VERSION= 0.1.6 +NGINX_DYNAMIC_UPSTREAM_VERSION= 0.1.3 GH_ACCOUNT+= cubicdaiya:dyn_upstream GH_PROJECT+= ngx_dynamic_upstream:dyn_upstream GH_TAGNAME+= v${NGINX_DYNAMIC_UPSTREAM_VERSION}:dyn_upstream @@ -844,7 +844,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_encryptsession} .if ${PORT_OPTIONS:MGRIDFS} NGINX_GRIDFS_VERSION= 0.8 -MONGO_C_DRIVER_VERSION= 0.4 +MONGO_C_DRIVER_VERSION= 0.3.1 GH_ACCOUNT+= mdirolf:gridfs mongodb:mongo_c GH_PROJECT+= nginx-gridfs:gridfs mongo-c-driver:mongo_c GH_TAGNAME+= v${NGINX_GRIDFS_VERSION}:gridfs v${MONGO_C_DRIVER_VERSION}:mongo_c @@ -872,11 +872,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} @@ -892,7 +887,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_memc} .endif .if ${PORT_OPTIONS:MMODSECURITY} -NGINX_MODSECURITY_VERSION= 3.0.0 +NGINX_MODSECURITY_VERSION= 2.9.1 LIB_DEPENDS+= libapr-1.so:devel/apr1 \ libcurl.so:ftp/curl \ libluajit-5.1.so:lang/luajit \ @@ -980,7 +975,6 @@ 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} @@ -1004,7 +998,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc} .endif .if ${PORT_OPTIONS:MSFLOW} -NGINX_SFLOW_VERSION= f15c87f +NGINX_SFLOW_VERSION= 543c72a GH_ACCOUNT+= sflow:sflow GH_PROJECT+= nginx-sflow-module:sflow GH_TAGNAME+= ${NGINX_SFLOW_VERSION}:sflow Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Wed Jan 24 17:29:57 2018 (r459847) +++ head/www/nginx/distinfo Wed Jan 24 17:54:43 2018 (r459848) @@ -1,4 +1,4 @@ -TIMESTAMP = 1516399275 +TIMESTAMP = 1516812661 SHA256 (nginx-1.12.2.tar.gz) = 305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416 SIZE (nginx-1.12.2.tar.gz) = 981687 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053 SIZE (ngx_http_response-0.3.tar.gz) = 2244 SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90 SIZE (08a395c66e42.tar.gz) = 120603 -SHA256 (modsecurity-3.0.0.tar.gz) = 51e288999c5903f4062afdca37a602c7ba14242120ba54cf22f90650b646d4dc -SIZE (modsecurity-3.0.0.tar.gz) = 5591 +SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 +SIZE (modsecurity-2.9.1.tar.gz) = 4261212 SHA256 (passenger-5.1.12.tar.gz) = 1705bd6d1f9b9d055fb58b3545ca6f38ca6d222c07201f53c5014e0eb09f4495 SIZE (passenger-5.1.12.tar.gz) = 4245993 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 @@ -63,8 +63,8 @@ SHA256 (wandenberg-nginx-push-stream-module-0.5.4_GH0. SIZE (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 183493 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-9e38881_GH0.tar.gz) = d4fba33c831a41af58da38b1b9c3a0c638cc9e7265c26c2041055803dda7752e -SIZE (tarantool-nginx_upstream_module-9e38881_GH0.tar.gz) = 73713 +SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a +SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 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.2_GH0.tar.gz) = b286689355442657650421d8e8398bd4abf9dbbaade65947bb0cb74a349cc497 @@ -77,18 +77,18 @@ SHA256 (wandenberg-nginx-video-thumbextractor-module-0 SIZE (wandenberg-nginx-video-thumbextractor-module-0.9.0_GH0.tar.gz) = 2709894 SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 0d780e6fef91814fbaa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44 SIZE (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 26125 -SHA256 (openresty-drizzle-nginx-module-v0.1.10_GH0.tar.gz) = 4033b9af73241a695ff07162969ea2212f5401dd484f204b8e3e50f488f84a94 -SIZE (openresty-drizzle-nginx-module-v0.1.10_GH0.tar.gz) = 50674 -SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 056fcd63cab39c2f0144d6a8c3ce16e8ae2cfb6e02ad66e5972ffeeca6c6a4d3 -SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.6_GH0.tar.gz) = 11015 +SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec023025333c34d6d0108026a1ce2e09b20a53e8e2d9bf65080 +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.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.07_GH0.tar.gz) = ab7b20be9f32da846f5c380677f7bc1dff0b93ce02c06bf584cd45709896ad66 SIZE (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = 11139 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.4_GH0.tar.gz) = 5bddb502be7d743c0e67617ff06088e49a3d5ed2bcccbf6a2c49b39f2177d389 -SIZE (mongodb-mongo-c-driver-v0.4_GH0.tar.gz) = 76430 +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.11_GH0.tar.gz) = c0fb91fcfd1c6e7dec34ca64826ef81ffebafdef6174d254467636f380566626 @@ -109,8 +109,8 @@ SHA256 (arut-nginx-rtmp-module-v1.2.1_GH0.tar.gz) = 87 SIZE (arut-nginx-rtmp-module-v1.2.1_GH0.tar.gz) = 519919 SHA256 (openresty-set-misc-nginx-module-cda7e50_GH0.tar.gz) = 6fb2c99d4aecdd0335f55493b0dd4170efa46b0014a4c2e41f2ea519b633aca2 SIZE (openresty-set-misc-nginx-module-cda7e50_GH0.tar.gz) = 29291 -SHA256 (sflow-nginx-sflow-module-f15c87f_GH0.tar.gz) = 251de3a5b588a4721effe88f3dbc632706321b7cd1af5fae7aa4f38ca50d2637 -SIZE (sflow-nginx-sflow-module-f15c87f_GH0.tar.gz) = 29515 +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-f07bf3c_GH0.tar.gz) = db0c244fbd553846539e4020c5131e2c99700cddc0e5664aac0b807733607b05 SIZE (nginx-shib-nginx-http-shibboleth-f07bf3c_GH0.tar.gz) = 22177 SHA256 (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 4cf660651d11330a13aab29eb1722bf792d7c3c42e2919a36a1957c4ed0f1533 Modified: head/www/nginx/files/extra-patch-fastdfs-src-config ============================================================================== --- head/www/nginx/files/extra-patch-fastdfs-src-config Wed Jan 24 17:29:57 2018 (r459847) +++ head/www/nginx/files/extra-patch-fastdfs-src-config Wed Jan 24 17:54:43 2018 (r459848) @@ -1,5 +1,5 @@ ---- ../fastdfs-nginx-module-5a8110f/src/config.orig 2016-10-12 16:09:34.075804000 +0200 -+++ ../fastdfs-nginx-module-5a8110f/src/config 2016-10-12 16:10:43.916280000 +0200 +--- ../fastdfs-nginx-module-85347be/src/config.orig 2016-10-12 16:09:34.075804000 +0200 ++++ ../fastdfs-nginx-module-85347be/src/config 2016-10-12 16:10:43.916280000 +0200 @@ -3,16 +3,16 @@ if test -n "${ngx_module_link}"; then ngx_module_type=HTTP Modified: head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf ============================================================================== --- head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Wed Jan 24 17:29:57 2018 (r459847) +++ head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Wed Jan 24 17:54:43 2018 (r459848) @@ -1,5 +1,5 @@ ---- ../fastdfs-nginx-module-5a8110f/src/mod_fastdfs.conf.orig 2017-09-05 14:19:44.560907000 +0200 -+++ ../fastdfs-nginx-module-5a8110f/src/mod_fastdfs.conf 2017-09-05 14:24:43.475900000 +0200 +--- ../fastdfs-nginx-module-85347be/src/mod_fastdfs.conf.orig 2017-09-05 14:19:44.560907000 +0200 ++++ ../fastdfs-nginx-module-85347be/src/mod_fastdfs.conf 2017-09-05 14:24:43.475900000 +0200 @@ -59,8 +59,8 @@ # store_path#, based 0, if store_path0 not exists, it's value is base_path # the paths must be exist
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801241754.w0OHshY6063290>