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

fix and update the lua flavor

Browse Source
This commit is contained in:
robert 2014-09-21 14:00:16 +00:00
parent a49c3f1c90
commit b6cebef04d
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/nginx/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.60 2014/09/16 18:37:57 robert Exp $
# $OpenBSD: Makefile,v 1.61 2014/09/21 14:00:16 robert Exp $
COMMENT= robust and small HTTP server and mail proxy server
@ -67,9 +67,9 @@ DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
PATCHFILES+= nginx_chroot-20140823.patch:2
PATCH_DIST_STRIP= -p1
LUAV= 0.8.1
LUADISTFILES+= simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz:0
LUADISTFILES+= lua-nginx-module-${LUAV}.tar.gz:0
LUAV= 0.9.12
LUADISTFILES+= ngx_devel_kit-0.2.19.tar.gz:0
LUADISTFILES+= lua-nginx-module-${LUAV}.tar.gz:2
SUBSTFILES= conf/nginx.conf
NAXSIDISTFILES+= naxsi-0.53-1.tar.gz{0.53-1.tar.gz}:1
@ -81,7 +81,7 @@ WANTLIB+= m pthread stdc++
.endif
.if ${FLAVOR:Mlua}
CONFIGURE_ARGS+= --add-module=${WRKSRC}/simpl-ngx_devel_kit
CONFIGURE_ARGS+= --add-module=${WRKSRC}/ngx_devel_kit
CONFIGURE_ARGS+= --add-module=${WRKSRC}/lua-nginx-module
CONFIGURE_ENV+= MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
MODLUA_LIB=${MODLUA_LIB}
@ -107,7 +107,7 @@ pre-patch:
.if ${FLAVOR:Mlua}
pre-patch:
cd ${WRKSRC} && \
mv ../simpl-ngx_devel_kit-* simpl-ngx_devel_kit && \
mv ../ngx_devel_kit-* ngx_devel_kit && \
mv ../lua-nginx-module-${LUAV} lua-nginx-module
.endif

8
www/nginx/distinfo
View File

@ -1,10 +1,10 @@
SHA256 (lua-nginx-module-0.8.1.tar.gz) = G0+9z1V2X6chTQDT1w+cAtaSKXCwBWSWImEkduZemU8=
SHA256 (lua-nginx-module-0.9.12.tar.gz) = 6FwZJMpGcNVwi1jvzW53eTxD8kMxephQoRKWQGf2MVA=
SHA256 (naxsi-0.53-1.tar.gz) = zeF1+UDNLoxZW5VRJkLNP4rm88Si7hDC/aIU/+uAgnQ=
SHA256 (nginx-1.7.5.tar.gz) = 1nAAb77KIm0d0YrXSdn+b4sYZC+U3jN34KxppmDjyps=
SHA256 (nginx_chroot-20140823.patch) = 8cb6VZH1ptCbuJKyJnWRXAfHSmi5w4841nzwSCvcJRU=
SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = v1VA120YZ7RBEJHxbGx4b9ZnWQmcWUg8dsaENAIP2wI=
SIZE (lua-nginx-module-0.8.1.tar.gz) = 478976
SHA256 (ngx_devel_kit-0.2.19.tar.gz) = UB8pmr24G5kqmAvaGC5d5aSys+J1+/cu403XroTEtnk=
SIZE (lua-nginx-module-0.9.12.tar.gz) = 512403
SIZE (naxsi-0.53-1.tar.gz) = 165627
SIZE (nginx-1.7.5.tar.gz) = 817599
SIZE (nginx_chroot-20140823.patch) = 7304
SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
SIZE (ngx_devel_kit-0.2.19.tar.gz) = 65029

27
www/nginx/patches/lua-lua-nginx-module_src_ngx_http_lua_socket_tcp_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: lua-lua-nginx-module_src_ngx_http_lua_socket_tcp_c,v 1.1 2014/09/21 14:00:16 robert Exp $
--- lua-nginx-module/src/ngx_http_lua_socket_tcp.c.orig Wed Sep 3 05:48:16 2014
+++ lua-nginx-module/src/ngx_http_lua_socket_tcp.c Sun Sep 21 15:54:21 2014
@@ -3212,7 +3212,11 @@ ngx_http_lua_socket_tcp_finalize_read_part(ngx_http_re
ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
}
+#if defined(nginx_version) && nginx_version >= 1007005
+ if (c->read->posted) {
+#else
if (c->read->prev) {
+#endif
ngx_delete_posted_event(c->read);
}
@@ -3261,7 +3265,11 @@ ngx_http_lua_socket_tcp_finalize_write_part(ngx_http_r
ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
}
+#if defined(nginx_version) && nginx_version >= 1007005
+ if (c->write->posted) {
+#else
if (c->write->prev) {
+#endif
ngx_delete_posted_event(c->write);
}