18605980 Update mod_security2 to 2.8.0
authorJiri Kukacka <jiri.kukacka@oracle.com>
Thu, 26 Jun 2014 14:59:26 -0700
changeset 2159 6169d700868d
parent 2158 bbf95c342386
child 2160 d7b18140ab8c
18605980 Update mod_security2 to 2.8.0
components/apache2-modules/mod_security2/Makefile
components/apache2-modules/mod_security2/apache-security.p5m
components/apache2-modules/mod_security2/patches/security2-conf.patch
components/apache2-modules/mod_security2/resolve.deps
--- a/components/apache2-modules/mod_security2/Makefile	Wed Sep 24 17:30:48 2014 +0200
+++ b/components/apache2-modules/mod_security2/Makefile	Thu Jun 26 14:59:26 2014 -0700
@@ -23,18 +23,18 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mod_security2
-COMPONENT_VERSION=	2.7.5
+COMPONENT_VERSION=	2.8.0
 COMPONENT_PROJECT_URL=	http://www.modsecurity.org/
 COMPONENT_SRC_NAME=	modsecurity-apache
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2
+    sha256:95de6ec30982e5bde7981929ba89be89488e9f237ee8c4236e064b074bbb6f28
 COMPONENT_ARCHIVE_URL= \
     $(COMPONENT_PROJECT_URL)tarball/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
-TPNO=			14454
+TPNO=			18233
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/configure.mk
--- a/components/apache2-modules/mod_security2/apache-security.p5m	Wed Sep 24 17:30:48 2014 +0200
+++ b/components/apache2-modules/mod_security2/apache-security.p5m	Thu Jun 26 14:59:26 2014 -0700
@@ -39,6 +39,9 @@
 
 license LICENSE license="Apache v2.0"
 
+dir path=var/apache2/2.2/modsec/tmp/ group=webservd owner=webservd mode=770
+
 file modsecurity.conf-recommended path=etc/apache2/2.2/samples-conf.d/security2.conf
 file build/$(MACH32)/apache2/.libs/mod_security2.so path=usr/apache2/2.2/libexec/mod_security2.so
 file build/$(MACH64)/apache2/.libs/mod_security2.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_security2.so
+file unicode.mapping path=etc/apache2/2.2/samples-conf.d/unicode.mapping
--- a/components/apache2-modules/mod_security2/patches/security2-conf.patch	Wed Sep 24 17:30:48 2014 +0200
+++ b/components/apache2-modules/mod_security2/patches/security2-conf.patch	Thu Jun 26 14:59:26 2014 -0700
@@ -63,9 +63,8 @@
  
  
  # -- Miscellaneous -----------------------------------------------------------
[email protected]@ -211,3 +221,5 @@
- #
- #SecUnicodeCodePage 20127
- #SecUnicodeMapFile unicode.mapping
-+
[email protected]@ -211,3 +221,4 @@
+ # version, Anonymous unique id for host.
+ SecStatusEngine On
+ 
 +</IfModule>
--- a/components/apache2-modules/mod_security2/resolve.deps	Wed Sep 24 17:30:48 2014 +0200
+++ b/components/apache2-modules/mod_security2/resolve.deps	Thu Jun 26 14:59:26 2014 -0700
@@ -1,9 +1,6 @@
-library/apr-13
 library/apr-15
-library/apr-util-13
 library/apr-util-15
 library/libxml2
 library/pcre
 runtime/lua
 system/library
-system/library/math