From nobody Fri Sep 22 05:07:57 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsKz21rrwz4vWSt; Fri, 22 Sep 2023 05:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsKz208DNz3g7x; Fri, 22 Sep 2023 05:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695359278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oJE2weJZ3gYAfMx8RLb+mo0Xyym66LIb/raeSrskGx4=; b=WsKQ3PtpniP1ePRrYvTQQPIMBGydUyuaScakcSvy7EIg1/h09z+1Q8c8LW64LJwlK4mlE9 e6BKFWsGYfFUp3r+YQsQ3n4XX6SSpNLfR8xKQKmLQjR2khke+364SzeilphXfsLHU9HOeS 3SFwq1mnppcgclGVqEtrrgDzd44dFIdCSh1g63JBWVsRPOu0ufSlM8vL40DQ+IufrkMKGE rp3R51HxDnEqasUpGoNP7+KtIs55hGHl8VNg3MghBCug047GFdET4zhHc9npBuNJ8XnFhS R0DHnKESQHgd03sovYEtHIgZk2NzXnynZ6eooi2IWxRTLkquIN62AXNa7664RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695359278; a=rsa-sha256; cv=none; b=xYjA5kPGrqSiT0t5LoJ/fT7TCSv5X6wM+1i60YlAqgS5DeC/H1h8VeJFvUzwDCVQeTrSzS LhcTZWDFbBPATLkJgfdaoDXlO5c0MeiybdXFttAwhAfT3nrFTIf6TLSZ3IqC7RCnANyYdZ 4yaXiUw33w+d5NX4XfrzEricr2Xj/pt4MmmyHRiK7PyGlf1k5Vc1N22FrgvzhN+/jX38I4 inznqPjmw04DL6A5BknY0ZmwIMnN2pUUdcsd4dDiZ506NKsGq4xHylxzXq5mf/cVurEDzM vdDFX1mFJMjqSbrq5bkc5qT5hRTzMBcr1PXV5gtipWw8h/mPAoRjUBzUA/jcNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695359278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oJE2weJZ3gYAfMx8RLb+mo0Xyym66LIb/raeSrskGx4=; b=bnXP285/Ylj2UadhThlIidBdwo195OtoAc2mxI7iTqrks3j7ozc8op06u0Xo1wgIbxn3nO FhRhu8A1ypu7aiHECiew1hk6vvHI1fglj2haGnfBwWI+lnZIZfyFaq4JTbaBRwcRXLFSjN NmN35+IDSR4B1EJB/Q9ZAma2JxZTD4cwq1YDFCihyEVQVxItNVCK1TAwjG4pAG7rxXxua1 wN1kaFoO2H+G+VzPKB1eEFgaXuyB5SXNmgX22XrHUn/5AYZ20HdhwIJaN2+HHQHKJ+hdQV hbOUIyCbgxIY4neIrYtRKa9N8fi2BQaiESddQqhkGczwnUZ5Y4fOVdMW1wSR5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsKz16MHRz17YR; Fri, 22 Sep 2023 05:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38M57vgG066190; Fri, 22 Sep 2023 05:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38M57vrI066187; Fri, 22 Sep 2023 05:07:57 GMT (envelope-from git) Date: Fri, 22 Sep 2023 05:07:57 GMT Message-Id: <202309220507.38M57vrI066187@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: c514bb25ddcd - main - www/angie-module-lua: Angie Lua dynamic module List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c514bb25ddcd78330d893858605e61d79156acf1 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=c514bb25ddcd78330d893858605e61d79156acf1 commit c514bb25ddcd78330d893858605e61d79156acf1 Author: Oleg A. Mamontov AuthorDate: 2023-09-19 21:48:14 +0000 Commit: Robert Clausecker CommitDate: 2023-09-22 04:54:46 +0000 www/angie-module-lua: Angie Lua dynamic module Module embeds the power of Lua into Angie HTTP and STREAM servers. By leveraging Angie's subrequests, this module allows the integration of the powerful Lua threads (known as "coroutines") into the Angie event model. PR: 273462 --- www/Makefile | 1 + www/angie-module-lua/Makefile | 45 ++++++++++++++++++++++ www/angie-module-lua/files/patch-lua-config | 26 +++++++++++++ www/angie-module-lua/files/patch-stream-lua-config | 35 +++++++++++++++++ www/angie-module-lua/files/pkg-message.in | 18 +++++++++ www/angie-module-lua/pkg-descr | 3 ++ www/angie-module-lua/pkg-plist | 6 +++ www/angie/distinfo | 6 ++- 8 files changed, 139 insertions(+), 1 deletion(-) diff --git a/www/Makefile b/www/Makefile index 3aa3842f777c..8447e307aa86 100644 --- a/www/Makefile +++ b/www/Makefile @@ -40,6 +40,7 @@ SUBDIR += angie-module-image-filter SUBDIR += angie-module-jwt SUBDIR += angie-module-keyval + SUBDIR += angie-module-lua SUBDIR += angie-module-ndk SUBDIR += angie-module-njs SUBDIR += angie-module-perl diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile new file mode 100644 index 000000000000..c7e2c2ac91c2 --- /dev/null +++ b/www/angie-module-lua/Makefile @@ -0,0 +1,45 @@ +PORTNAME= angie-module-lua +GH_TUPLE= openresty:lua-nginx-module:v0.10.25:lua +GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.13:lua_stream +GH_TUPLE+= vision5:ngx_devel_kit:v0.3.2:ndk + +COMMENT= Angie Lua dynamic module + +LICENSE_FILE= ${WRKSRC_lua}/README.markdown + +LIB_DEPENDS= libpcre.so:devel/pcre + +CONFIGURE_ADD= --add-dynamic-module=${WRKSRC_lua} \ + --add-dynamic-module=${WRKSRC_lua_stream} \ + --add-dynamic-module=${WRKSRC_ndk} + +CONFIGURE_ENV= LUAJIT_INC=${LUAJIT_INCDIR} \ + LUAJIT_LIB=${LOCALBASE}/lib + +RUN_DEPENDS= angie-module-ndk==${PKGVERSION}:www/angie-module-ndk \ + lua-resty-core==0.1.27:www/lua-resty-core + +USES= luajit:luajit-openresty + +MASTERDIR= ${.CURDIR}/../../www/angie + +do-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${MODDIR} + +.for i in ngx_http_lua_module ngx_stream_lua_module + ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} +.endfor + + ${INSTALL_MAN} ${WRKSRC_lua}/README.markdown \ + ${STAGEDIR}${DOCSDIR}/README.lua-nginx-module.markdown + ${INSTALL_MAN} ${WRKSRC_lua_stream}/README.md \ + ${STAGEDIR}${DOCSDIR}/README.stream-lua-nginx-module.md + +do-install-DEBUG-on: +.for i in ngx_http_lua_module ngx_stream_lua_module + ${INSTALL} ${COPY} -m ${_SHAREMODE} ${WRKSRC_DEBUG}/objs/${i}.so \ + ${STAGEDIR}${MODDIR}/${i}-debug.so +.endfor + +.include "${MASTERDIR}/Makefile" diff --git a/www/angie-module-lua/files/patch-lua-config b/www/angie-module-lua/files/patch-lua-config new file mode 100644 index 000000000000..46b570724957 --- /dev/null +++ b/www/angie-module-lua/files/patch-lua-config @@ -0,0 +1,26 @@ +--- ../lua-nginx-module-0.10.25/config.orig ++++ ../lua-nginx-module-0.10.25/config +@@ -45,9 +45,9 @@ + NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" + + if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" ++ ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" + else +- ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" ++ ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" + fi + + . auto/feature +@@ -71,9 +71,9 @@ + NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" + + if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" ++ ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" + else +- ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" ++ ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" + fi + + . auto/feature diff --git a/www/angie-module-lua/files/patch-stream-lua-config b/www/angie-module-lua/files/patch-stream-lua-config new file mode 100644 index 000000000000..ef3c1ea1033c --- /dev/null +++ b/www/angie-module-lua/files/patch-stream-lua-config @@ -0,0 +1,35 @@ +--- ../stream-lua-nginx-module-0.0.13/config.orig ++++ ../stream-lua-nginx-module-0.0.13/config +@@ -45,9 +45,9 @@ + NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" + + if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" ++ ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" + else +- ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" ++ ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" + fi + + . auto/feature +@@ -71,9 +71,9 @@ + NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" + + if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" ++ ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" + else +- ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" ++ ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" + fi + + . auto/feature +@@ -436,7 +436,7 @@ + . auto/feature + + if [ $ngx_found = yes ]; then +- CORE_LIBS="-Wl,--require-defined=pcre_version $CORE_LIBS" ++ : + fi + ;; + esac diff --git a/www/angie-module-lua/files/pkg-message.in b/www/angie-module-lua/files/pkg-message.in new file mode 100644 index 000000000000..24658aa47616 --- /dev/null +++ b/www/angie-module-lua/files/pkg-message.in @@ -0,0 +1,18 @@ +[ +{ type: install + message: <