svn commit: r314170 - in head/www: nginx nginx-devel nginx-devel/files nginx/files

[Sofian Brabez]

Author: sbz
Date: Thu Mar 14 16:47:23 2013
New Revision: 314170
URL: http://svnweb.freebsd.org/changeset/ports/314170

Log:
  - Update third-party NAXSI module to 0.49
  - Remove non needed patches
  
  Approved by:	osa (via private mail)

Deleted:
  head/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c
  head/www/nginx/files/extra-patch-naxsi_runtime.c
Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/distinfo   (contents, props changed)
  head/www/nginx/Makefile
  head/www/nginx/distinfo   (contents, props changed)

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Thu Mar 14 16:16:13 2013	(r314169)
+++ head/www/nginx-devel/Makefile	Thu Mar 14 16:47:23 2013	(r314170)
@@ -627,11 +627,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a
 .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
 

Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo	Thu Mar 14 16:16:13 2013	(r314169)
+++ head/www/nginx-devel/distinfo	Thu Mar 14 16:47:23 2013	(r314170)
@@ -70,8 +70,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.
 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

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Thu Mar 14 16:16:13 2013	(r314169)
+++ head/www/nginx/Makefile	Thu Mar 14 16:47:23 2013	(r314170)
@@ -640,11 +640,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a
 .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
 

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Thu Mar 14 16:16:13 2013	(r314169)
+++ head/www/nginx/distinfo	Thu Mar 14 16:47:23 2013	(r314170)
@@ -74,8 +74,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.
 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