Attachment #243034 for bug #271963

View | Details | Raw Unified | Return to bug 271963
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/www/nginx/Makefile (-2 / +11 lines)
1	PORTNAME= nginx	1	PORTNAME= nginx
2	PORTVERSION= 1.24.0	2	PORTVERSION= 1.24.0
3	PORTREVISION?= 6	3	PORTREVISION?= 7
4	PORTEPOCH= 3	4	PORTEPOCH= 3
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= https://nginx.org/download/ \	6	MASTER_SITES= https://nginx.org/download/ \
Lines 266-271 pre-everything:: Link Here
266	.endif	266	.endif
267	@${ECHO_MSG}	267	@${ECHO_MSG}
268		268
		269	post-extract-NAXSI-on:
		270	@${MKDIR} ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}
		271	@${MV} ${WRKDIR}/naxsi_rules ${WRKDIR}/naxsi_src \
		272	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}
		273
269	pre-patch-HTTPV3-on:	274	pre-patch-HTTPV3-on:
270	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st	275	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
271		276
Lines 307-312 post-patch-HTTP_ZIP-on: Link Here
307	post-patch-ICONV-on:	312	post-patch-ICONV-on:
308	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config	313	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
309		314
		315	post-patch-NAXSI-on:
		316	@${REINPLACE_CMD} 's!MSIZE!TOK_MSIZE!g' \
		317	${WRKSRC_naxsi}/naxsi_src/libinjection/src/libinjection_sqli.c
		318
310	post-patch-PASSENGER-on:	319	post-patch-PASSENGER-on:
311	@${REINPLACE_CMD} \	320	@${REINPLACE_CMD} \
312	'177,179s!true!false!' \	321	'177,179s!true!false!' \
Lines 370-376 do-install-LINK-on: Link Here
370		379
371	do-install-NAXSI-on:	380	do-install-NAXSI-on:
372	${INSTALL_DATA} \	381	${INSTALL_DATA} \
373	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_config/naxsi_core.rules \	382	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \
374	${STAGEDIR}${ETCDIR}	383	${STAGEDIR}${ETCDIR}
375	.endif	384	.endif
376		385

Lines 242-251 MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 Link Here

(-)b/www/nginx/Makefile.extmod (-3 / +4 lines)
242	MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:v1.0.3:modsecurity3	242	MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:v1.0.3:modsecurity3
243	MODSECURITY3_VARS= DSO_EXTMODS+=modsecurity3	243	MODSECURITY3_VARS= DSO_EXTMODS+=modsecurity3
244		244
245	NAXSI_NGINX_VER= 29793dc	245	NAXSI_NGINX_VER= 1.4
246	NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi	246	NAXSI_MASTER_SITES= https://www.github.com/wargio/naxsi/releases/download/1.4/:naxsi
		247	NAXSI_DISTFILES= naxsi-${NAXSI_NGINX_VER}-src-with-deps.tar.gz:naxsi
247	NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src	248	NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
248	NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi_runtime.c	249	WRKSRC_naxsi= ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}
249		250
250	NJS_GH_TUPLE= nginx:njs:0.7.12:njs	251	NJS_GH_TUPLE= nginx:njs:0.7.12:njs
251	NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx	252	NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx




--- ../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
  */

Return to bug 271963

Lines 1-4 Link Here

(-)b/www/nginx/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1684343308	1	TIMESTAMP = 1687522128
2	SHA256 (nginx-1.24.0.tar.gz) = 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d	2	SHA256 (nginx-1.24.0.tar.gz) = 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d
3	SIZE (nginx-1.24.0.tar.gz) = 1112471	3	SIZE (nginx-1.24.0.tar.gz) = 1112471
4	SHA256 (chobits-ngx_http_proxy_connect_module-75febef_GH0.tar.gz) = 6169361f31607af0ec8c78b356e62c2aeb128649161d688d7ea92f4d2c1c39f9	4	SHA256 (chobits-ngx_http_proxy_connect_module-75febef_GH0.tar.gz) = 6169361f31607af0ec8c78b356e62c2aeb128649161d688d7ea92f4d2c1c39f9
Lines 9-14 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401 Link Here
9	SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012	9	SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012
10	SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46	10	SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46
11	SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051	11	SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
		12	SHA256 (naxsi-1.4-src-with-deps.tar.gz) = c4b9d752fbb70fa40fcc17aaaef6e0f19071a0e77ff74cac4b3da57a67868684
		13	SIZE (naxsi-1.4-src-with-deps.tar.gz) = 2274095
12	SHA256 (passenger-6.0.17.tar.gz) = 385559ed1d78eb83165222d568721dcc4222bb57c1939811ecd2c4ef33937ba7	14	SHA256 (passenger-6.0.17.tar.gz) = 385559ed1d78eb83165222d568721dcc4222bb57c1939811ecd2c4ef33937ba7
13	SIZE (passenger-6.0.17.tar.gz) = 8422867	15	SIZE (passenger-6.0.17.tar.gz) = 8422867
14	SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c	16	SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c
Lines 107-114 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bf Link Here
107	SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654	109	SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
108	SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b	110	SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b
109	SIZE (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 34063	111	SIZE (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 34063
110	SHA256 (nbs-system-naxsi-29793dc_GH0.tar.gz) = 579df0e50ff32464f7bb152df9d93ea18c05c4aa3966ec4d8c603b5dd629be08
111	SIZE (nbs-system-naxsi-29793dc_GH0.tar.gz) = 236932
112	SHA256 (nginx-njs-0.7.12_GH0.tar.gz) = 7a75a39022dfb58dbf461053903a07cc48dd4942f7d82a46601819c1b0077687	112	SHA256 (nginx-njs-0.7.12_GH0.tar.gz) = 7a75a39022dfb58dbf461053903a07cc48dd4942f7d82a46601819c1b0077687
113	SIZE (nginx-njs-0.7.12_GH0.tar.gz) = 662554	113	SIZE (nginx-njs-0.7.12_GH0.tar.gz) = 662554
114	SHA256 (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 5328c5f37e0615b5252aed51b9cd40f3d14989d995ad54134076aeda4ab9b280	114	SHA256 (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 5328c5f37e0615b5252aed51b9cd40f3d14989d995ad54134076aeda4ab9b280

Removed Link Here

(-)a/www/nginx/files/extra-patch-naxsi_runtime.c (-23 lines)
1	--- ../naxsi-29793dc/naxsi_src/naxsi_runtime.c.orig 2022-07-10 18:11:39.685243000 -0400
2	+++ ../naxsi-29793dc/naxsi_src/naxsi_runtime.c 2022-07-10 18:14:53.935554000 -0400
3	@@ -9,6 +9,11 @@
4	#include "naxsi_macros.h"
5	#include "naxsi_net.h"
6
7	+#if (NGX_PCRE2)
8	+#include <pcre2.h>
9	+#else
10	+#include <pcre.h>
11	+#endif
12	/* used to store locations during the configuration time.
13	then, accessed by the hashtable building feature during "init" time. */
14
15	@@ -181,7 +186,7 @@
16	unsigned char*
17	ngx_utf8_check(ngx_str_t* str);
18
19	-#if defined nginx_version && (nginx_version >= 1021005)
20	+#if (NGX_PCRE2)
21	/*
22	* variables to use pcre2
23	*/