From nobody Wed Feb 21 19:21:41 2024 X-Original-To: dev-commits-ports-main@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 4Tg5jy0Nb4z5BB9P; Wed, 21 Feb 2024 19:21:42 +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 4Tg5jx5hmPz42qQ; Wed, 21 Feb 2024 19:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708543301; 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=6Irl405dW5nDxZPHoZZLP3S6P8vbzaoZybFtsL8LUoQ=; b=dZx2HPOQNBpeAvDqmivxljhQohcEi+y9HehVplImVwTBuQCHDn82yqmCQfujwsU7FUDAAC rRIP+dzWgVDlDureF0GTyb1HyvKNyK5bYgOGnErKa3de0/EV2+jOwREcbvmBzoV+rE59xM f2KBtCOcXQ00a/ei8P8c9mW97iOK/gCxMmTp8wZ39g3oNsYXcEUKnFSrKAkmFEISq33zmH 6Z4kv02IPMaN1arhrWK3IlgsT3Ah5XEAAy2T/D3QpaYTx1eSfz8B5X2BUt3nZbGKyt2abL BICRmfzTwwwSTGl4qQ3lelQK249/QotPsChHWH/eQjbFdYYf7MdEBpGOx7rtFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708543301; 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=6Irl405dW5nDxZPHoZZLP3S6P8vbzaoZybFtsL8LUoQ=; b=MjGINampCFnGPAycbOEbCz8L0M3GgLg2u675zmGoHIqqE4A0COTu/mBOdl7/bzt4dPpgKd O7pJ/Wv2WHS48oylEs5BUdmbzfhqf2rcElMvnlU9kQXgfwHXu1eWtEt5pZZjE1jSB+oeBC mK1TOn8uOu3ZPQdGEuox8+1zXTTHu7AS7VZwcVxQxtqcjqPwKva/vpth7yM/R8WwKEdFek Kul3lvyJSK00pEuw+fbCnFpL82Ojxl36OTkqr7+pHTmB/JWecX5eIrVi7vKwIIb21tOqqw sgnscjYiIlS7gF9SXkQ1HxtCp79k//MhQvLhuUez2ffR5dMpqwLKGR/T5dzP+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708543301; a=rsa-sha256; cv=none; b=SATF0d+vkt3alCeFY7Rcb4borgjO6Thur/O+DxbbAQQGidCnBr1yle9Z8/5oDMI51/JRU6 v1tGwYmTaUMaN+IyeyNg3iYBUurZ0Pws5mMQue/y/SKQgoQKDHhlRQudd5+Ix1mrZq2gpg Wh+/4ijWGwcu44DAZqXYoA/ijIctXvz9cmAvk5u04ykiv8McUSY7lOozYb2gsSlhkSuk0s imQiEa2WdBZMMTJD6TwkMBnaneucJnCmWUvLGSCG342nJz1NyMOXRbkg3Fu2zTVeReWUt/ SIhwuOZ5EEOdqJWFXutWyenEHQkT4x39OP7jT4cYLytNFpsjf79BHitJlOzDSA== 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 4Tg5jx4n7Vz1FcH; Wed, 21 Feb 2024 19:21:41 +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 41LJLf2w081359; Wed, 21 Feb 2024 19:21:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LJLfTj081356; Wed, 21 Feb 2024 19:21:41 GMT (envelope-from git) Date: Wed, 21 Feb 2024 19:21:41 GMT Message-Id: <202402211921.41LJLfTj081356@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: 51f2e5e1228d - main - www/nginx: Fix nginx with LUA after lua-resty-core update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51f2e5e1228ddfa53ac91a51f1b68273d1bce45c Auto-Submitted: auto-generated The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=51f2e5e1228ddfa53ac91a51f1b68273d1bce45c commit 51f2e5e1228ddfa53ac91a51f1b68273d1bce45c Author: Christos Chatzaras AuthorDate: 2024-02-21 19:14:26 +0000 Commit: Florian Smeets CommitDate: 2024-02-21 19:21:20 +0000 www/nginx: Fix nginx with LUA after lua-resty-core update In f08bfacc8fd6 lua-resty-core was updated this requires an updated version of openresty-lua-nginx-module. To prevent further people from bricking their nginx update the openresty-lua-nginx-module 3rd party module to 0.10.26. Otherwise people will find an nginx that does not start anymore with the following error message: nginx: [alert] failed to load the 'resty.core' module (https://github.com/openresty/lua-resty-core); ensure you are using an OpenResty release from https://openresty.org/en/download.html (reason: /usr/local/share/lua/5.1/resty/core/base.lua:24: ngx_http_lua_module 0.10.26 required) in /usr/local/etc/nginx/nginx.conf:1044 PR: 277145 Approved by: portmgr (blanket, just fix it) --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 2 +- www/nginx/distinfo | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index a5cb24a6812a..3e431ec495d9 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.24.0 -PORTREVISION?= 14 +PORTREVISION?= 15 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 29185702dee2..f3f6d0526210 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -226,7 +226,7 @@ LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib -LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.25:lua +LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.26:lua LUA_VARS= DSO_EXTMODS+=lua LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link diff --git a/www/nginx/distinfo b/www/nginx/distinfo index f9d579b4f120..3e48677696fc 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1693596932 +TIMESTAMP = 1708285506 SHA256 (nginx-1.24.0.tar.gz) = 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d SIZE (nginx-1.24.0.tar.gz) = 1112471 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -103,8 +103,8 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617 SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656 -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-lua-nginx-module-v0.10.26_GH0.tar.gz) = a75983287a2bdc5e964ace56a51b215dc2ec996639d4916cd393d6ebba94b565 +SIZE (openresty-lua-nginx-module-v0.10.26_GH0.tar.gz) = 745785 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b