Attachment 160247 Details for Bug 202593 – Patch with tarantool support

[patch] Patch with tarantool support

nginx-devel-1.9.4_1.diff (text/plain), 3.73 KB, created by Veniamin Gvozdikov on 2015-08-23 13:59:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Veniamin Gvozdikov

Created: 2015-08-23 13:59:13 UTC

Size: 3.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 395089)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	nginx
> PORTVERSION=	1.9.4
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://nginx.org/download/
> MASTER_SITES+=	LOCAL/osa
>@@ -79,6 +80,7 @@
> 	HTTP_REDIS \
> 	HTTP_RESPONSE \
> 	HTTP_SUBS_FILTER \
>+	HTTP_TARANTOOL \
> 	HTTP_UPLOAD \
> 	HTTP_UPLOAD_PROGRESS \
> 	HTTP_UPSTREAM_FAIR \
>@@ -174,6 +176,7 @@
> 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
>@@ -530,6 +533,17 @@
> 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
>@@ -1022,6 +1036,11 @@
> 		'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}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 395089)
>+++ distinfo	(working copy)
>@@ -64,6 +64,8 @@
> SIZE (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 153122
> SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 2814340bf57581a04873e26d773ec216bfceebb1abb87d4904ce314790897b17
> SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 91878
>+SHA256 (tarantool-nginx_upstream_module-966f2f5_GH0.tar.gz) = 8142475d8ecf0c02d2fc8051364729d842fe06b0b445b416c87c2f796bb42fa7
>+SIZE (tarantool-nginx_upstream_module-966f2f5_GH0.tar.gz) = 873343
> SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05
> SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296
> SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1
>Index: files/extra-patch-ngx_http_tarantool-config
>===================================================================
>--- files/extra-patch-ngx_http_tarantool-config	(revision 0)
>+++ files/extra-patch-ngx_http_tarantool-config	(working copy)
>@@ -0,0 +1,11 @@
>+--- ../nginx_upstream_module-966f2f5/config.orig	2015-08-20 23:33:02.000000000 +0300
>++++ ../nginx_upstream_module-966f2f5/config	2015-08-23 16:04:59.572045669 +0300
>+@@ -4,7 +4,7 @@
>+           "
>+ 
>+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs \
>+-           $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \
>++           %%PREFIX%%/lib/libyajl_s.a \
>+            "
>+ 
>+ HTTP_MODULES="$HTTP_MODULES               \
>
>Property changes on: files/extra-patch-ngx_http_tarantool-config
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 202593: 160247 | 160290 | 160297