From nobody Thu Jan 06 13:52:04 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 BA0A31937A83; Thu, 6 Jan 2022 13:52:04 +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 4JV77m3Kdqz4mwp; Thu, 6 Jan 2022 13:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 530F520EA3; Thu, 6 Jan 2022 13:52:04 +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 206Dq499037768; Thu, 6 Jan 2022 13:52:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206Dq4b3037767; Thu, 6 Jan 2022 13:52:04 GMT (envelope-from git) Date: Thu, 6 Jan 2022 13:52:04 GMT Message-Id: <202201061352.206Dq4b3037767@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 5c3aa1bdf23d - main - www/nginx: Rollback 3rd Party Module NJS 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c3aa1bdf23d8ec6141b981cd0f7453810cdac4a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641477124; 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=JfhaAA1ERuhOHyPOkmDPOvnga7DVlqwvmgRg+meaY0I=; b=BMventUXzG25lgJIG+R7YO03MdCZF4Z8BBW2WCqXS4qedS/N7LvbKdfBf/p5tTWBQFmjad 9pkKNFYcNvhxDoJEQYFyTv7dTlw1Q0P0IRAMp6OQDwCOpSh0YD8VGRVFwBs5t463DmZzkB f7K7Xi3sTacLduB8XmXkqlrXvEknltEgz5OVd1hDEO5GMefVZee1HIHTrtIQOeT0uDqEj2 92ECL+w0uqnM0TZQ0azc4VJJHbHpFX0JfAIxrCRYzDuDYD5gswgNClFcd+Mwc7rgp91aA9 IeTefy6fNcOHq8Rc8+Lc2ItLla9j2oosyq5M8AFLDrAZD9WKH3qio+SGfX8iAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641477124; a=rsa-sha256; cv=none; b=aLYfpxaQQh8cl+zkdCWCDHfwY9eSWzfucaSI/z7QsSVlqaEdVuzHW3buc3QD44wVcB9dPA XE9u926VaNSfggOyuBvEsR6BrMOdwxs90W8XgylcZ32pefLFft0z+gvlkF1WGVwKfr8c2A I3EmS2yuypSMKFe1EAmiL8Lg6BLSWZVHX3bpcJkPR0OMEYFMgBnvzA13LPBF8TVy+TrdCN ETxK+/byosmu2UqtP+sOeD4QPlwdZnURBdo7LkuKcmmriTz1Q89DWeychL/wglRwoqkr4o POL6N7rkNwN4FOkbTXDlNEVrPN1nn5wwMgmKEEsEoanPwSSQHBFphQe/JrnQAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c3aa1bdf23d8ec6141b981cd0f7453810cdac4a commit 5c3aa1bdf23d8ec6141b981cd0f7453810cdac4a Author: Jochen Neumeister AuthorDate: 2022-01-06 13:43:08 +0000 Commit: Jochen Neumeister CommitDate: 2022-01-06 13:51:58 +0000 www/nginx: Rollback 3rd Party Module NJS Rollback the 3rd Party Module NJS from 0.71 to 0.70 The Version 0.71 needs pcre2, but this is only available from NGINX version 1.21.5 onwards Sponsored by: Netzkommune GmbH --- 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 3c301fbede0f..afd903ce2ba7 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,7 +2,7 @@ PORTNAME= nginx PORTVERSION= 1.20.2 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 0af1847f825e..e95643a2141a 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -236,7 +236,7 @@ NAXSI_NGINX_VER= 1.3 NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src -NJS_GH_TUPLE= nginx:njs:0.7.1:njs +NJS_GH_TUPLE= nginx:njs:0.7.0:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_USES= libedit diff --git a/www/nginx/distinfo b/www/nginx/distinfo index bb131b7fcef6..4445577ebbd7 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1640933526 +TIMESTAMP = 1641467172 SHA256 (nginx-1.20.2.tar.gz) = 958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42 SIZE (nginx-1.20.2.tar.gz) = 1062124 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -111,8 +111,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.2_GH0.tar.gz) = f8d3ff15520df736c5e20e SIZE (SpiderLabs-ModSecurity-nginx-v1.0.2_GH0.tar.gz) = 33767 SHA256 (nbs-system-naxsi-1.3_GH0.tar.gz) = 439c8677372d2597b4360bbcc10bc86490de1fc75695b193ad5df154a214d628 SIZE (nbs-system-naxsi-1.3_GH0.tar.gz) = 235626 -SHA256 (nginx-njs-0.7.1_GH0.tar.gz) = f5493b444ef54f1edba85c7adcbb1132e61c36d47de8f7a8d351965cad6d5486 -SIZE (nginx-njs-0.7.1_GH0.tar.gz) = 583195 +SHA256 (nginx-njs-0.7.0_GH0.tar.gz) = 3f0fe7d77600a9c54000ce101dd51f44811964502641ae505e38c1bbf595e6f1 +SIZE (nginx-njs-0.7.0_GH0.tar.gz) = 575477 SHA256 (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = b082bb8e0f4de2e3361c9cae79e266856de1e5b26a43611e08446b7c2bc0b2b4 SIZE (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = 664357 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b