kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade third-party drizzle module from 0.1.8 to 0.1.9.

Browse source 
Remove needless patch.
This commit is contained in:
Sergey A. Osokin 2015-12-04 11:46:39 +00:00
parent 93cea0397b
commit 12896bebff
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=402919
7 changed files with 11 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
www/nginx-devel/Makefile
View file

@ -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}

4
www/nginx-devel/distinfo
View file

@ -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

39
www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c
View file

@ -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);

4
www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
View file

@ -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

2
www/nginx/Makefile
View file

@ -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

4
www/nginx/distinfo
View file

@ -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

4
www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
View file

@ -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