Attachment #217455 for bug #247523

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME?= nginx	4	PORTNAME?= nginx
5	PORTVERSION= 1.19.2	5	PORTVERSION= 1.19.2
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= https://nginx.org/download/ \	8	MASTER_SITES= https://nginx.org/download/ \
9	LOCAL/osa	9	LOCAL/osa




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

HTTP_UPSTREAM_FAIR_GH_TUPLE=		jaygooby:nginx-upstream-fair:10ecdcf:upstreamfair
HTTP_UPSTREAM_FAIR_VARS=		DSO_EXTMODS+=upstreamfair




--- ../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

Lines 52-58 Link Here

(-)pkg-plist (-1 lines)
52	%%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so	52	%%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so
53	%%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so	53	%%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so
54	%%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so	54	%%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so
55	%%DSO%%%%HTTP_UPSTREAM_CHECK%%libexec/nginx/ngx_http_upstream_check_module.so
56	%%DSO%%%%HTTP_UPSTREAM_FAIR%%libexec/nginx/ngx_http_upstream_fair_module.so	55	%%DSO%%%%HTTP_UPSTREAM_FAIR%%libexec/nginx/ngx_http_upstream_fair_module.so
57	%%DSO%%%%HTTP_UPSTREAM_STICKY%%libexec/nginx/ngx_http_sticky_module.so	56	%%DSO%%%%HTTP_UPSTREAM_STICKY%%libexec/nginx/ngx_http_sticky_module.so
58	%%DSO%%%%HTTP_VIDEO_THUMBEXTRACTOR%%libexec/nginx/ngx_http_video_thumbextractor_module.so	57	%%DSO%%%%HTTP_VIDEO_THUMBEXTRACTOR%%libexec/nginx/ngx_http_video_thumbextractor_module.so

Return to bug 247523

Lines 169-181 Link Here

(-)Makefile.extmod (-3 / +2 lines)
169	HTTP_UPLOAD_PROGRESS_VARS= DSO_EXTMODS+=uploadprogress	169	HTTP_UPLOAD_PROGRESS_VARS= DSO_EXTMODS+=uploadprogress
170		170
171	HTTP_UPSTREAM_CHECK_GH_TUPLE= yaoweibin:nginx_upstream_check_module:9aecf15:upstreamcheck	171	HTTP_UPSTREAM_CHECK_GH_TUPLE= yaoweibin:nginx_upstream_check_module:9aecf15:upstreamcheck
		172	HTTP_UPSTREAM_CHECK_CONFIGURE_ON= --add-module=${WRKSRC_upstreamcheck}
172	HTTP_UPSTREAM_CHECK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c \	173	HTTP_UPSTREAM_CHECK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c \
173	${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c \	174	${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c \
174	${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c \	175	${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c \
175	${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.c \	176	${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.c \
176	${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h \	177	${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h
177	${PATCHDIR}/extra-patch-nginx_upstream_check_module-config
178	HTTP_UPSTREAM_CHECK_VARS= DSO_EXTMODS+=upstreamcheck
179		178
180	HTTP_UPSTREAM_FAIR_GH_TUPLE= jaygooby:nginx-upstream-fair:10ecdcf:upstreamfair	179	HTTP_UPSTREAM_FAIR_GH_TUPLE= jaygooby:nginx-upstream-fair:10ecdcf:upstreamfair
181	HTTP_UPSTREAM_FAIR_VARS= DSO_EXTMODS+=upstreamfair	180	HTTP_UPSTREAM_FAIR_VARS= DSO_EXTMODS+=upstreamfair

Lines 1-32 Link Here

(-)files/extra-patch-nginx_upstream_check_module-config (-32 lines)
1	--- ../nginx_upstream_check_module-9aecf15/config.orig 2020-04-27 09:51:23.976467000 -0400
2	+++ ../nginx_upstream_check_module-9aecf15/config 2020-04-27 09:54:11.429571000 -0400
3	@@ -1,23 +1,7 @@
4	-ngx_feature="ngx_http_upstream_check_module"
5	-ngx_feature_name=
6	-ngx_feature_run=no
7	-ngx_feature_incs=
8	-ngx_feature_path="$ngx_addon_dir"
9	-ngx_feature_deps="$ngx_addon_dir/ngx_http_upstream_check_module.h"
10	-ngx_check_src="$ngx_addon_dir/ngx_http_upstream_check_module.c"
11	-ngx_feature_test="int a;"
12	-. auto/feature
13	+ngx_addon_name=ngx_http_upstream_check_module
14	+ngx_module_name="$ngx_addon_name"
15	+ngx_module_type=HTTP
16	+ngx_module_deps="$ngx_addon_dir/ngx_http_upstream_check_module.h"
17	+ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_check_module.c"
18
19	-if [ $ngx_found = yes ]; then
20	- have=NGX_HTTP_UPSTREAM_CHECK . auto/have
21	- CORE_INCS="$CORE_INCS $ngx_feature_path"
22	- ngx_addon_name=ngx_http_upstream_check_module
23	- HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_check_module"
24	- NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_feature_deps"
25	- NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_check_src"
26	-else
27	- cat << END
28	- $0: error: the ngx_http_upstream_check_module addon error.
29	-END
30	- exit 1
31	-fi
32	+. auto/module