Hi, so nginx lua module was disabled in january because of a libressl breakage: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/nginx/Makefile.diff?r1=1.107&r2=1.108&f=h http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/nginx/Makefile.diff?r1=1.105&r2=1.106&f=h
i needed to test something with it, and thanks to fcambus@ who also looked at it, in the end the libressl breakage was fixed upstream in https://github.com/openresty/lua-nginx-module/commit/cc0a793a27af48a364b951a374716b8cd5221487 and an update to 0.10.11 just builds fine on current. Thus the attached Makefile diff is mostly reverting r1.108 and 1.106 and updating lua-nginx-module - i only bumped -main and -lua as i dont think others should be bumped - added LIB_DEPENDS-lua too. Runtime testing in the coming hours. okays ? Landry
Index: Makefile =================================================================== RCS file: /cvs/ports/www/nginx/Makefile,v retrieving revision 1.116 diff -u -r1.116 Makefile --- Makefile 15 Nov 2017 21:28:05 -0000 1.116 +++ Makefile 4 Jan 2018 14:12:05 -0000 @@ -17,6 +17,8 @@ VERSION= 1.12.1 REVISION= 1 +REVISION-main= 2 +REVISION-lua= 2 DISTNAME= nginx-${VERSION} CATEGORIES= www @@ -42,7 +44,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ngx_devel_kit-v0.3.0.tar.gz{v0.3.0.tar.gz}:0 \ naxsi-0.55.1.tar.gz{0.55.1.tar.gz}:1 \ - lua-nginx-module-v0.10.6.tar.gz{v0.10.6.tar.gz}:2 \ + lua-nginx-module-v0.10.11.tar.gz{v0.10.11.tar.gz}:2 \ headers-more-nginx-module-v0.32.tar.gz{v0.32.tar.gz}:4 HOMEPAGE= http://nginx.org/ @@ -52,15 +54,8 @@ # BSD-like PERMIT_PACKAGE_CDROM= yes -# XXX -lua removed following libressl api change; re-add to -# MULTI_PACKAGES when this is worked-around MULTI_PACKAGES = -main -image_filter -geoip -xslt -mailproxy -stream \ - -naxsi -perl -passenger -headers_more # -lua - -FLAVOR ?= -PSEUDO_FLAVORS = no_lua - -.include <bsd.port.arch.mk> + -naxsi -perl -passenger -headers_more -lua WANTLIB-main= c z pcre ssl crypto WANTLIB-mailproxy= @@ -81,6 +76,7 @@ textproc/libxslt LIB_DEPENDS-image_filter=graphics/gd LIB_DEPENDS-geoip= net/GeoIP +LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS} RUN_DEPENDS-main= # blank (override addition from lua.port.mk) RUN_DEPENDS-mailproxy= www/nginx,-main=${VERSION} @@ -113,7 +109,7 @@ -I "${LOCALBASE}/include" \ -L "${X11BASE}/lib" -MODULES+= lang/ruby +MODULES+= lang/ruby lang/lua MODRUBY_BUILDDEP= No MODRUBY_RUNDEP= No @@ -122,12 +118,8 @@ CONFIGURE_STYLE= simple -.if ${BUILD_PACKAGES:M-lua} -MODULES+= lang/lua CONFIGURE_ENV+= MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \ MODLUA_LIB=${MODLUA_LIB} -CONFIGURE_ARGS+= --add-dynamic-module=${WRKSRC}/lua-nginx-module -.endif CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \ --conf-path=${SYSCONFDIR}/nginx/nginx.conf \ @@ -159,6 +151,7 @@ --with-stream=dynamic \ --add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \ --add-dynamic-module=${WRKSRC}/ngx_devel_kit \ + --add-dynamic-module=${WRKSRC}/lua-nginx-module \ --add-dynamic-module=${WRKSRC}/headers-more-nginx-module \ --add-dynamic-module=${LOCALBASE}/lib/phusion-passenger${GEM_BIN_SUFFIX}/src/nginx_module Index: distinfo =================================================================== RCS file: /cvs/ports/www/nginx/distinfo,v retrieving revision 1.62 diff -u -r1.62 distinfo --- distinfo 14 Nov 2017 16:43:09 -0000 1.62 +++ distinfo 4 Jan 2018 14:12:05 -0000 @@ -1,11 +1,11 @@ SHA256 (headers-more-nginx-module-v0.32.tar.gz) = xtnauOofyZcDEAfi6PR8ztAUF+IDzYjVOp/p9q4ThyA= -SHA256 (lua-nginx-module-v0.10.6.tar.gz) = uYxPZIWJu/Piw9X9GGZOen74msCD6WyOmE+pGeenwHM= +SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY= SHA256 (naxsi-0.55.1.tar.gz) = Rd0N96awtqqcZOuMOajilNZZ2H+xjhks9Y8UAvPNsKg= SHA256 (nginx-1.12.1-chroot.patch) = PJF/2hg+WkMNlTXBhipDffH/v+46fm4zNqHFy7O6hzw= SHA256 (nginx-1.12.1.tar.gz) = h5O/QmSFow+RAhtrlFqf2KhNh9F7VmViw3l6uo+sdvs= SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk= SIZE (headers-more-nginx-module-v0.32.tar.gz) = 28033 -SIZE (lua-nginx-module-v0.10.6.tar.gz) = 597217 +SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653 SIZE (naxsi-0.55.1.tar.gz) = 185997 SIZE (nginx-1.12.1-chroot.patch) = 8196 SIZE (nginx-1.12.1.tar.gz) = 981093