- Update third-party NAXSI module to 0.49

- Remove non needed patches

Approved by:	osa (via private mail)

6 files changed, 12 insertions, 46 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 88c3d6f98733..24909f86dd7c 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -627,11 +627,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-memc-nginx-module-${GIT_MEMC_VERS
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}
-NGINX_NAXSI_VERSION=	0.46-1
+NGINX_NAXSI_VERSION=	0.49
 MASTER_SITES+=	http://naxsi.googlecode.com/files/:naxsi
-DISTFILES+=	naxsi-${NGINX_NAXSI_VERSION}.tgz:naxsi
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
-EXTRA_PATCHES+=	 ${PATCHDIR}/extra-patch-naxsi_src-naxsi_runtime.c
+DISTFILES+=	naxsi-core-${NGINX_NAXSI_VERSION}.tgz:naxsi
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_src
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
@@ -995,7 +994,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MNAXSI}
 	${INSTALL_DATA} \
-	${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
+	${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
 	${ETCDIR}
 .endif
 
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index a19e5320a64a..08e2b838dd8d 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -70,8 +70,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.7.15-0-g57a6471.tar.gz) = 0450b451239c92
 SIZE (chaoslawful-lua-nginx-module-v0.7.15-0-g57a6471.tar.gz) = 446741
 SHA256 (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 8c6f7a421346be1f53240b370cd29edd833f8ca32f6f9b926d66230b15727f0c
 SIZE (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 39778
-SHA256 (naxsi-0.46-1.tgz) = 635f7790dcf71d289fb9c69412adbe814ee056e9f4457c67e1fb462b2a5a4b21
-SIZE (naxsi-0.46-1.tgz) = 449034
+SHA256 (naxsi-core-0.49.tgz) = bb0b63713d5a9446401d5acd1ef0882b9c2a0fc506502bbd88bc4663d273e9c7
+SIZE (naxsi-core-0.49.tgz) = 49852
 SHA256 (passenger-3.0.19.tar.gz) = 7a4dc7eeaca1ac81636167ebfe1cf69b18fc2f09f52a882b73c05a9e9ec12d98
 SIZE (passenger-3.0.19.tar.gz) = 2663368
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
diff --git a/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c b/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c
deleted file mode 100644
index e06d1b4cdfd4..000000000000
--- a/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c.orig	2012-06-06 16:26:30.000000000 +0400
-+++ ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c	2012-06-06 16:29:58.000000000 +0400
-@@ -116,7 +116,12 @@
-     tmp_idx = 0;
-     len = str->len;
-     while 
--#if defined nginx_version && (nginx_version > 1001011)
-+#if defined nginx_version && (nginx_version >= 1003001)
-+      (tmp_idx < len && 
-+       (match = pcre_exec(rl->br->rx->regex->code, 0, 
-+			  (const char *) str->data, str->len, tmp_idx, 0, 
-+			  captures, 6)) >= 0)
-+#elif (nginx_version > 1001011) && (nginx_version < 1003001)
-       (tmp_idx < len && 
-        (match = pcre_exec(rl->br->rx->regex->pcre, 0, 
- 			  (const char *) str->data, str->len, tmp_idx, 0, 
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 023095c04fee..b7296fc601b5 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -640,11 +640,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-memc-nginx-module-${GIT_MEMC_VERS
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}
-NGINX_NAXSI_VERSION=	0.46-1
+NGINX_NAXSI_VERSION=	0.49
 MASTER_SITES+=	http://naxsi.googlecode.com/files/:naxsi
-DISTFILES+=	naxsi-${NGINX_NAXSI_VERSION}.tgz:naxsi
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-naxsi_runtime.c
+DISTFILES+=	naxsi-core-${NGINX_NAXSI_VERSION}.tgz:naxsi
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_src
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
@@ -988,7 +987,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MNAXSI}
 	${INSTALL_DATA} \
-	${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
+	${WRKDIR}/naxsi-core-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \
 	${ETCDIR}
 .endif
 
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index e24d92010ec7..22f07ab23abe 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -74,8 +74,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.7.15-0-g57a6471.tar.gz) = 0450b451239c92
 SIZE (chaoslawful-lua-nginx-module-v0.7.15-0-g57a6471.tar.gz) = 446741
 SHA256 (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 8c6f7a421346be1f53240b370cd29edd833f8ca32f6f9b926d66230b15727f0c
 SIZE (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 39778
-SHA256 (naxsi-0.46-1.tgz) = 635f7790dcf71d289fb9c69412adbe814ee056e9f4457c67e1fb462b2a5a4b21
-SIZE (naxsi-0.46-1.tgz) = 449034
+SHA256 (naxsi-core-0.49.tgz) = bb0b63713d5a9446401d5acd1ef0882b9c2a0fc506502bbd88bc4663d273e9c7
+SIZE (naxsi-core-0.49.tgz) = 49852
 SHA256 (passenger-3.0.19.tar.gz) = 7a4dc7eeaca1ac81636167ebfe1cf69b18fc2f09f52a882b73c05a9e9ec12d98
 SIZE (passenger-3.0.19.tar.gz) = 2663368
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
diff --git a/www/nginx/files/extra-patch-naxsi_runtime.c b/www/nginx/files/extra-patch-naxsi_runtime.c
deleted file mode 100644
index 7d6a5a621b4d..000000000000
--- a/www/nginx/files/extra-patch-naxsi_runtime.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c.orig	2012-07-03 20:58:17.000000000 +0400
-+++ ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c	2012-07-03 21:01:32.000000000 +0400
-@@ -116,7 +116,12 @@
-     tmp_idx = 0;
-     len = str->len;
-     while 
--#if defined nginx_version && (nginx_version > 1001011)
-+#if defined nginx_version && (nginx_version > 1002001)
-+      (tmp_idx < len && 
-+       (match = pcre_exec(rl->br->rx->regex->code, 0, 
-+			  (const char *) str->data, str->len, tmp_idx, 0, 
-+			  captures, 6)) >= 0)
-+#elif defined nginx_version && ((nginx_version > 1001011) && (nginx_version <= 1002001))
-       (tmp_idx < len && 
-        (match = pcre_exec(rl->br->rx->regex->pcre, 0, 
- 			  (const char *) str->data, str->len, tmp_idx, 0,