Date: Sun, 10 Jul 2022 22:21:39 GMT From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 18ccca0d8adb - main - www/nginx-devel: update third-party naxsi module to its recent commit Message-ID: <202207102221.26AMLdfS051871@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=18ccca0d8adbc046fbf1bb70f4eee23aa537a5e9 commit 18ccca0d8adbc046fbf1bb70f4eee23aa537a5e9 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2022-07-10 22:19:21 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> 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 <pcre2.h> ++#else ++#include <pcre.h> ++#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 + */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207102221.26AMLdfS051871>