summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2015-12-04 11:46:39 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2015-12-04 11:46:39 +0000
commit12896bebffa87ec052039860e0ae55b2e05696eb (patch)
tree21788c89f26a52643989da4669f4b4ae9e0ac066 /www
parentRemove needless code. (diff)
Upgrade third-party drizzle module from 0.1.8 to 0.1.9.
Remove needless patch.
Notes
Notes: svn path=/head/; revision=402919
Diffstat (limited to 'www')
-rw-r--r--www/nginx-devel/Makefile5
-rw-r--r--www/nginx-devel/distinfo4
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c39
-rw-r--r--www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config4
-rw-r--r--www/nginx/Makefile2
-rw-r--r--www/nginx/distinfo4
-rw-r--r--www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config4
7 files changed, 11 insertions, 51 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index b18fb9214cc9..f33d51e483b2 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -617,13 +617,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
.if ${PORT_OPTIONS:MDRIZZLE}
LIB_DEPENDS+= libdrizzle.so:${PORTSDIR}/databases/libdrizzle
-NGINX_DRIZZLE_VERSION= 0.1.8
+NGINX_DRIZZLE_VERSION= 0.1.9
GH_ACCOUNT+= openresty:drizzle
GH_PROJECT+= drizzle-nginx-module:drizzle
GH_TAGNAME+= v${NGINX_DRIZZLE_VERSION}:drizzle
CONFIGURE_ARGS+=--add-module=${WRKSRC_drizzle}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config \
- ${PATCHDIR}/extra-patch-ngx_http_drizzle_util.c
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
.endif
.if ${PORT_OPTIONS:MDYNAMIC_UPSTREAM}
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 6b3988029b79..94b408347b2e 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -70,8 +70,8 @@ SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec4
SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296
SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1
SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 16990
-SHA256 (openresty-drizzle-nginx-module-v0.1.8_GH0.tar.gz) = 5aa5a66568bb25af459d37547d14fc7867c970e4f90299895e1fad2cf20751a8
-SIZE (openresty-drizzle-nginx-module-v0.1.8_GH0.tar.gz) = 58891
+SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec023025333c34d6d0108026a1ce2e09b20a53e8e2d9bf65080
+SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = 59024
SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.0_GH0.tar.gz) = 287c342c98d6f87667deca3ed673dc6de564f1716c9d604197d8c1b0344e0fa5
SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.0_GH0.tar.gz) = 10804
SHA256 (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c b/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c
deleted file mode 100644
index 5f459b2142e2..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- ../drizzle-nginx-module-0.1.8/src/ngx_http_drizzle_util.c.orig 2015-05-28 02:39:19.661703000 +0300
-+++ ../drizzle-nginx-module-0.1.8/src/ngx_http_drizzle_util.c 2015-05-28 02:41:12.655554000 +0300
-@@ -114,10 +114,8 @@
- u->resolved->ctx = NULL;
- }
-
-- if (u->state && u->state->response_sec) {
-- tp = ngx_timeofday();
-- u->state->response_sec = tp->sec - u->state->response_sec;
-- u->state->response_msec = tp->msec - u->state->response_msec;
-+ if (u->state && u->state->response_time) {
-+ u->state->response_time = ngx_current_msec - u->state->response_time;
-
- if (u->pipe) {
- u->state->response_length = u->pipe->read_length;
-@@ -588,10 +586,8 @@
-
- r->connection->log->action = "connecting to upstream";
-
-- if (u->state && u->state->response_sec) {
-- tp = ngx_timeofday();
-- u->state->response_sec = tp->sec - u->state->response_sec;
-- u->state->response_msec = tp->msec - u->state->response_msec;
-+ if (u->state && u->state->response_time) {
-+ u->state->response_time = ngx_current_msec - u->state->response_time;
- }
-
- u->state = ngx_array_push(r->upstream_states);
-@@ -603,9 +599,7 @@
-
- ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t));
-
-- tp = ngx_timeofday();
-- u->state->response_sec = tp->sec;
-- u->state->response_msec = tp->msec;
-+ u->state->response_time = ngx_current_msec - u->state->response_time;
-
- rc = ngx_event_connect_peer(&u->peer);
-
diff --git a/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config b/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
index 263f0cd45df8..dd9749e47555 100644
--- a/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
+++ b/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
@@ -1,5 +1,5 @@
---- ../drizzle-nginx-module-0.1.8/config.orig 2011-12-30 10:26:53.000000000 +0400
-+++ ../drizzle-nginx-module-0.1.8/config 2011-12-30 10:28:20.000000000 +0400
+--- ../drizzle-nginx-module-0.1.9/config.orig 2011-12-30 10:26:53.000000000 +0400
++++ ../drizzle-nginx-module-0.1.9/config 2011-12-30 10:28:20.000000000 +0400
@@ -22,12 +22,12 @@
if [ $ngx_found = no ]; then
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 141aa40d7fea..72162bcd8447 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -609,7 +609,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
.if ${PORT_OPTIONS:MDRIZZLE}
LIB_DEPENDS+= libdrizzle.so:${PORTSDIR}/databases/libdrizzle
-NGINX_DRIZZLE_VERSION= 0.1.8
+NGINX_DRIZZLE_VERSION= 0.1.9
GH_ACCOUNT+= openresty:drizzle
GH_PROJECT+= drizzle-nginx-module:drizzle
GH_TAGNAME+= v${NGINX_DRIZZLE_VERSION}:drizzle
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index b926828903ab..0455455cd5cd 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -70,8 +70,8 @@ SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec4
SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296
SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1
SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 16990
-SHA256 (openresty-drizzle-nginx-module-v0.1.8_GH0.tar.gz) = 5aa5a66568bb25af459d37547d14fc7867c970e4f90299895e1fad2cf20751a8
-SIZE (openresty-drizzle-nginx-module-v0.1.8_GH0.tar.gz) = 58891
+SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec023025333c34d6d0108026a1ce2e09b20a53e8e2d9bf65080
+SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = 59024
SHA256 (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679
SIZE (simpl-ngx_devel_kit-v0.2.19_GH0.tar.gz) = 65029
SHA256 (openresty-encrypted-session-nginx-module-v0.03_GH0.tar.gz) = 4d0da617b3122b145dd46ec8618c6248db79c992704b23ed78e01bddf14173d3
diff --git a/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config b/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
index 263f0cd45df8..dd9749e47555 100644
--- a/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
+++ b/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
@@ -1,5 +1,5 @@
---- ../drizzle-nginx-module-0.1.8/config.orig 2011-12-30 10:26:53.000000000 +0400
-+++ ../drizzle-nginx-module-0.1.8/config 2011-12-30 10:28:20.000000000 +0400
+--- ../drizzle-nginx-module-0.1.9/config.orig 2011-12-30 10:26:53.000000000 +0400
++++ ../drizzle-nginx-module-0.1.9/config 2011-12-30 10:28:20.000000000 +0400
@@ -22,12 +22,12 @@
if [ $ngx_found = no ]; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 06:35:06 +0000