Attachment #160297 for bug #202593




	HTTP_REDIS \
	HTTP_RESPONSE \
	HTTP_SUBS_FILTER \
	HTTP_TARANTOOL \
	HTTP_UPLOAD \
	HTTP_UPLOAD_PROGRESS \
	HTTP_UPSTREAM_FAIR \

HTTP_REDIS_DESC=		3rd party http_redis module
HTTP_RESPONSE_DESC=		3rd party http_response module
HTTP_SUBS_FILTER_DESC=		3rd party subs filter module
HTTP_TARANTOOL_DESC=		3rd party tarantool upstream module
HTTP_UPLOAD_DESC=		3rd party upload module
HTTP_UPLOAD_PROGRESS_DESC=	3rd party uploadprogress module
HTTP_UPSTREAM_FAIR_DESC=	3rd party upstream fair module

CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
.endif

.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
LIB_DEPENDS+=	libmsgpuck.so:${PORTSDIR}/devel/msgpuck \
		libyajl.so:${PORTSDIR}/devel/yajl
GH_ACCOUNT+=	tarantool:nginx_tarantool
GH_PROJECT+=	nginx_upstream_module:nginx_tarantool
GH_TAGNAME+=	966f2f5:nginx_tarantool
CFLAGS+=	-I${LOCALBASE}/include/msgpuck
CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool}
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_tarantool-config
.endif

.if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
CONFIGURE_ARGS+=--with-http_secure_link_module
.endif

		's!%%PREFIX%%!${LOCALBASE}!g' \
		${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/configure
.endif
.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
	@${REINPLACE_CMD} \
		's!%%PREFIX%%!${LOCALBASE}!g' \
		${WRKSRC_nginx_tarantool}/config
.endif

pre-configure:
.if ${PORT_OPTIONS:MMODSECURITY}

Lines 64-69 Link Here

(-)distinfo (+2 lines)
64	SIZE (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 153122	64	SIZE (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 153122
65	SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 2814340bf57581a04873e26d773ec216bfceebb1abb87d4904ce314790897b17	65	SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 2814340bf57581a04873e26d773ec216bfceebb1abb87d4904ce314790897b17
66	SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 91878	66	SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 91878
		67	SHA256 (tarantool-nginx_upstream_module-966f2f5_GH0.tar.gz) = 8142475d8ecf0c02d2fc8051364729d842fe06b0b445b416c87c2f796bb42fa7
		68	SIZE (tarantool-nginx_upstream_module-966f2f5_GH0.tar.gz) = 873343
67	SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05	69	SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05
68	SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296	70	SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296
69	SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1	71	SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1

Line 0 Link Here

(-)files/extra-patch-ngx_http_tarantool-config (+11 lines)
	1	--- ../nginx_upstream_module-966f2f5/config.orig 2015-08-20 23:33:02.000000000 +0300
	2	+++ ../nginx_upstream_module-966f2f5/config 2015-08-23 16:04:59.572045669 +0300
	3	@@ -4,7 +4,7 @@
	4	"
	5
	6	CORE_LIBS="$CORE_LIBS $ngx_feature_libs \
	7	- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \
	8	+ %%PREFIX%%/lib/libyajl_s.a \
	9	"
	10
	11	HTTP_MODULES="$HTTP_MODULES \

Return to bug 202593

Lines 79-84 Link Here

(-)Makefile (+18 lines)
79	HTTP_REDIS \	79	HTTP_REDIS \
80	HTTP_RESPONSE \	80	HTTP_RESPONSE \
81	HTTP_SUBS_FILTER \	81	HTTP_SUBS_FILTER \
		82	HTTP_TARANTOOL \
82	HTTP_UPLOAD \	83	HTTP_UPLOAD \
83	HTTP_UPLOAD_PROGRESS \	84	HTTP_UPLOAD_PROGRESS \
84	HTTP_UPSTREAM_FAIR \	85	HTTP_UPSTREAM_FAIR \
Lines 174-179 Link Here
174	HTTP_REDIS_DESC= 3rd party http_redis module	175	HTTP_REDIS_DESC= 3rd party http_redis module
175	HTTP_RESPONSE_DESC= 3rd party http_response module	176	HTTP_RESPONSE_DESC= 3rd party http_response module
176	HTTP_SUBS_FILTER_DESC= 3rd party subs filter module	177	HTTP_SUBS_FILTER_DESC= 3rd party subs filter module
		178	HTTP_TARANTOOL_DESC= 3rd party tarantool upstream module
177	HTTP_UPLOAD_DESC= 3rd party upload module	179	HTTP_UPLOAD_DESC= 3rd party upload module
178	HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module	180	HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module
179	HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module	181	HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module
Lines 530-535 Link Here
530	CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}	532	CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
531	.endif	533	.endif
532		534
		535	.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
		536	LIB_DEPENDS+= libmsgpuck.so:${PORTSDIR}/devel/msgpuck \
		537	libyajl.so:${PORTSDIR}/devel/yajl
		538	GH_ACCOUNT+= tarantool:nginx_tarantool
		539	GH_PROJECT+= nginx_upstream_module:nginx_tarantool
		540	GH_TAGNAME+= 966f2f5:nginx_tarantool
		541	CFLAGS+= -I${LOCALBASE}/include/msgpuck
		542	CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool}
		543	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config
		544	.endif
		545
533	.if ${PORT_OPTIONS:MHTTP_SECURE_LINK}	546	.if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
534	CONFIGURE_ARGS+=--with-http_secure_link_module	547	CONFIGURE_ARGS+=--with-http_secure_link_module
535	.endif	548	.endif
Lines 1022-1027 Link Here
1022	's!%%PREFIX%%!${LOCALBASE}!g' \	1035	's!%%PREFIX%%!${LOCALBASE}!g' \
1023	${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/configure	1036	${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/configure
1024	.endif	1037	.endif
		1038	.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
		1039	@${REINPLACE_CMD} \
		1040	's!%%PREFIX%%!${LOCALBASE}!g' \
		1041	${WRKSRC_nginx_tarantool}/config
		1042	.endif
1025		1043
1026	pre-configure:	1044	pre-configure:
1027	.if ${PORT_OPTIONS:MMODSECURITY}	1045	.if ${PORT_OPTIONS:MMODSECURITY}