diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 2f30c3306c64..209338f0bf57 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME?= nginx PORTVERSION= 1.19.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 0dd97e9b5716..0a4766937886 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -169,13 +169,12 @@ HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:afb2d31:up HTTP_UPLOAD_PROGRESS_VARS= DSO_EXTMODS+=uploadprogress HTTP_UPSTREAM_CHECK_GH_TUPLE= yaoweibin:nginx_upstream_check_module:9aecf15:upstreamcheck +HTTP_UPSTREAM_CHECK_CONFIGURE_ON= --add-module=${WRKSRC_upstreamcheck} HTTP_UPSTREAM_CHECK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c \ ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c \ ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c \ ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.c \ - ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h \ - ${PATCHDIR}/extra-patch-nginx_upstream_check_module-config -HTTP_UPSTREAM_CHECK_VARS= DSO_EXTMODS+=upstreamcheck + ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h HTTP_UPSTREAM_FAIR_GH_TUPLE= jaygooby:nginx-upstream-fair:10ecdcf:upstreamfair HTTP_UPSTREAM_FAIR_VARS= DSO_EXTMODS+=upstreamfair diff --git a/www/nginx-devel/files/extra-patch-nginx_upstream_check_module-config b/www/nginx-devel/files/extra-patch-nginx_upstream_check_module-config deleted file mode 100644 index 17a3d5c104e8..000000000000 --- a/www/nginx-devel/files/extra-patch-nginx_upstream_check_module-config +++ /dev/null @@ -1,32 +0,0 @@ ---- ../nginx_upstream_check_module-9aecf15/config.orig 2020-04-27 09:51:23.976467000 -0400 -+++ ../nginx_upstream_check_module-9aecf15/config 2020-04-27 09:54:11.429571000 -0400 -@@ -1,23 +1,7 @@ --ngx_feature="ngx_http_upstream_check_module" --ngx_feature_name= --ngx_feature_run=no --ngx_feature_incs= --ngx_feature_path="$ngx_addon_dir" --ngx_feature_deps="$ngx_addon_dir/ngx_http_upstream_check_module.h" --ngx_check_src="$ngx_addon_dir/ngx_http_upstream_check_module.c" --ngx_feature_test="int a;" --. auto/feature -+ngx_addon_name=ngx_http_upstream_check_module -+ngx_module_name="$ngx_addon_name" -+ngx_module_type=HTTP -+ngx_module_deps="$ngx_addon_dir/ngx_http_upstream_check_module.h" -+ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_check_module.c" - --if [ $ngx_found = yes ]; then -- have=NGX_HTTP_UPSTREAM_CHECK . auto/have -- CORE_INCS="$CORE_INCS $ngx_feature_path" -- ngx_addon_name=ngx_http_upstream_check_module -- HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_check_module" -- NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_feature_deps" -- NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_check_src" --else -- cat << END -- $0: error: the ngx_http_upstream_check_module addon error. --END -- exit 1 --fi -+. auto/module diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist index d07f3359fada..a43460352509 100644 --- a/www/nginx-devel/pkg-plist +++ b/www/nginx-devel/pkg-plist @@ -52,7 +52,6 @@ %%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so %%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so %%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so -%%DSO%%%%HTTP_UPSTREAM_CHECK%%libexec/nginx/ngx_http_upstream_check_module.so %%DSO%%%%HTTP_UPSTREAM_FAIR%%libexec/nginx/ngx_http_upstream_fair_module.so %%DSO%%%%HTTP_UPSTREAM_STICKY%%libexec/nginx/ngx_http_sticky_module.so %%DSO%%%%HTTP_VIDEO_THUMBEXTRACTOR%%libexec/nginx/ngx_http_video_thumbextractor_module.so