cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade third-party lua module from 0.9.15 to 0.9.16.

Browse Source 
Remove needless patch.
This commit is contained in:
Sergey A. Osokin 2015-09-23 00:52:12 +00:00
parent c630bb7bde
commit d40787583d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=397601
6 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/nginx-devel/Makefile
View File

@ -654,12 +654,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
LIB_DEPENDS+= libluajit-5.1.so:${PORTSDIR}/lang/luajit
CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"
NGINX_LUA_VERSION= 0.9.15
NGINX_LUA_VERSION= 0.9.16
GH_ACCOUNT+= openresty:lua
GH_PROJECT+= lua-nginx-module:lua
GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua
CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_socket_udp.c
.endif
.if ${PORT_OPTIONS:MMEMC}

4
www/nginx-devel/distinfo
View File

@ -84,8 +84,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c
SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
SHA256 (openresty-lua-nginx-module-v0.9.15_GH0.tar.gz) = 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7
SIZE (openresty-lua-nginx-module-v0.9.15_GH0.tar.gz) = 520190
SHA256 (openresty-lua-nginx-module-v0.9.16_GH0.tar.gz) = a3cda55b8cba5bc6632aa270b8a02d543fdb43f4d60a3bd2cb411c2a3b467656
SIZE (openresty-lua-nginx-module-v0.9.16_GH0.tar.gz) = 523900
SHA256 (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = cd1999bc5e4441dd23d056202b0423c07b9a9294245147f4cf2ef6edb81b4122
SIZE (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = 37948
SHA256 (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0_GH0.tar.gz) = ed07cd5d0a1e7ac392854d8aa9243a69c5e33c92790ace90d3ce8694adce7460

20
www/nginx-devel/files/extra-patch-ngx_http_lua_socket_udp.c
View File

@ -1,20 +0,0 @@
--- ../lua-nginx-module-0.9.15/src/ngx_http_lua_socket_udp.c.orig 2015-04-21 21:18:31.080702000 +0300
+++ ../lua-nginx-module-0.9.15/src/ngx_http_lua_socket_udp.c 2015-04-21 21:18:47.449758000 +0300
@@ -1400,17 +1400,6 @@
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
-#if (NGX_THREADS)
-
- /* TODO: lock event when call completion handler */
-
- rev->lock = &c->lock;
- wev->lock = &c->lock;
- rev->own_lock = &c->lock;
- wev->own_lock = &c->lock;
-
-#endif
-
#if (NGX_HTTP_LUA_HAVE_SO_PASSCRED)
if (uc->sockaddr->sa_family == AF_UNIX) {
struct sockaddr addr;

3
www/nginx/Makefile
View File

@ -640,12 +640,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
LIB_DEPENDS+= libluajit-5.1.so:${PORTSDIR}/lang/luajit
CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"
NGINX_LUA_VERSION= 0.9.15
NGINX_LUA_VERSION= 0.9.16
GH_ACCOUNT+= openresty:lua
GH_PROJECT+= lua-nginx-module:lua
GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua
CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_socket_udp.c
.endif
.if ${PORT_OPTIONS:MMEMC}

4
www/nginx/distinfo
View File

@ -82,8 +82,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c
SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024
SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270
SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534
SHA256 (openresty-lua-nginx-module-v0.9.15_GH0.tar.gz) = 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7
SIZE (openresty-lua-nginx-module-v0.9.15_GH0.tar.gz) = 520190
SHA256 (openresty-lua-nginx-module-v0.9.16_GH0.tar.gz) = a3cda55b8cba5bc6632aa270b8a02d543fdb43f4d60a3bd2cb411c2a3b467656
SIZE (openresty-lua-nginx-module-v0.9.16_GH0.tar.gz) = 523900
SHA256 (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = cd1999bc5e4441dd23d056202b0423c07b9a9294245147f4cf2ef6edb81b4122
SIZE (openresty-memc-nginx-module-v0.15_GH0.tar.gz) = 37948
SHA256 (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0_GH0.tar.gz) = ed07cd5d0a1e7ac392854d8aa9243a69c5e33c92790ace90d3ce8694adce7460

20
www/nginx/files/extra-patch-ngx_http_lua_socket_udp.c
View File

@ -1,20 +0,0 @@
--- ../lua-nginx-module-0.9.15/src/ngx_http_lua_socket_udp.c.orig 2015-04-21 21:18:31.080702000 +0300
+++ ../lua-nginx-module-0.9.15/src/ngx_http_lua_socket_udp.c 2015-04-21 21:18:47.449758000 +0300
@@ -1400,17 +1400,6 @@
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
-#if (NGX_THREADS)
-
- /* TODO: lock event when call completion handler */
-
- rev->lock = &c->lock;
- wev->lock = &c->lock;
- rev->own_lock = &c->lock;
- wev->own_lock = &c->lock;
-
-#endif
-
#if (NGX_HTTP_LUA_HAVE_SO_PASSCRED)
if (uc->sockaddr->sa_family == AF_UNIX) {
struct sockaddr addr;