Date: Sun, 20 Nov 2016 20:19:51 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426620 - in head/www/nginx-devel: . files Message-ID: <201611202019.uAKKJpE7048309@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sun Nov 20 20:19:51 2016 New Revision: 426620 URL: https://svnweb.freebsd.org/changeset/ports/426620 Log: Remove IGNORE for memc and redis2 third-party modules. Patches obtained from: o) https://github.com/openresty/memc-nginx-module/commit/c08cb7043440e427867838caf21cfd1e6cb2127a o) https://github.com/openresty/redis2-nginx-module/commit/8cc7304787ae9542db4feb50d9e27beb485caa0f Added: head/www/nginx-devel/files/extra-patch-ngx_http_memc_util.c (contents, props changed) head/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c (contents, props changed) Modified: head/www/nginx-devel/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sun Nov 20 20:18:44 2016 (r426619) +++ head/www/nginx-devel/Makefile Sun Nov 20 20:19:51 2016 (r426620) @@ -859,7 +859,7 @@ GH_ACCOUNT+= openresty:memc GH_PROJECT+= memc-nginx-module:memc GH_TAGNAME+= v${NGINX_MEMC_VERSION}:memc CONFIGURE_ARGS+=--add-module=${WRKSRC_memc} -IGNORE= MEMC: a patch requires +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_memc_util.c .endif .if ${PORT_OPTIONS:MMODSECURITY} @@ -943,7 +943,7 @@ GH_ACCOUNT+= openresty:redis2 GH_PROJECT+= redis2-nginx-module:redis2 GH_TAGNAME+= v${NGINX_REDIS2_VERSION}:redis2 CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2} -IGNORE= REDIS2: a patch requires +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_redis2_util.c .endif .if ${PORT_OPTIONS:MRTMP} Added: head/www/nginx-devel/files/extra-patch-ngx_http_memc_util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_http_memc_util.c Sun Nov 20 20:19:51 2016 (r426620) @@ -0,0 +1,17 @@ +--- ../memc-nginx-module-0.17/src/ngx_http_memc_util.c.orig 2016-11-20 14:54:02.640140000 -0500 ++++ ../memc-nginx-module-0.17/src/ngx_http_memc_util.c 2016-11-20 14:54:34.579764000 -0500 +@@ -141,12 +141,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && uscfp[i]->default_port != url->default_port) + { + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + } Added: head/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c Sun Nov 20 20:19:51 2016 (r426620) @@ -0,0 +1,18 @@ +--- ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c.orig 2016-11-20 15:00:28.997903000 -0500 ++++ ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c 2016-11-20 15:00:44.173323000 -0500 +@@ -77,6 +77,7 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port + && url->default_port + && uscfp[i]->default_port != url->default_port) +@@ -84,6 +85,7 @@ + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611202019.uAKKJpE7048309>