From nobody Sun Jul 10 22:21:39 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 F00A31D05BBB; Sun, 10 Jul 2022 22:21:39 +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 4Lh1hM6SWCz3CHq; Sun, 10 Jul 2022 22:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657491699; 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=kciKqOlmIA008o6NntVkKwE9kSeLznIKIhAiqqcpnDU=; b=PSCzbIUCt5MDVFnYFGBUGunOsy14BKhNEXts/Cz1fCHnex4HimxBI70nSUzHlud5zGbAx6 7DwQkR8w0HM0srpi7oiabY9yTGhr8Y9AW5C1oTOig/BxQFxnDwGR85VLG90wt+wQzpQ/SP RpClSEvF/XjDsPSRwqWWCjeAlevGe6WOijMoZw9okPKA/+xCZmnP5g9cI8bmGNyb3RhqUF QR4BsjWN21S3jkM1HYnmLxMhgO71PgtODsGhhyvGUDJie7Iv5V0FRjiZtIy2ZPGb9CD6Df 7AdKAEl5/Hp0k3hI9Zto8L+kWFTLEZfc5z2jLkuDrAhzzFLLkILmUQHmJRRHCA== 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 4Lh1hM5WLJzh4q; Sun, 10 Jul 2022 22:21:39 +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 26AMLd2u051872; Sun, 10 Jul 2022 22:21:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26AMLdfS051871; Sun, 10 Jul 2022 22:21:39 GMT (envelope-from git) Date: Sun, 10 Jul 2022 22:21:39 GMT Message-Id: <202207102221.26AMLdfS051871@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 18ccca0d8adb - main - www/nginx-devel: update third-party naxsi module to its recent commit 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18ccca0d8adbc046fbf1bb70f4eee23aa537a5e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657491699; 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=kciKqOlmIA008o6NntVkKwE9kSeLznIKIhAiqqcpnDU=; b=imqzFAuxLXH+0ZuXDR41igd/s9WZaZQo2cvlbqGySCRflq4DJvxQR7Os6gz3xQk2o2bkSa 918VB+IDKRWT7UA+1/GWNFrZgOz/zQQ5K/winZAsmzvu/kOBjB+P5aPszoDb0IjYRX8Pbt Km6hw3SwW5EEjkO32hAbKTNZoJwmpHW4XzSFGKJ3wXczIQ4PxmiMMHsPN1/RUSG65zdPFq 1fscKBDcb5Vek/M/SJRg9MHMdv7AxUNPLLHuzwFcTtVYghX8QsU/uVN7T5A/i9/5SySrfl rr0ZOmih0GaD2BZ0WiLV065gl6m6MAgra/xKfHMgb685VLn3pvk2ef4gSBFupA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657491699; a=rsa-sha256; cv=none; b=EXMcrTZK1mFPh2DjRS6UM3LqvajmC/Ha/twDnQ6Z2oFOjFy0Pu8lfZ/o0SWFGcMnf0T6pc NQuvE18rxBpXYy6TT1sst8fTVEcBkcBsmarS0ksbSeJteJVGM/nOe1/jp4o62HjwVTzGfL 6mG8OoASgBANzFRPqSr8aPvsbtCO4Ow0F4aHaKSmK7W8Ue4/ZPjbdhq/oYTv4m8Tqnrk8q V+81wsYvuPINp4GI33ZEB1yiN1VkBK69hGLJdh/zgeO1XYbTcZvuPLjNlJwDUVz2XdxbMk QMDpQ7ZzuvQWAE7Q6Va+lB1H9887xqAEI3h4ExwL6z5MnkksbZy4r6SOy2+QWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=18ccca0d8adbc046fbf1bb70f4eee23aa537a5e9 commit 18ccca0d8adbc046fbf1bb70f4eee23aa537a5e9 Author: Sergey A. Osokin AuthorDate: 2022-07-10 22:19:21 +0000 Commit: Sergey A. Osokin CommitDate: 2022-07-10 22:19:21 +0000 www/nginx-devel: update third-party naxsi module to its recent commit Update third-party naxsi module to 29793dc, it's compatible with nginx 1.23.0 now, also now it's possible to build the module with PCRE2 support. Bump PORTREVISION. --- www/nginx-devel/Makefile | 3 +-- www/nginx-devel/Makefile.extmod | 3 ++- www/nginx-devel/distinfo | 6 +++--- www/nginx-devel/files/extra-patch-naxsi_runtime.c | 23 +++++++++++++++++++++++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 80d545ea9653..c51e113dcd99 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.23.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -253,7 +253,6 @@ NJS_CONFIGURE_ARGS= --no-pcre2 ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS} || \ ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} || \ ${PORT_OPTIONS:MHTTP_ZIP} || \ - ${PORT_OPTIONS:MNAXSI} || \ ${PORT_OPTIONS:MSRCACHE} IGNORE= a patch requires .endif diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index f5a46eab37bc..45093031e6e2 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -244,9 +244,10 @@ MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:v1.0.3:modsecurity3 MODSECURITY3_VARS= DSO_EXTMODS+=modsecurity3 -NAXSI_NGINX_VER= 1.3 +NAXSI_NGINX_VER= 29793dc NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src +NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi_runtime.c NJS_GH_TUPLE= nginx:njs:0.7.5:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index ea3f27efbfa4..eca44090d188 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1657485370 +TIMESTAMP = 1657490949 SHA256 (nginx-1.23.0.tar.gz) = 820acaa35b9272be9e9e72f6defa4a5f2921824709f8aa4772c78ab31ed94cd1 SIZE (nginx-1.23.0.tar.gz) = 1102940 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -107,8 +107,8 @@ SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bf SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b SIZE (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 34063 -SHA256 (nbs-system-naxsi-1.3_GH0.tar.gz) = 439c8677372d2597b4360bbcc10bc86490de1fc75695b193ad5df154a214d628 -SIZE (nbs-system-naxsi-1.3_GH0.tar.gz) = 235626 +SHA256 (nbs-system-naxsi-29793dc_GH0.tar.gz) = 579df0e50ff32464f7bb152df9d93ea18c05c4aa3966ec4d8c603b5dd629be08 +SIZE (nbs-system-naxsi-29793dc_GH0.tar.gz) = 236932 SHA256 (nginx-njs-0.7.5_GH0.tar.gz) = 75eb6581cc50383115fc836158fc69b3fc5b79d51aa9038b6095da7679b72842 SIZE (nginx-njs-0.7.5_GH0.tar.gz) = 592998 SHA256 (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 5328c5f37e0615b5252aed51b9cd40f3d14989d995ad54134076aeda4ab9b280 diff --git a/www/nginx-devel/files/extra-patch-naxsi_runtime.c b/www/nginx-devel/files/extra-patch-naxsi_runtime.c new file mode 100644 index 000000000000..c08dd1f92540 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-naxsi_runtime.c @@ -0,0 +1,23 @@ +--- ../naxsi-29793dc/naxsi_src/naxsi_runtime.c.orig 2022-07-10 18:11:39.685243000 -0400 ++++ ../naxsi-29793dc/naxsi_src/naxsi_runtime.c 2022-07-10 18:14:53.935554000 -0400 +@@ -9,6 +9,11 @@ + #include "naxsi_macros.h" + #include "naxsi_net.h" + ++#if (NGX_PCRE2) ++#include ++#else ++#include ++#endif + /* used to store locations during the configuration time. + then, accessed by the hashtable building feature during "init" time. */ + +@@ -181,7 +186,7 @@ + unsigned char* + ngx_utf8_check(ngx_str_t* str); + +-#if defined nginx_version && (nginx_version >= 1021005) ++#if (NGX_PCRE2) + /* + * variables to use pcre2 + */