sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update subs_filter third-party module from 0.5.2.r53 to 0.5.2.r59.

Browse source 
Configure pcre module support if subs_filter module defined.
This commit is contained in:
Sergey A. Osokin 2012-06-18 16:12:38 +00:00
parent 0bca9d8360
commit b591b2a048
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=299567
5 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www/nginx-devel/Makefile
View file

@ -456,12 +456,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_VERSIO
.endif .endif
.if ${PORT_OPTIONS:MHTTP_SUBS_FILTER} .if ${PORT_OPTIONS:MHTTP_SUBS_FILTER}
NGINX_HTTP_SUBS_FILTER_VERSION= 0.5.2.r53 USE_HTTP_REWRITE= yes
NGINX_HTTP_SUBS_FILTER_VERSION= 0.5.2.r59
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/} MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/}
MASTER_SITE_SUBDIR+= osa/:subs_filter MASTER_SITE_SUBDIR+= osa/:subs_filter
DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION} CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_subs_filter_module.c
.endif .endif
.if ${PORT_OPTIONS:MHTTP_SECURE_LINK} .if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
@ -611,7 +611,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-naxsi_src::naxsi_runtime.c EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-naxsi_src::naxsi_runtime.c
.endif .endif
.if ${PORT_OPTIONS:MHTTP_REWRITE} .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS+=--with-pcre CONFIGURE_ARGS+=--with-pcre
.else .else

4
www/nginx-devel/distinfo
View file

@ -36,8 +36,8 @@ SHA256 (ngx_http_redis-0.3.6.tar.gz) = 9e5d8c0f1317a6910710c94d27f9aca4968c48ee1
SIZE (ngx_http_redis-0.3.6.tar.gz) = 12099 SIZE (ngx_http_redis-0.3.6.tar.gz) = 12099
SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
SIZE (ngx_http_response-0.3.tar.gz) = 2244 SIZE (ngx_http_response-0.3.tar.gz) = 2244
SHA256 (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 7db85255b0f8f3e7ea912a572c2a0a3e5a67f9771838cf1df072049fa9367000 SHA256 (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 8fd9a185f092320a5290ad8b9f19bf0f7499167db275990c7f0228cd9aefb6fe
SIZE (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 94682 SIZE (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 95092
SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796 SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae

13
www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c
View file

@ -1,13 +0,0 @@
--- ../ngx_http_subs_filter_module-0.5.2.r53/ngx_http_subs_filter_module.c.orig 2012-06-06 16:13:15.000000000 +0400
+++ ../ngx_http_subs_filter_module-0.5.2.r53/ngx_http_subs_filter_module.c 2012-06-06 16:16:06.000000000 +0400
@@ -1300,7 +1300,9 @@
n = 0;
-#if defined(nginx_version) && nginx_version >= 1001012
+#if defined(nginx_version) && (nginx_version >= 1003001)
+ rc = pcre_fullinfo(re->code, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+#elif (nginx_version >= 1001012) && (nginx_version < 1003001)
rc = pcre_fullinfo(re->pcre, NULL, PCRE_INFO_CAPTURECOUNT, &n);
#else
rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n);

5
www/nginx/Makefile
View file

@ -454,7 +454,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_VERSIO
.endif .endif
.if ${PORT_OPTIONS:MHTTP_SUBS_FILTER} .if ${PORT_OPTIONS:MHTTP_SUBS_FILTER}
NGINX_HTTP_SUBS_FILTER_VERSION= 0.5.2.r53 USE_HTTP_REWRITE= yes
NGINX_HTTP_SUBS_FILTER_VERSION= 0.5.2.r59
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/} MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/}
MASTER_SITE_SUBDIR+= osa/:subs_filter MASTER_SITE_SUBDIR+= osa/:subs_filter
DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter
@ -607,7 +608,7 @@ DISTFILES+= naxsi-${NGINX_NAXSI_VERSION}.tgz:naxsi
CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
.endif .endif
.if ${PORT_OPTIONS:MHTTP_REWRITE} .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS+=--with-pcre CONFIGURE_ARGS+=--with-pcre
.else .else

4
www/nginx/distinfo
View file

@ -36,8 +36,8 @@ SHA256 (ngx_http_redis-0.3.6.tar.gz) = 9e5d8c0f1317a6910710c94d27f9aca4968c48ee1
SIZE (ngx_http_redis-0.3.6.tar.gz) = 12099 SIZE (ngx_http_redis-0.3.6.tar.gz) = 12099
SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
SIZE (ngx_http_response-0.3.tar.gz) = 2244 SIZE (ngx_http_response-0.3.tar.gz) = 2244
SHA256 (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 7db85255b0f8f3e7ea912a572c2a0a3e5a67f9771838cf1df072049fa9367000 SHA256 (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 8fd9a185f092320a5290ad8b9f19bf0f7499167db275990c7f0228cd9aefb6fe
SIZE (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 94682 SIZE (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 95092
SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796 SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae