From nobody Mon Nov 14 18:29:57 2022 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 4N9yXQ2Ccfz4hk6K; Mon, 14 Nov 2022 18:29: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 4N9yXQ1cmsz4Nsc; Mon, 14 Nov 2022 18:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668450598; 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=lxvfaHOJaGuNztrLSkKXYk8+w5qj1x+jW3fmL2AGd1w=; b=E8am7k01J4k+IdHAmcaSKjWWi1yb5NhNLd/iq9PiGPBPfYk+n0uK3IQ7Qw4ZzNYDwBtgEq 597fbv8ObYwoqeDjNkZan0PRDBmzR3T/Xx9uMVXa0rRsBaN84gMqd38kEN+n8FO45P4/kW m287DDMacPOrCSRDPhgzQkyIFUj41VgWTGCuWDmxlSfBCsbl8maOZ5yh2MsYj4At7FQddV JUHBLquBs9kz6fd+lYliIgn/FGHH4e4iNW4f3BTcOZph7lJz04PV1ff5muKNAOA8/5C7x/ 8chAwh8dexLsn/Z3ELC4e2h17tX9RB6QxB2baPEJLdo1Shn2JzW5YN78um5n/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668450598; 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=lxvfaHOJaGuNztrLSkKXYk8+w5qj1x+jW3fmL2AGd1w=; b=cf7j4Y4qkfo+JKI9vxyWWhnoYNkmsvVLJNx34v9knxkUvncAuFmBy2nVVjCIYsmS6Tj+cF Xdyy3H/XuiTqdlQq1/x56ZS9Hi2cIHpJy09x93VyP3fr0TzJBkz7PTDM/Rb+moc1MYpfYc ND7M0AOWmNj/zaFV9gqPnR4Y9OyQBqDpUu79HKMe3LQmQC9PFJ6sKUe8Ct44lktpj5pawP X7agxGGgg7gXshQTPvj+e5yuCd+NZzQKutifgifCfVLVV3IikKsz07VDs7ViB5DTUZYqie KwkgdvRxQOgdHWJ/+3t+j4J34L8tFzOwUK9EG3eQvfNHbNNDthEDftI/HBPDvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668450598; a=rsa-sha256; cv=none; b=wgkRP1sYxORzEAZb2Gi2HWjRQm5N0jH9uDEaGbg5hzHrBRfIqOkvrE7nfzEo6VetFqcK0g roFUJMvXqSukiMFpXY9YsjANDGwtr8WKg8DZPTo0j2f0bqcGgFr1hyPngau4WTuDa40kXm 00Q8YYcX6Twmp1L0OjnJ3uyh5muL8YSQBP+QzFqFCpECTtcaZWHLngi2ZqpXX1D9PYJMyj WnTCHn/a7PLXv5aKS55/iRSbxrs5XRyg6W0duvBhs5M0XwgvSw3G5IJjiwvBEgPzhjPLSu rb2UYKNFiNXkDVODXt+GSv4aZQEKSQ46fiJwT0UjgE16nDRVLwzcGiMWbJ0GVQ== 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 4N9yXQ0fkZzsCy; Mon, 14 Nov 2022 18:29:58 +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 2AEITvZU038658; Mon, 14 Nov 2022 18:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AEITvFl038657; Mon, 14 Nov 2022 18:29:57 GMT (envelope-from git) Date: Mon, 14 Nov 2022 18:29:57 GMT Message-Id: <202211141829.2AEITvFl038657@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Florian Smeets Subject: git: b36da0c4991d - 2022Q4 - www/nginx: Fix nginx after lua-resty-core update 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: flo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: b36da0c4991dd77a4fbc08bff5087264279e4972 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=b36da0c4991dd77a4fbc08bff5087264279e4972 commit b36da0c4991dd77a4fbc08bff5087264279e4972 Author: bagas AuthorDate: 2022-11-10 19:27:41 +0000 Commit: Florian Smeets CommitDate: 2022-11-14 18:06:39 +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 (cherry picked from commit 48a7ce510ad18eea66a32b0b8e9a69e9a564ee1a) --- 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 97a171f3bce6..d43d9cb4d6ab 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.22.0 -PORTREVISION?= 8 +PORTREVISION?= 9 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 046a9915ebbd..ee37051af61a 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 dcf9ef957a88..5c15c80833b7 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