From nobody Sat Jan 25 11:46:28 2025 X-Original-To: dev-commits-ports-branches@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 4YgCZD4hZnz5lCM5; Sat, 25 Jan 2025 11:46:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YgCZD3YzJz3lcM; Sat, 25 Jan 2025 11:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737805588; 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=vRRlXBTAY61KBQIO90HET0WpFmKQsCGwH63KAA6IDc4=; b=XDBgRMaNazVSBGJXHz4ZCkw7gTKD1bzger/D+31xg+SIZBwb8UJg16JqMlH6+I+G4AELTX xE8CAIWy8aCvzToq2ARykFqg/qPJlXGqeNBJLMvfRFrbXn2EadNtGikt5Km1xjeFA9L/t7 eV86ijn2565clOdUu3jBEHFIn2Fbk6PAQBt2/vyPWsA7+Jh9gSOFAgJ6DtGr8Qmu4eofG2 NocweM8LbigsIXgoRNXsnd4ZbpU/stN+kE63eJ9y3/gJ5pk9pOd95MC9uoi9ELJbX7pXJM c0dZsd2id8l8IIyIAAFo2DnDIDOUHbd+X7LF5zxm73Gh6IpCCHyV0DaQku49Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737805588; 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=vRRlXBTAY61KBQIO90HET0WpFmKQsCGwH63KAA6IDc4=; b=Vx3BkEcsuWfgDctVvAZGEotMV3aM76dTI7Ky9YAbrvtmdObmaRWZ/4EqGVxVnNtz8w3/Ol JrNRGOqQ9uxORiMGTCJP741Hh3v9oxFX7y0kFjBT6HbchV7uw2g++V7pfJUxmO/ZZKnnoA IFzLdMTbDBxsAOQcsQpGbfu/+EEkKS2HZuy4ZEY5xRnSAXsYnoYLVWxzi8POdYZvhqcYO9 QPFowUXK9VhxHbC7F9JmnC/9JO+KAgsuJCr6hyjFozpLYLpxbQrqf1Z4ZgQZ7VaciJYIOw KwKJvV3bgN+eoEOJftPAZXJDBHt/fmFnpCKrxmLEU8X0wVAl0cd0ciRW/vsjjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737805588; a=rsa-sha256; cv=none; b=vC6tKF22fkFbrT477ddoEw+AGErMoIyp8V4JcsGtxiBy5xIGyFSrhq2eUIt3n41sYW/tdH gTZ2kBx+PTQ5w9/oDW24vI2ouMB1Mp7VQFvleQyw+DzYth7WMwgnFvCvLvwDLZRGMJZNdq JHdvaIUy9MNJ9fHnDhGuap7ZaWI/8rROCSs7iDQg+w/FxbaFthUQk1Lmepj8+0N208ZG6+ B25rRGId0WKAm44uQ0mCTQbfktplIoxr7oCAonzDZDRWMzjwqE/a8xZvCF7k2EXvZd1HFD sm9LRnNV2J0fbou5Edzuvw+rXLtbJcyFLAB8Z7QZ+xbDTw2xf9DnTVJPF7OvkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YgCZD36MMz19Zp; Sat, 25 Jan 2025 11:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50PBkSte089734; Sat, 25 Jan 2025 11:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50PBkS4h089731; Sat, 25 Jan 2025 11:46:28 GMT (envelope-from git) Date: Sat, 25 Jan 2025 11:46:28 GMT Message-Id: <202501251146.50PBkS4h089731@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: a3358d2d260a - 2025Q1 - =?utf-8?Q?www/angie-module-lua: Update 1.3.2 =E2=86=92 1.8.1?= List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: a3358d2d260a2bcb48e52f6a78f4260d6252c42f Auto-Submitted: auto-generated The branch 2025Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3358d2d260a2bcb48e52f6a78f4260d6252c42f commit a3358d2d260a2bcb48e52f6a78f4260d6252c42f Author: Vladimir Druzenko AuthorDate: 2025-01-23 23:30:35 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-25 11:45:02 +0000 www/angie-module-lua: Update 1.3.2 → 1.8.1 Changelogs: https://github.com/openresty/lua-nginx-module/releases/tag/v0.10.26 https://github.com/openresty/lua-nginx-module/releases/tag/v0.10.27 https://github.com/openresty/lua-nginx-module/releases/tag/v0.10.28 https://github.com/openresty/stream-lua-nginx-module/releases/tag/v0.0.14 https://github.com/openresty/stream-lua-nginx-module/releases/tag/v0.0.15 https://github.com/openresty/stream-lua-nginx-module/releases/tag/v0.0.16 https://github.com/vision5/ngx_devel_kit/releases/tag/v0.3.3 PR: 282394 Approved by: oleg@mamontov.net (maintainer, timeout 3 mounts) (cherry picked from commit b8a84bb0dc8e24569fed05b4792dad2b642c1340) --- www/angie-module-lua/Makefile | 8 +++---- www/angie-module-lua/files/patch-lua-config | 4 ++-- www/angie-module-lua/files/patch-stream-lua-config | 25 +++++++--------------- www/angie/distinfo | 12 +++++------ 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile index c7e2c2ac91c2..a8b3cff6d058 100644 --- a/www/angie-module-lua/Makefile +++ b/www/angie-module-lua/Makefile @@ -1,7 +1,7 @@ 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 +GH_TUPLE= openresty:lua-nginx-module:v0.10.28:lua +GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.16:lua_stream +GH_TUPLE+= vision5:ngx_devel_kit:v0.3.3:ndk COMMENT= Angie Lua dynamic module @@ -17,7 +17,7 @@ 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 + lua-resty-core>=0.1.29:www/lua-resty-core USES= luajit:luajit-openresty diff --git a/www/angie-module-lua/files/patch-lua-config b/www/angie-module-lua/files/patch-lua-config index 46b570724957..31a80a49c73b 100644 --- a/www/angie-module-lua/files/patch-lua-config +++ b/www/angie-module-lua/files/patch-lua-config @@ -1,5 +1,5 @@ ---- ../lua-nginx-module-0.10.25/config.orig -+++ ../lua-nginx-module-0.10.25/config +--- ../lua-nginx-module-0.10.28/config.orig ++++ ../lua-nginx-module-0.10.28/config @@ -45,9 +45,9 @@ NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" diff --git a/www/angie-module-lua/files/patch-stream-lua-config b/www/angie-module-lua/files/patch-stream-lua-config index ef3c1ea1033c..f6fc143022dd 100644 --- a/www/angie-module-lua/files/patch-stream-lua-config +++ b/www/angie-module-lua/files/patch-stream-lua-config @@ -1,8 +1,8 @@ ---- ../stream-lua-nginx-module-0.0.13/config.orig -+++ ../stream-lua-nginx-module-0.0.13/config -@@ -45,9 +45,9 @@ +--- ../stream-lua-nginx-module-0.0.16/config.orig ++++ ../stream-lua-nginx-module-0.0.16/config +@@ -45,9 +45,9 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then 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" @@ -10,11 +10,11 @@ - 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 @@ +@@ -71,9 +71,9 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then 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" @@ -22,14 +22,5 @@ - 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/distinfo b/www/angie/distinfo index 66e92564c29c..a1fa308393c1 100644 --- a/www/angie/distinfo +++ b/www/angie/distinfo @@ -25,12 +25,12 @@ SHA256 (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = c8c8a01c27e3aab853ddd437c11 SIZE (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = 16453 SHA256 (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = c4e5d2a03ead32cfccb9f04f01a8cdf664f5deca3f677c13b1509bff832cf2c7 SIZE (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = 24150 -SHA256 (openresty-lua-nginx-module-v0.10.25_GH0.tar.gz) = bc764db42830aeaf74755754b900253c233ad57498debe7a441cee2c6f4b07c2 -SIZE (openresty-lua-nginx-module-v0.10.25_GH0.tar.gz) = 725616 -SHA256 (openresty-stream-lua-nginx-module-v0.0.13_GH0.tar.gz) = 01b715754a8248cc7228e0c8f97f7488ae429d90208de0481394e35d24cef32f -SIZE (openresty-stream-lua-nginx-module-v0.0.13_GH0.tar.gz) = 376245 -SHA256 (vision5-ngx_devel_kit-v0.3.2_GH0.tar.gz) = aa961eafb8317e0eb8da37eb6e2c9ff42267edd18b56947384e719b85188f58b -SIZE (vision5-ngx_devel_kit-v0.3.2_GH0.tar.gz) = 66551 +SHA256 (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 634827d54de6216cb0502d14f76610788b3a3e33160e91d5578d6db0d9a34a20 +SIZE (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 869217 +SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d +SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259 +SHA256 (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b +SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561 SHA256 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72 SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9