From nobody Thu Nov 10 19:45:51 2022 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 4N7XPr0xTjz4dvLX; Thu, 10 Nov 2022 19:45:52 +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 4N7XPr0Kbnz44nF; Thu, 10 Nov 2022 19:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668109552; 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=Nf3L4C0T6yrmBlkyZl35j+Bqx771u8bpB0o5SaIXIs4=; b=hhvbumXYZ5qetHZjx0knqApjfjCW2Tum4OXiO5RC4Qw2X9hZT3JT/O0rYYjGlmulKxE3s5 EdLBM75Sh8fdl1offynNPwyVekP8pJutEcsU57nLjBUHr8MqwAP9pYbmHGEyGDh/me2OZf zTZ47pOInrg+UQnT1nHEMQkDazXvOuRJK4/cw4uUcrOjkn5pViWVt77p/j3xa2Nlu3wPNm H8HxM04HYU83b0KinuXDu9KHir8xv62mO0jJR20ZRl8N577tClFH0o75ROQFdJKYnFIDxl ctHaKEO4xHEm3mHAzqQjZIeImLObCC1O5qdUyu7vRygplIOLqWcB3AKPRL9t1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668109552; 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=Nf3L4C0T6yrmBlkyZl35j+Bqx771u8bpB0o5SaIXIs4=; b=A2aGwj8o98nDpIwAbxd26dZ0I/I/V/euQprhpRoIcFvIZ7iLCo7ASZie8NYzSuEmRkLwQ6 Tv5OYpXP1enaCbkMzcBODffEiVb4D3Mera+S35NkVlvPgdJlr8neDBzVJ7VAF+H96sNAl9 O25BoKdDwgMA3NWpIO8Vwpfrb7XNrjO6Y2YXCmocBPkheThmnYjIc37ffTIs+GunDkLcHV eu7zRN3t0ut0c+50ecY6TfXB9FYO74kBcoSn8zfLIPSuOJQd9P4bsc9vjZKWKnEgiYfJur p4+VBR/npfk373qQcS4P6yQOdcptAeVHVrHSSnuUispMXN6+dyj3c69GDm2KnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668109552; a=rsa-sha256; cv=none; b=xhvf2HUsHCDSwqq7NXJdpzfZ+RNIU27pn0h/DlHWZ+amCsEXa0ZU9v5pKuHaHPWxAkSiYv qW6AVI407VmnBlln1+C4eh3r7HMUreOem6QO2OlUNfeiLtSFouj3aFlMl5W4+c/kXl3LgA R0VldtAI6Pn4UIGJXHGQs9WxK41rTkNur56JwdQVh3C7rn00O9lhF3GgEs/cm875/Ia4ae NEGi0bO+lwX5b6ACOTJihQy+CcPCUNY+VQkzkleQYfPPPz6+xIqMOQxz2qJzvADA7aU41g dYX9SseH2Nk3WOwK5+mt99BvzYvo2tZIvrzYHWdU5sFBe8HtBZcD0HUYyyHcTw== 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 4N7XPq6PLgzDwG; Thu, 10 Nov 2022 19:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AAJjpeL043401; Thu, 10 Nov 2022 19:45:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AAJjpMk043400; Thu, 10 Nov 2022 19:45:51 GMT (envelope-from git) Date: Thu, 10 Nov 2022 19:45:51 GMT Message-Id: <202211101945.2AAJjpMk043400@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: 48a7ce510ad1 - main - www/nginx: Fix nginx 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: 48a7ce510ad18eea66a32b0b8e9a69e9a564ee1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=48a7ce510ad18eea66a32b0b8e9a69e9a564ee1a commit 48a7ce510ad18eea66a32b0b8e9a69e9a564ee1a Author: bagas AuthorDate: 2022-11-10 19:27:41 +0000 Commit: Florian Smeets CommitDate: 2022-11-10 19:42:31 +0000 www/nginx: Fix nginx after lua-resty-core update Update 3rd party module ngx_http_lua_module to 0.10.22 otherwise nginx fails to start 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:23: ngx_http_lua_module 0.10.22 required) in /usr/local/etc/nginx/nginx.conf:76 This has been broken for almost two weeks, use the "Trivial and tested build and runtime fixes" blanket from 22.8.1 of the committers guide to prevent more people from breaking their production setups. nginx-devel already has version 0.10.22 of the module. PR: 267418 --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 2 +- www/nginx/distinfo | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index fbb21e6a1de2..0b08c5cf37aa 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.22.1 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 987a9c9e9ba5..f04b1ec3701e 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -221,7 +221,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.21:lua +LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.22:lua LUA_VARS= DSO_EXTMODS+=lua MEMC_GH_TUPLE= openresty:memc-nginx-module:v0.19:memc diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 5d75f63c31d7..24e230b6e3b3 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -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.21_GH0.tar.gz) = 9db756000578efaecb43bea4fc6cf631aaa80988d86ffe5d3afeb9927895ffad -SIZE (openresty-lua-nginx-module-v0.10.21_GH0.tar.gz) = 690938 +SHA256 (openresty-lua-nginx-module-v0.10.22_GH0.tar.gz) = 294d3d4b2d14fda1b8c539ff86f90047d203df861eb9a1ac44ec5c679ef55408 +SIZE (openresty-lua-nginx-module-v0.10.22_GH0.tar.gz) = 690975 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.2_GH0.tar.gz) = f8d3ff15520df736c5e20e91d5852ec27e0874566c2afce7dcb979e2298d6980