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

[Sergey A. Osokin]

Author: osa
Date: Sat Aug 17 10:57:29 2013
New Revision: 324839
URL: http://svnweb.freebsd.org/changeset/ports/324839

Log:
  Update third-party modsecurity module from 2.7.4 to 2.7.5.
  
  <ChangeLog>
  
  23 Jul 2013 - 2.7.5
  -------------------
  Improvements:
  
  * SecUnicodeCodePage is deprecated. SecUnicodeMapFile now accepts the code page as
    a second parameter.
  * Updated Libinjection to version 3.4.1. Many improvements were made.
  * Severity action now supports strings (emergency, alert, critical, error, warning,
    notice, info, debug).
  
  Bug Fixes:
  
  * Fixed utf8toUnicode tfn null byte conversion.
  * Fixed NGINX crash when issue reload command.
  * Fixed flush output buffer before inject modified hashed response body.
  * Fixed url normalization for Hash Engine.
  * Fixed NGINX ap_unixd_set_global_perms_mutex compilation error with apache 2.4
    devel files.
  
  </ChangeLog>

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/distinfo
  head/www/nginx-devel/files/extra-patch-nginx-modsecurity-config
  head/www/nginx/Makefile
  head/www/nginx/distinfo
  head/www/nginx/files/extra-patch-nginx-modsecurity-config

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sat Aug 17 10:43:22 2013	(r324838)
+++ head/www/nginx-devel/Makefile	Sat Aug 17 10:57:29 2013	(r324839)
@@ -630,7 +630,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}
-NGINX_MODSECURITY_VERSION=	2.7.4
+NGINX_MODSECURITY_VERSION=	2.7.5
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
 		apr-1:${PORTSDIR}/devel/apr1
 USE_APACHE=	22+

Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo	Sat Aug 17 10:43:22 2013	(r324838)
+++ head/www/nginx-devel/distinfo	Sat Aug 17 10:57:29 2013	(r324839)
@@ -70,8 +70,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.
 SIZE (chaoslawful-lua-nginx-module-v0.8.2-0-g3915187.tar.gz) = 480845
 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 (modsecurity-apache_2.7.4.tar.gz) = 605d6f1b03e648001ef1c7db7b18d51c01edd443b57cbbd4e298770ffdcd0eb9
-SIZE (modsecurity-apache_2.7.4.tar.gz) = 1014983
+SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2
+SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
 SIZE (naxsi-core-0.50.tgz) = 49809
 SHA256 (passenger-4.0.13.tar.gz) = 528b734bba041a7f1af7327534f9d5c22b581e477b19b49646cfc6c5a43e5a96

Modified: head/www/nginx-devel/files/extra-patch-nginx-modsecurity-config
==============================================================================
--- head/www/nginx-devel/files/extra-patch-nginx-modsecurity-config	Sat Aug 17 10:43:22 2013	(r324838)
+++ head/www/nginx-devel/files/extra-patch-nginx-modsecurity-config	Sat Aug 17 10:57:29 2013	(r324839)
@@ -1,5 +1,5 @@
---- ../modsecurity-apache_2.7.4/nginx/modsecurity/config.orig	2013-06-04 10:14:07.000000000 +0400
-+++ ../modsecurity-apache_2.7.4/nginx/modsecurity/config	2013-06-04 10:17:30.000000000 +0400
+--- ../modsecurity-apache_2.7.5/nginx/modsecurity/config.orig	2013-06-04 10:14:07.000000000 +0400
++++ ../modsecurity-apache_2.7.5/nginx/modsecurity/config	2013-06-04 10:17:30.000000000 +0400
 @@ -3,5 +3,5 @@
  HTTP_AUX_FILTER_MODULES="ngx_http_modsecurity $HTTP_AUX_FILTER_MODULES"
  NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_modsecurity.c $ngx_addon_dir/apr_bucket_nginx.c $ngx_addon_dir/ngx_pool_context.c"

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Sat Aug 17 10:43:22 2013	(r324838)
+++ head/www/nginx/Makefile	Sat Aug 17 10:57:29 2013	(r324839)
@@ -628,7 +628,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}
-NGINX_MODSECURITY_VERSION=	2.7.4
+NGINX_MODSECURITY_VERSION=	2.7.5
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
 		apr-1:${PORTSDIR}/devel/apr1
 USE_APACHE=	22+

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Sat Aug 17 10:43:22 2013	(r324838)
+++ head/www/nginx/distinfo	Sat Aug 17 10:57:29 2013	(r324839)
@@ -70,8 +70,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.
 SIZE (chaoslawful-lua-nginx-module-v0.8.2-0-g3915187.tar.gz) = 480845
 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 (modsecurity-apache_2.7.4.tar.gz) = 605d6f1b03e648001ef1c7db7b18d51c01edd443b57cbbd4e298770ffdcd0eb9
-SIZE (modsecurity-apache_2.7.4.tar.gz) = 1014983
+SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2
+SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
 SIZE (naxsi-core-0.50.tgz) = 49809
 SHA256 (passenger-4.0.13.tar.gz) = 528b734bba041a7f1af7327534f9d5c22b581e477b19b49646cfc6c5a43e5a96

Modified: head/www/nginx/files/extra-patch-nginx-modsecurity-config
==============================================================================
--- head/www/nginx/files/extra-patch-nginx-modsecurity-config	Sat Aug 17 10:43:22 2013	(r324838)
+++ head/www/nginx/files/extra-patch-nginx-modsecurity-config	Sat Aug 17 10:57:29 2013	(r324839)
@@ -1,5 +1,5 @@
---- ../modsecurity-apache_2.7.4/nginx/modsecurity/config.orig	2013-06-04 10:14:07.000000000 +0400
-+++ ../modsecurity-apache_2.7.4/nginx/modsecurity/config	2013-06-04 10:17:30.000000000 +0400
+--- ../modsecurity-apache_2.7.5/nginx/modsecurity/config.orig	2013-06-04 10:14:07.000000000 +0400
++++ ../modsecurity-apache_2.7.5/nginx/modsecurity/config	2013-06-04 10:17:30.000000000 +0400
 @@ -3,5 +3,5 @@
  HTTP_AUX_FILTER_MODULES="ngx_http_modsecurity $HTTP_AUX_FILTER_MODULES"
  NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_modsecurity.c $ngx_addon_dir/apr_bucket_nginx.c $ngx_addon_dir/ngx_pool_context.c"