Date: Fri, 16 Oct 2020 17:04:55 +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: r552517 - in head/www/nginx: . files Message-ID: <202010161704.09GH4tXs084216@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Fri Oct 16 17:04:55 2020 New Revision: 552517 URL: https://svnweb.freebsd.org/changeset/ports/552517 Log: merge from r545785 Update third-party dynamic_upstream module. Add third-party dynamic_healthcheck module. Sponsored by: Netzkommune GmbH Added: head/www/nginx/files/extra-patch-ngx_dynamic_healthcheck-config (contents, props changed) Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/Makefile.options.desc head/www/nginx/distinfo head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Fri Oct 16 15:51:30 2020 (r552516) +++ head/www/nginx/Makefile Fri Oct 16 17:04:55 2020 (r552517) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 26 +PORTREVISION?= 27 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -79,7 +79,7 @@ OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDI STREAM STREAM_SSL STREAM_SSL_PREREAD # External modules (arrayvar MUST appear after devel_kit for build-dep) OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \ - ARRAYVAR DRIZZLE DYNAMIC_TLS DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \ + ARRAYVAR DRIZZLE DYNAMIC_TLS DYNAMIC_HC DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \ FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE \ HTTP_AUTH_DIGEST HTTP_AUTH_JWT HTTP_AUTH_KRB5 HTTP_AUTH_LDAP \ HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX HTTP_FOOTER \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Fri Oct 16 15:51:30 2020 (r552516) +++ head/www/nginx/Makefile.extmod Fri Oct 16 17:04:55 2020 (r552517) @@ -39,8 +39,13 @@ DRIZZLE_VARS= DSO_EXTMODS+=drizzle DYNAMIC_TLS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-dynamic_tls_records -DYNAMIC_UPSTREAM_GH_TUPLE= cubicdaiya:ngx_dynamic_upstream:cc5dac3:dynamic_upstream +DYNAMIC_UPSTREAM_GH_TUPLE= ZigzagAK:ngx_dynamic_upstream:960eef2:dynamic_upstream DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream + +DYNAMIC_HC_GH_TUPLE= ZigzagAK:ngx_dynamic_healthcheck:61acf02:dynamic_hc +DYNAMIC_HC_VARS= DSO_EXTMODS+=dynamic_hc +DYNAMIC_HC_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_dynamic_healthcheck-config +DYNAMIC_HC_IMPLIES= DYNAMIC_UPSTREAM DEVEL_KIT_GH_TUPLE= simpl:ngx_devel_kit:v0.3.1:devel_kit DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit Modified: head/www/nginx/Makefile.options.desc ============================================================================== --- head/www/nginx/Makefile.options.desc Fri Oct 16 15:51:30 2020 (r552516) +++ head/www/nginx/Makefile.options.desc Fri Oct 16 17:04:55 2020 (r552517) @@ -13,6 +13,7 @@ DEVEL_KIT_DESC= 3rd party Nginx Development Kit modu DRIZZLE_DESC= 3rd party drizzle module DSO_DESC= Enable dynamic modules support DYNAMIC_TLS_DESC= 3rd party dynamic tls records patch +DYNAMIC_HC_DESC= 3rd party dynamic_healthcheck module DYNAMIC_UPSTREAM_DESC= 3rd party dynamic_upstream module ECHO_DESC= 3rd party echo module ENCRYPTSESSION_DESC= 3rd party encrypted_session module Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Fri Oct 16 15:51:30 2020 (r552516) +++ head/www/nginx/distinfo Fri Oct 16 17:04:55 2020 (r552517) @@ -1,4 +1,4 @@ -TIMESTAMP = 1602111220 +TIMESTAMP = 1602864380 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SIZE (nginx-1.18.0.tar.gz) = 1039530 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -29,8 +29,10 @@ SHA256 (simpl-ngx_devel_kit-v0.3.1_GH0.tar.gz) = 0e971 SIZE (simpl-ngx_devel_kit-v0.3.1_GH0.tar.gz) = 66542 SHA256 (openresty-drizzle-nginx-module-v0.1.11_GH0.tar.gz) = a2f62c418078fe1271fcf68bbdf28164ae06885f17a2b4941fbf766f3ccf4a4f SIZE (openresty-drizzle-nginx-module-v0.1.11_GH0.tar.gz) = 50864 -SHA256 (cubicdaiya-ngx_dynamic_upstream-cc5dac3_GH0.tar.gz) = ab940f76b02d77a5cf59bed3fbd3d0ace51d51ba7a8bf1ab3447b14982e92aeb -SIZE (cubicdaiya-ngx_dynamic_upstream-cc5dac3_GH0.tar.gz) = 11009 +SHA256 (ZigzagAK-ngx_dynamic_healthcheck-61acf02_GH0.tar.gz) = 9a6ac88bcb85cd76e56ce03cf074a78b600cc787642379f76410e78326aca5aa +SIZE (ZigzagAK-ngx_dynamic_healthcheck-61acf02_GH0.tar.gz) = 49810 +SHA256 (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 86e7c6ed6dba2d4c5f5b87ecb91f25ccdb7a08b8a88236e632114f830b9e354b +SIZE (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 23003 SHA256 (openresty-echo-nginx-module-996412d_GH0.tar.gz) = 07074c1859a0e6e5bee129fd2b2938c44ac3de198b51472a64f07243474fdf53 SIZE (openresty-echo-nginx-module-996412d_GH0.tar.gz) = 53347 SHA256 (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 6e526ea097c6805ec2cf1d0d3d79ed24326bc2d0babe158c29edd07d8c0d106a Added: head/www/nginx/files/extra-patch-ngx_dynamic_healthcheck-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ngx_dynamic_healthcheck-config Fri Oct 16 17:04:55 2020 (r552517) @@ -0,0 +1,11 @@ +--- ../ngx_dynamic_healthcheck-61acf02/config.orig 2020-08-22 16:35:36.127913000 -0400 ++++ ../ngx_dynamic_healthcheck-61acf02/config 2020-08-22 16:39:36.187267000 -0400 +@@ -31,7 +31,7 @@ + match($0, /([^ ]*\/stream-lua-nginx-module\/src)/, arr) + print arr[1] + }')" +-CORE_INCS="$CORE_INCS $stream_lua_nginx_module_incs" ++CORE_INCS="$CORE_INCS src/stream $stream_lua_nginx_module_incs" + + + if test -n "$ngx_module_link"; then Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Fri Oct 16 15:51:30 2020 (r552516) +++ head/www/nginx/pkg-plist Fri Oct 16 17:04:55 2020 (r552517) @@ -16,7 +16,8 @@ %%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so %%DSO%%%%CT%%libexec/nginx/ngx_http_ssl_ct_module.so %%DSO%%%%ECHO%%libexec/nginx/ngx_http_echo_module.so -%%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_dynamic_upstream_module.so +%%DSO%%%%DYNAMIC_HC%%libexec/nginx/ngx_http_dynamic_healthcheck_module.so +%%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_http_dynamic_upstream_module.so %%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so %%DSO%%%%DRIZZLE%%libexec/nginx/ngx_http_drizzle_module.so %%DSO%%%%ENCRYPTSESSION%%libexec/nginx/ngx_http_encrypted_session_module.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010161704.09GH4tXs084216>