svn commit: r447325 - head/www/nginx

[Jochen Neumeister]

Author: joneum
Date: Fri Aug  4 11:04:18 2017
New Revision: 447325
URL: https://svnweb.freebsd.org/changeset/ports/447325

Log:
  - Add mod_security v3 support
  
  This update adds support for mod_security version 3 to nginx.
  ModSecurity v3 is the next version of ModSecurity currently
  under development. It is developed as a library independent of
  webservers and can be used from different connectors such
  as the ModSecurity-nginx module used by this port
  
  PR:		220353
  Reported by:	Marius Halden <marius.h at lden.org>
  Approved by:	miwi (mentor)
  Differential Revision:	https://reviews.freebsd.org/D11778

Modified:
  head/www/nginx/Makefile
  head/www/nginx/distinfo

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Fri Aug  4 10:56:11 2017	(r447324)
+++ head/www/nginx/Makefile	Fri Aug  4 11:04:18 2017	(r447325)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.12.1
+PORTREVISION?=	1
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -112,6 +113,7 @@ OPTIONS_DEFINE=	\
 	LUA \
 	MEMC \
 	MODSECURITY \
+	MODSECURITY_DEVEL \
 	NAXSI \
 	PASSENGER \
 	POSTGRES \
@@ -226,6 +228,7 @@ LET_DESC=			3rd party let module
 LUA_DESC=			3rd party lua module
 MEMC_DESC=			3rd party memc (memcached) module
 MODSECURITY_DESC=		3rd party mod_security module
+MODSECURITY_DEVEL_DESC=		3rd party mod_security v3 module
 NAXSI_DESC=			3rd party naxsi module
 PASSENGER_DESC=			3rd party passenger module
 POSTGRES_DESC=			3rd party postgres module
@@ -770,7 +773,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_stick
 
 .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR}
 NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.7.0
-LIB_DEPENDS+= 	libavformat.so:multimedia/ffmpeg \
+LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
 		libavcodec.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg
@@ -904,6 +907,12 @@ DISTFILES+=	modsecurity-${NGINX_MODSECURITY_VERSION}.t
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure \
 		${PATCHDIR}/extra-patch-ngx_http_modsecurity.c
+.endif
+
+.if ${PORT_OPTIONS:MMODSECURITY_DEVEL}
+LIB_DEPENDS+=	libmodsecurity.so.3:www/mod_security-devel
+GH_TUPLE+=	SiderLaps:ModSecurity-nginx:abbf2c4:modsec
+CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_modsec}
 .endif
 
 .if ${PORT_OPTIONS:MNAXSI}

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Fri Aug  4 10:56:11 2017	(r447324)
+++ head/www/nginx/distinfo	Fri Aug  4 11:04:18 2017	(r447325)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1499818015
+TIMESTAMP = 1501239413
 SHA256 (nginx-1.12.1.tar.gz) = 8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb
 SIZE (nginx-1.12.1.tar.gz) = 981093
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -15,6 +15,8 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae1
 SIZE (08a395c66e42.tar.gz) = 120603
 SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24
 SIZE (modsecurity-2.9.1.tar.gz) = 4261212
+SHA256 (SpiderLabs-ModSecurity-nginx-abbf2c4_GH0.tar.gz) = 3d216e7c282213cd64b4671fe86d9057a3f318f692f4f906c695eee619c82228
+SIZE (SpiderLabs-ModSecurity-nginx-abbf2c4_GH0.tar.gz) = 25917
 SHA256 (passenger-5.1.5.tar.gz) = ea4139d2f0d9f7aa6488be966ffbfe602f80764a47b7077892d92324bff5eb47
 SIZE (passenger-5.1.5.tar.gz) = 5126337
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1