svn commit: r517568 - head/www/nginx

[Jochen Neumeister]

Author: joneum
Date: Thu Nov 14 14:55:15 2019
New Revision: 517568
URL: https://svnweb.freebsd.org/changeset/ports/517568

Log:
  Fix the issue with third-aprty modsecurity2 module, it is not
  being built into after selection.
  An additional useful file is installed now.
  
  Submitted by:	Felipe Zipitria <felipe.zipitria at owasp.org> (in a private mail)
  Sponsored by:	Netzkommune GmbH

Modified:
  head/www/nginx/Makefile
  head/www/nginx/Makefile.extmod
  head/www/nginx/pkg-plist

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Thu Nov 14 14:28:58 2019	(r517567)
+++ head/www/nginx/Makefile	Thu Nov 14 14:55:15 2019	(r517568)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.16.1
-PORTREVISION?=	4
+PORTREVISION?=	5
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
@@ -350,6 +350,11 @@ do-install-DSO-on:
 do-install-FASTDFS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs
 	${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample
+
+do-install-MODSECURITY-on:
+	${INSTALL_DATA} \
+	${WRKDIR}/modsecurity-${MODSECURITY_VERSION}/unicode.mapping \
+	${STAGEDIR}${ETCDIR}
 
 do-install-NAXSI-on:
 	${INSTALL_DATA} \

Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod	Thu Nov 14 14:28:58 2019	(r517567)
+++ head/www/nginx/Makefile.extmod	Thu Nov 14 14:55:15 2019	(r517568)
@@ -224,6 +224,7 @@ MODSECURITY_MASTER_SITES=	http://www.modsecurity.org/t
 MODSECURITY_DISTFILES=		modsecurity-${MODSECURITY_VERSION}.tar.gz:modsecurity
 MODSECURITY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
 MODSECURITY_VARS=		WRKSRC_modsecurity=${WRKDIR}/modsecurity-${MODSECURITY_VERSION}
+MODSECURITY_CONFIGURE_ON=	--add-module=${WRKDIR}/modsecurity-${MODSECURITY_VERSION}/nginx/modsecurity
 
 MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
 MODSECURITY3_GH_TUPLE=		SpiderLabs:ModSecurity-nginx:71ede63:modsec

Modified: head/www/nginx/pkg-plist
==============================================================================
--- head/www/nginx/pkg-plist	Thu Nov 14 14:28:58 2019	(r517567)
+++ head/www/nginx/pkg-plist	Thu Nov 14 14:55:15 2019	(r517568)
@@ -3,6 +3,7 @@
 %%ETCDIR%%/koi-utf
 %%ETCDIR%%/koi-win
 %%NAXSI%%%%ETCDIR%%/naxsi_core.rules
+%%MODSECURITY%%%%ETCDIR%%/unicode.mapping
 @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params
 @sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params
 %%ETCDIR%%/win-utf