Date: Mon, 2 Jul 2012 13:56:49 GMT From: Alexey Markov <redrat@mail.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/169602: www/nginx port update for latest nginx-upload-progress module Message-ID: <201207021356.q62Dunnv024043@red.freebsd.org> Resent-Message-ID: <201207021400.q62E0LXY044363@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169602
>Category: ports
>Synopsis: www/nginx port update for latest nginx-upload-progress module
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 02 14:00:21 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Alexey Markov
>Release: 8.3-RELEASE-p3
>Organization:
JSC Complitex
>Environment:
FreeBSD host.redrat.ru 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Mon Jul 2 09:31:41 MSK 2012 redrat@host.redrat.ru:/mnt/arc/obj/mnt/arc/src/sys/HOST i386
>Description:
The new version 0.9.0 of nginx-upload-progress-module available on developer site, and a tarball of previous version 0.8.3. is gone. So, this patch updates www/nginx port to use the latest version of nginx-upload-progress module.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2012-06-30 01:01:03.000000000 +0400
+++ Makefile 2012-07-02 17:24:27.000000000 +0400
@@ -484,12 +484,12 @@
.endif
.if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS}
-NGINX_UPLOADPROGRESS_VERSION= 0.8.3
-GIT_UPLOADPROGRESS_VERSION= 0-gc7c663f
+NGINX_UPLOADPROGRESS_VERSION= 0.9.0
+GIT_UPLOADPROGRESS_VERSION= a788dea
FETCH_ARGS= -pRr
-MASTER_SITES+= https://github.com/masterzen/nginx-upload-progress-module/tarball/v${NGINX_UPLOADPROGRESS_VERSION}/:uploadprogress
-DISTFILES+= masterzen-nginx-upload-progress-module-v${NGINX_UPLOADPROGRESS_VERSION}-${GIT_UPLOADPROGRESS_VERSION}.tar.gz:uploadprogress
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION:S/^0-g//}
+MASTER_SITES+= https://github.com/downloads/masterzen/nginx-upload-progress-module/nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_VERSION}.tar.gz:uploadprogress
+DISTFILES+= nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_VERSION}.tar.gz:uploadprogress
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_uploadprogress_module.c
.endif
--- distinfo.orig 2012-06-22 21:59:13.000000000 +0400
+++ distinfo 2012-07-02 17:23:58.000000000 +0400
@@ -40,8 +40,8 @@
SIZE (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 95092
SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
-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_uploadprogress_module-0.9.0.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2
+SIZE (nginx_uploadprogress_module-0.9.0.tar.gz) = 17020
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
--- files/extra-patch-ngx_http_uploadprogress_module.c.orig 2012-04-23 18:01:35.000000000 +0400
+++ files/extra-patch-ngx_http_uploadprogress_module.c 2012-07-02 17:36:38.000000000 +0400
@@ -1,6 +1,6 @@
---- ../masterzen-nginx-upload-progress-module-c7c663f/ngx_http_uploadprogress_module.c.orig 2012-02-15 19:50:03.000000000 +0400
-+++ ../masterzen-nginx-upload-progress-module-c7c663f/ngx_http_uploadprogress_module.c 2012-02-15 19:53:58.000000000 +0400
-@@ -1446,18 +1446,12 @@
+--- ../masterzen-nginx-upload-progress-module-a788dea/ngx_http_uploadprogress_module.c.orig 2012-04-06 22:20:22.000000000 +0400
++++ ../masterzen-nginx-upload-progress-module-a788dea/ngx_http_uploadprogress_module.c 2012-07-02 17:31:28.000000000 +0400
+@@ -1444,7 +1444,7 @@
lzcf->timeout = ngx_parse_time(&value[2], 1);
@@ -11,12 +11,6 @@
return NGX_CONF_ERROR;
}
-- if (lzcf->timeout == NGX_PARSE_LARGE_TIME) {
-- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-- "track_uploads \"%V\" timeout value must be less than 68 years", &value[1]);
-- return NGX_CONF_ERROR;
-- }
--
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
lzcf->handler = clcf->handler;
if ( lzcf->handler == NULL )
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207021356.q62Dunnv024043>