1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00

Update third-party http_subs_filter module from 0.5.2.r45 to 0.5.2.r53.

Remove needless extra patch.

Update third-party upload_progress module from 0.8.2 to 0.8.3.
Change the download page to github.com.

Do not bump PORTREVISION because these modules disabled by default.
This commit is contained in:
Sergey A. Osokin 2011-12-29 11:30:39 +00:00
parent 4b8cdee69d
commit 1ddbbe018d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=288225
5 changed files with 22 additions and 47 deletions

View File

@ -336,12 +336,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_MODULE
.endif
.if defined(WITH_HTTP_SUBS_FILTER_MODULE)
NGINX_HTTP_SUBS_FILTER_MODULE_VERSION= 0.5.2.r45
NGINX_HTTP_SUBS_FILTER_MODULE_VERSION= 0.5.2.r53
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/}
MASTER_SITE_SUBDIR+= osa/:subs_filter
DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_MODULE_VERSION}.tar.gz:subs_filter
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_MODULE_VERSION}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src:core:ngx_regex.c
.endif
.if defined(WITH_HTTP_SECURE_LINK_MODULE)
@ -369,11 +368,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_MODULE
.endif
.if defined(WITH_HTTP_UPLOAD_PROGRESS)
NGINX_UPLOADPROGRESS_MODULE_VERSION= 0.8.2
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:uploadprogress/}
MASTER_SITE_SUBDIR+= osa/:uploadprogress
DISTFILES+= nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}
NGINX_UPLOADPROGRESS_MODULE_VERSION= 0.8.3
GIT_UPLOADPROGRESS_MODULE_VERSION= 0-gc7c663f
FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/masterzen/nginx-upload-progress-module/tarball/v${NGINX_UPLOADPROGRESS_MODULE_VERSION}/:uploadprogress
DISTFILES+= masterzen-nginx-upload-progress-module-v${NGINX_UPLOADPROGRESS_MODULE_VERSION}-${GIT_UPLOADPROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_MODULE_VERSION:S/^0-g//}
.endif
.if defined(WITH_HTTP_UPSTREAM_FAIR) || defined(WITH_SUPERVISORD_MODULE)

View File

@ -32,12 +32,12 @@ SHA256 (ngx_http_redis-0.3.5.tar.gz) = 5398805bbc790b8ae5ddb5079cf726df63c8c206b
SIZE (ngx_http_redis-0.3.5.tar.gz) = 11373
SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
SIZE (ngx_http_response-0.3.tar.gz) = 2244
SHA256 (ngx_http_subs_filter_module-0.5.2.r45.tar.gz) = fbbb38bb3ffa92059b1920cfd00bc8b2b8b081ba4b18975a20d7af436138887e
SIZE (ngx_http_subs_filter_module-0.5.2.r45.tar.gz) = 71875
SHA256 (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 7db85255b0f8f3e7ea912a572c2a0a3e5a67f9771838cf1df072049fa9367000
SIZE (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 94682
SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
SHA256 (nginx_uploadprogress_module-0.8.2.tar.gz) = 277a00d92907620a8aa1891d93d226ddf087af4b21258c1a118698044520aae1
SIZE (nginx_uploadprogress_module-0.8.2.tar.gz) = 16540
SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
SIZE (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = 16694
SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968

View File

@ -1,26 +0,0 @@
--- src/core/ngx_regex.c 2011-12-06 19:49:40.000000000 +0400
+++ src/core/ngx_regex.c 2009-11-17 13:24:45.000000000 +0300
@@ -137,6 +137,23 @@
ngx_int_t
+ngx_regex_capture_count(ngx_regex_t *re)
+{
+ int rc, n;
+
+ n = 0;
+
+ rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+
+ if (rc < 0) {
+ return (ngx_int_t) rc;
+ }
+
+ return (ngx_int_t) n;
+}
+
+
+ngx_int_t
ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log)
{
ngx_int_t n;

View File

@ -337,7 +337,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_MODULE
.endif
.if defined(WITH_HTTP_SUBS_FILTER_MODULE)
NGINX_HTTP_SUBS_FILTER_MODULE_VERSION= 0.5.2.r45
NGINX_HTTP_SUBS_FILTER_MODULE_VERSION= 0.5.2.r53
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/}
MASTER_SITE_SUBDIR+= osa/:subs_filter
DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_MODULE_VERSION}.tar.gz:subs_filter
@ -369,11 +369,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_MODULE
.endif
.if defined(WITH_HTTP_UPLOAD_PROGRESS)
NGINX_UPLOADPROGRESS_MODULE_VERSION= 0.8.2
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:uploadprogress/}
MASTER_SITE_SUBDIR+= osa/:uploadprogress
DISTFILES+= nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}
NGINX_UPLOADPROGRESS_MODULE_VERSION= 0.8.3
GIT_UPLOADPROGRESS_MODULE_VERSION= 0-gc7c663f
FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/masterzen/nginx-upload-progress-module/tarball/v${NGINX_UPLOADPROGRESS_MODULE_VERSION}/:uploadprogress
DISTFILES+= masterzen-nginx-upload-progress-module-v${NGINX_UPLOADPROGRESS_MODULE_VERSION}-${GIT_UPLOADPROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_MODULE_VERSION:S/^0-g//}
.endif
.if defined(WITH_HTTP_UPSTREAM_FAIR) || defined(WITH_SUPERVISORD_MODULE)

View File

@ -32,12 +32,12 @@ SHA256 (ngx_http_redis-0.3.5.tar.gz) = 5398805bbc790b8ae5ddb5079cf726df63c8c206b
SIZE (ngx_http_redis-0.3.5.tar.gz) = 11373
SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
SIZE (ngx_http_response-0.3.tar.gz) = 2244
SHA256 (ngx_http_subs_filter_module-0.5.2.r45.tar.gz) = fbbb38bb3ffa92059b1920cfd00bc8b2b8b081ba4b18975a20d7af436138887e
SIZE (ngx_http_subs_filter_module-0.5.2.r45.tar.gz) = 71875
SHA256 (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 7db85255b0f8f3e7ea912a572c2a0a3e5a67f9771838cf1df072049fa9367000
SIZE (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 94682
SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
SHA256 (nginx_uploadprogress_module-0.8.2.tar.gz) = 277a00d92907620a8aa1891d93d226ddf087af4b21258c1a118698044520aae1
SIZE (nginx_uploadprogress_module-0.8.2.tar.gz) = 16540
SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
SIZE (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = 16694
SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968