summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2012-06-07 01:09:44 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2012-06-07 01:09:44 +0000
commitdb5f9da7b29900bc5b7a0a43e81053d69ffd366f (patch)
tree692c3f4f51143e588cd51552de0ae609bc1a7a99 /www
parent- Add conflict with freenet6 port. (diff)
Add third-party slow module, v.0.9.6,
http://code.google.com/p/nginx-sflow-module/. Do not bump PORTREVISION because this module is disabled by default.
Notes
Notes: svn path=/head/; revision=298651
Diffstat (limited to 'www')
-rw-r--r--www/nginx-devel/Makefile10
-rw-r--r--www/nginx-devel/distinfo2
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_http_sflow_config.c10
-rw-r--r--www/nginx/Makefile10
-rw-r--r--www/nginx/distinfo2
-rw-r--r--www/nginx/files/extra-patch-ngx_http_sflow_config.c10
6 files changed, 44 insertions, 0 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 7d0d9a71fc5f..7fbc4b117377 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -91,6 +91,7 @@ OPTIONS_DEFINE= \
REDIS2 \
RTMP \
SET_MISC \
+ SFLOW \
SLOWFS_CACHE \
SRCACHE \
SUPERVISORD \
@@ -174,6 +175,7 @@ RDS_JSON_DESC= 3rd party rds_json module
REDIS2_DESC= 3rd party redis2 module
RTMP_DESC= 3rd party rtmp module
SET_MISC_DESC= 3rd party set_misc module
+SFLOW_DESC= 3rd party sflow module
SLOWFS_CACHE_DESC= 3rd party slowfs_cache module
SRCACHE_DESC= 3rd party srcache module
SUPERVISORD_DESC= 3rd party supervisord module
@@ -680,6 +682,14 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_M
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module::config
.endif
+.if ${PORT_OPTIONS:MSFLOW}
+NGINX_SFLOW_VERSION= 0.9.6
+MASTER_SITES+= http://nginx-sflow-module.googlecode.com/files/:sflow
+DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c
+.endif
+
.if ${PORT_OPTIONS:MSLOWFS_CACHE}
NGINX_SLOWFS_CACHE_VERSION= 1.8
MASTER_SITES+= http://labs.frickle.com/files/:slowfs_cache
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 4c70f7025f7d..d9ce5e089e4a 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -82,6 +82,8 @@ SHA256 (arut-rtmp-nginx-module-v0.1.5-0-gd216f3d.tar.gz) = 3ae7fa0f72d0576e4e959
SIZE (arut-rtmp-nginx-module-v0.1.5-0-gd216f3d.tar.gz) = 942171
SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b5ab3c2e21a4a1139359e351525ac03f34e2508e5704f157024bd
SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053
+SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0
+SIZE (nginx-sflow-module-0.9.6.tar.gz) = 27758
SHA256 (ngx_slowfs_cache-1.8.tar.gz) = 3ab8aa47912a3f7a07cda0a4fbf6d2e870b9c9cbf5477014ac109001cdcb3644
SIZE (ngx_slowfs_cache-1.8.tar.gz) = 11408
SHA256 (agentzh-srcache-nginx-module-v0.13rc8-0-g5237f26.tar.gz) = 2cb76adb4cf20079b44cf951f6a7fa480265878d65a6def2ae4dc5deb17ed686
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.c b/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.c
new file mode 100644
index 000000000000..f67a6f25eb58
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.c
@@ -0,0 +1,10 @@
+--- ../nginx-sflow-module-0.9.6/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400
++++ ../nginx-sflow-module-0.9.6/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400
+@@ -26,7 +26,6 @@
+ ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() failed: %s", gai_strerror(err));
+ switch(err) {
+ case EAI_NONAME: break;
+- case EAI_NODATA: break;
+ case EAI_AGAIN: break; // loop and try again?
+ default: ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() error: %s", gai_strerror(err)); break;
+ }
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 631a692d891e..d81bb535aaec 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -91,6 +91,7 @@ OPTIONS_DEFINE= \
REDIS2 \
RTMP \
SET_MISC \
+ SFLOW \
SLOWFS_CACHE \
SRCACHE \
SUPERVISORD \
@@ -174,6 +175,7 @@ RDS_JSON_DESC= 3rd party rds_json module
REDIS2_DESC= 3rd party redis2 module
RTMP_DESC= 3rd party rtmp module
SET_MISC_DESC= 3rd party set_misc module
+SFLOW_DESC= 3rd party sflow module
SLOWFS_CACHE_DESC= 3rd party slowfs_cache module
SRCACHE_DESC= 3rd party srcache module
SUPERVISORD_DESC= 3rd party supervisord module
@@ -678,6 +680,14 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_M
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module::config
.endif
+.if ${PORT_OPTIONS:MSFLOW}
+NGINX_SFLOW_VERSION= 0.9.6
+MASTER_SITES+= http://nginx-sflow-module.googlecode.com/files/:sflow
+DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c
+.endif
+
.if ${PORT_OPTIONS:MSLOWFS_CACHE}
NGINX_SLOWFS_CACHE_VERSION= 1.8
MASTER_SITES+= http://labs.frickle.com/files/:slowfs_cache
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index b9304a10d0e8..ab0d28af560b 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -82,6 +82,8 @@ SHA256 (arut-rtmp-nginx-module-v0.1.5-0-gd216f3d.tar.gz) = 3ae7fa0f72d0576e4e959
SIZE (arut-rtmp-nginx-module-v0.1.5-0-gd216f3d.tar.gz) = 942171
SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b5ab3c2e21a4a1139359e351525ac03f34e2508e5704f157024bd
SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053
+SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0
+SIZE (nginx-sflow-module-0.9.6.tar.gz) = 27758
SHA256 (ngx_slowfs_cache-1.8.tar.gz) = 3ab8aa47912a3f7a07cda0a4fbf6d2e870b9c9cbf5477014ac109001cdcb3644
SIZE (ngx_slowfs_cache-1.8.tar.gz) = 11408
SHA256 (agentzh-srcache-nginx-module-v0.13rc8-0-g5237f26.tar.gz) = 2cb76adb4cf20079b44cf951f6a7fa480265878d65a6def2ae4dc5deb17ed686
diff --git a/www/nginx/files/extra-patch-ngx_http_sflow_config.c b/www/nginx/files/extra-patch-ngx_http_sflow_config.c
new file mode 100644
index 000000000000..f67a6f25eb58
--- /dev/null
+++ b/www/nginx/files/extra-patch-ngx_http_sflow_config.c
@@ -0,0 +1,10 @@
+--- ../nginx-sflow-module-0.9.6/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400
++++ ../nginx-sflow-module-0.9.6/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400
+@@ -26,7 +26,6 @@
+ ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() failed: %s", gai_strerror(err));
+ switch(err) {
+ case EAI_NONAME: break;
+- case EAI_NODATA: break;
+ case EAI_AGAIN: break; // loop and try again?
+ default: ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() error: %s", gai_strerror(err)); break;
+ }