Update to 2.1.0

Fix a typo in options.mk

23 Feb 2006 - 2.1.0
-------------------

* Removed the "Connection reset by peer" message, which has nothing
to do with us. Actually the message was downgraded from ERROR to
NOTICE so it will still appear in the debug log.
* Removed the (harmless) message mentioning LAST_UPDATE_TIME missing.
* It was not possible to remove a rule placed in phase 4 using
SecRuleRemoveById or SecRuleRemoveByMsg. Fixed.
* Fixed a problem with incorrectly setting requestBodyProcessor using
the ctl action.
* Bundled Core Rules 2.1-1.3.2b4.
* Updates to the reference manual.
* Reversed the return values of @validateDTD and @validateSchema, to
make them consistent with other operators.
* Added a few helpful debug messages in the XML validation area.
* Updates to the reference manual.
* Fixed the validateByteRange operator.
* Default value for the status action is now 403 (as it was supposed to
be but it was effectively 500).
* Rule exceptions (removing using an ID range or an regular expression)
is now applied to the current context too. (Previously it only worked
on rules that are inherited from the parent context.)
* Fix of a bug with expired variables.
* Fixed regular expression variable selectors for many collections.
* Performance improvements - up to two times for real-life work loads!
* Memory consumption improvements (not measured but significant).
* The allow action did not work in phases 3 and 4. Fixed.
* Unlocked collections GLOBAL and RESOURCE.
* Added support for variable expansion in the msg action.
* New feature: It is now possible to make relative changes to the
audit log parts with the ctl action. For example: "ctl:auditLogParts=+E".
* New feature: "tag" action. To be used for event categorisation.
* XML parser was not reporting errors that occured at the end
of XML payload.
* Files were not extracted from request if SecUploadKeepFiles was
Off. Fixed.
* Regular expressions that are too long are truncated to 256
characters before used in error messages. (In order to keep
the error messages in the log at a reasonable size.)
* Fixed the sha1 transformation function.
* Fixed the skip action.
* Fixed REQUEST_PROTOCOL, REMOTE_USER, and AUTH_TYPE.
* SecRuleEngine did not work in child configuration contexts
(e.g. <Location>).
* Fixed base64Decode and base64Encode.

15 Nov 2006 - 2.0.4
-------------------
* Fixed the "deprecatevar" action.
* Decreasing variable values did not work.
* Made "nolog" do what it is supposed to do - cause a rule match to
not be logged. Also "nolog" now implies "noauditlog" but it's
possible to follow "nolog" with "auditlog" and have the match
not logged to the error log but logged to the auditlog. (Not
something that strikes me as useful but it's possible.)
* Relative paths given to SecDataDir will now be treated as relative
* Decreasing variable values did not work.
* Made "nolog" do what it is supposed to do - cause a rule match to
not be logged. Also "nolog" now implies "noauditlog" but it's
possible to follow "nolog" with "auditlog" and have the match
not logged to the error log but logged to the auditlog. (Not
something that strikes me as useful but it's possible.)
* Relative paths given to SecDataDir will now be treated as relative
to the Apache server root.
* Added checks to make sure only correct actions are specified in
SecDefaultAction (some actions are required, some don't make any
sense) and in rules that are not chain starters (same). This should
make the unhelpful "Internal Error: Failed to add rule to the ruleset"
message go away.
* Fixed the problem when "SecRuleInheritance Off" is used in a context
with no rules defined.
* Fixed a problem of lost input (request body) data on some redirections,
for example when mod_rewrite is used.

5 files changed, 26 insertions, 20 deletions

diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile
index 72abd1a08b3..47f904b2b68 100644
--- a/security/ap-modsecurity2/Makefile
+++ b/security/ap-modsecurity2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:07 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/03/18 10:35:13 adrianp Exp $
 
-DISTNAME=	modsecurity-apache_2.0.3
-PKGNAME=	${APACHE_PKG_PREFIX}-modsecurity-2.0.3
+DISTNAME=	modsecurity-apache_2.1.0
+PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//}
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/download/
 
diff --git a/security/ap-modsecurity2/PLIST b/security/ap-modsecurity2/PLIST
index b16287e13a0..e43b5582b1a 100644
--- a/security/ap-modsecurity2/PLIST
+++ b/security/ap-modsecurity2/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/05 14:33:37 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/03/18 10:35:13 adrianp Exp $
 lib/httpd/mod_security2.so
+share/doc/ap-security/apache_request_cycle-modsecurity.jpg
 share/doc/ap-security/breach-logo-small.gif
 share/doc/ap-security/html-multipage/01-introduction.html
 share/doc/ap-security/html-multipage/02-installation.html
@@ -9,6 +10,8 @@ share/doc/ap-security/html-multipage/05-variables.html
 share/doc/ap-security/html-multipage/06-transformation-functions.html
 share/doc/ap-security/html-multipage/07-actions.html
 share/doc/ap-security/html-multipage/08-operators.html
+share/doc/ap-security/html-multipage/apache_request_cycle-modsecurity.jpg
+share/doc/ap-security/html-multipage/ar01s02.html
 share/doc/ap-security/html-multipage/breach-logo-small.gif
 share/doc/ap-security/html-multipage/index.html
 share/doc/ap-security/html-multipage/modsecurity-reference.css
diff --git a/security/ap-modsecurity2/distinfo b/security/ap-modsecurity2/distinfo
index 0063a4aca98..0bcdd2e0522 100644
--- a/security/ap-modsecurity2/distinfo
+++ b/security/ap-modsecurity2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/05 14:33:37 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2007/03/18 10:35:13 adrianp Exp $
 
-SHA1 (modsecurity-apache_2.0.3.tar.gz) = c3bd2ac77cd6a31dfd0fac9fe32547b8dda1d6b1
-RMD160 (modsecurity-apache_2.0.3.tar.gz) = 65c35729ee2a13537adfa4c67a4d6956e119c110
-Size (modsecurity-apache_2.0.3.tar.gz) = 302451 bytes
-SHA1 (patch-aa) = d532ec1523fdcd4b3297d3f3bac4dec26642a709
+SHA1 (modsecurity-apache_2.1.0.tar.gz) = 1f3d9444c8bdf527ab1ca0eef6f93ea88922eff2
+RMD160 (modsecurity-apache_2.1.0.tar.gz) = ca16c4a6644d1f0b338486e72d5d52a5c48304b4
+Size (modsecurity-apache_2.1.0.tar.gz) = 650133 bytes
+SHA1 (patch-aa) = a5c3c76204789ea3e3ea63379a3bdd9c0dd8bf17
diff --git a/security/ap-modsecurity2/options.mk b/security/ap-modsecurity2/options.mk
index 873d06e8a29..ea6bc51ff10 100644
--- a/security/ap-modsecurity2/options.mk
+++ b/security/ap-modsecurity2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/11/05 14:33:37 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2007/03/18 10:35:13 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ap-modsecurity2
 
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=	xml
 .include "../../mk/bsd.options.mk"
 
 ###
-### Brink in support for libxml2
+### Bring in support for libxml2
 ###
 .if !empty(PKG_OPTIONS:Mxml)
 .  include "../../textproc/libxml2/buildlink3.mk"
diff --git a/security/ap-modsecurity2/patches/patch-aa b/security/ap-modsecurity2/patches/patch-aa
index 72131e77523..ace66988957 100644
--- a/security/ap-modsecurity2/patches/patch-aa
+++ b/security/ap-modsecurity2/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/11/05 14:33:37 adrianp Exp $
+$NetBSD: patch-aa,v 1.2 2007/03/18 10:35:13 adrianp Exp $
 
---- apache2/Makefile.orig	2006-10-24 18:35:09.000000000 +0100
+--- apache2/Makefile.orig	2007-02-06 12:29:22.000000000 +0000
 +++ apache2/Makefile
-@@ -1,7 +1,7 @@
- builddir     = .
- 
- #top_dir      = /usr/share/apache2
+@@ -17,7 +17,7 @@ builddir     = .
+ #     Debian - /usr/share/apache2  (apache2-prefork-dev or apache2-threaded-dev
+ #                                   needed, depending on your installation type)
+ #
 -top_dir      = /home/ivanr/apache22
 +top_dir      = @PREFIX@/share/httpd
  
  top_srcdir   = ${top_dir}
  top_builddir = ${top_dir}
-@@ -11,13 +11,13 @@ include ${top_builddir}/build/special.mk
+@@ -27,14 +27,14 @@ include ${top_builddir}/build/special.mk
  APXS      = apxs
  APACHECTL = apachectl
  
@@ -21,10 +21,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/11/05 14:33:37 adrianp Exp $
 +DEFS += @XMLDEFS@
  #LIBS = -Lmy/lib/dir -lmylib
  
--CFLAGS = -g -Wuninitialized -std=c99 -Wall -Wmissing-prototypes -Wshadow -Wunused-variable -Wunused-value -Wchar-subscripts -Wsign-compare
-+#CFLAGS = -g -Wuninitialized -std=c99 -Wall -Wmissing-prototypes -Wshadow -Wunused-variable -Wunused-value -Wchar-subscripts -Wsign-compare
+-CFLAGS = -O2 -g -Wuninitialized -Wall -Wmissing-prototypes -Wshadow -Wunused-variable -Wunused-value -Wchar-subscripts -Wsign-compare
++#CFLAGS = -O2 -g -Wuninitialized -Wall -Wmissing-prototypes -Wshadow -Wunused-variable -Wunused-value -Wchar-subscripts -Wsign-compare
  
  all: local-shared-build
  
  clean:
  	-rm -f *.o *.lo *.slo *.la *~ .libs
+-    
+\ No newline at end of file
++