Update from 2.1.4->2.5.7

Use ./configure as one is now supplied
libmxl2 is no longer optional but curl is
Rename doc/eg dirs from ap-security to ap-modsecurity

* Allow for disabling request body limit checks in phase:1
* Now log XML parsing/validation warnings and errors to be in the debug log
  at levels 3 and 4, respectivly.
* Transformation caching has been deprecated, and is now off by default. We
  now advise against using transformation caching in production.
* Improve request body processing error messages.

Any many more . . . see CHANGES for all the details

6 files changed, 76 insertions, 91 deletions

diff --git a/security/ap-modsecurity2/MESSAGE b/security/ap-modsecurity2/MESSAGE
index 9cbfda6f2cf..efa79cc6348 100644
--- a/security/ap-modsecurity2/MESSAGE
+++ b/security/ap-modsecurity2/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/11/05 14:33:37 adrianp Exp $
+$NetBSD: MESSAGE,v 1.2 2008/10/12 12:50:17 adrianp Exp $
 
 In order to use this module in your Apache installation, you will need
 to add the following to your httpd.conf file:
@@ -18,4 +18,9 @@ Example configuration files for modsecurity are available:
 
   ${PREFIX}/share/examples/ap-security/
 
+In order to use the XML support in your Apache installation, you will need
+to add the following to your httpd.conf file:
+
+  LoadFile ${PREFIX}/lib/libxml2.so
+
 ===========================================================================
diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile
index c5ecad65163..684be071d4f 100644
--- a/security/ap-modsecurity2/Makefile
+++ b/security/ap-modsecurity2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:23 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/12 12:50:17 adrianp Exp $
 
-DISTNAME=	modsecurity-apache_2.1.4
+DISTNAME=	modsecurity-apache_2.5.7
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//}
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/download/
@@ -12,43 +12,32 @@ COMMENT=	Intrusion detection and prevention engine for web applications
 .include "../../mk/apache.mk"
 .include "options.mk"
 
-USE_TOOLS+=	pax
+GNU_CONFIGURE=		YES
+USE_TOOLS+=		pax
+WRKSRC=			${WRKDIR}/${DISTNAME}/apache2
+USE_LANGUAGES+=		c++ c
+
+CONFIGURE_ARGS+=	--with-apxs=${PREFIX}/sbin/apxs
+CONFIGURE_ARGS+=	--with-pcre=${PREFIX}
+CONFIGURE_ARGS+=	--with-apr=${PREFIX}
+CONFIGURE_ARGS+=	--with-apu=${PREFIX}
+CONFIGURE_ARGS+=        --with-libxml=${PREFIX}
 
 PKG_APACHE_ACCEPTED=	apache2
-BUILD_DIRS=		apache2
-EGDIR=			${PREFIX}/share/examples/ap-security
+EGDIR=			${PREFIX}/share/examples/ap-modsecurity
 CONF_FILES=		${EGDIR}/modsecurity.conf-minimal \
 			${PKG_SYSCONFDIR}/httpd/modsecurity.conf
-MESSAGE_SRC+=		${WRKDIR}/.MESSAGE_SRC
 
 BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.59nb2
 
-SUBST_CLASSES=		make
-SUBST_STAGE.make=	post-patch
-SUBST_FILES.make=	apache2/Makefile
-SUBST_SED.make=		-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_MESSAGE.make=	Fixing Makefiles.
-
-.if !empty(PKG_OPTIONS:Mxml)
-SUBST_SED.make+=	-e "s|@XMLINC@|-I${BUILDLINK_PREFIX.libxml2}/include/libxml2|g"
-SUBST_SED.make+=	-e "s|@XMLDEFS@|-DWITH_LIBXML2|g"
-.else
-SUBST_SED.make+=	-e "s|@XMLINC@||g"
-SUBST_SED.make+=	-e "s|@XMLDEFS@||g"
-.endif
-
-post-build:
-	${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC
-.if !empty(PKG_OPTIONS:Mxml)
-	${CP} ${PKGDIR:Q}/MESSAGE.xml ${WRKDIR:Q}/.MESSAGE_SRC.xml
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ap-security
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ap-imodsecurity
 
-	${INSTALL_DATA} ${WRKSRC}/modsecurity.conf-minimal ${EGDIR}
-	cd ${WRKSRC}/doc && pax -rw . ${PREFIX}/share/doc/ap-security
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/modsecurity.conf-minimal ${EGDIR}
+	cd ${WRKDIR}/${DISTNAME}/doc && \
+		pax -rw . ${PREFIX}/share/doc/ap-modsecurity
 
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ap-modsecurity2/PLIST b/security/ap-modsecurity2/PLIST
index 3f131aee127..1c9918cdab5 100644
--- a/security/ap-modsecurity2/PLIST
+++ b/security/ap-modsecurity2/PLIST
@@ -1,29 +1,34 @@
-@comment $NetBSD: PLIST,v 1.3 2008/01/04 10:05:51 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/10/12 12:50:17 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
-share/doc/ap-security/html-multipage/03-configuration-directives.html
-share/doc/ap-security/html-multipage/04-processing-phases.html
-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/ar01s02.html
-share/doc/ap-security/html-multipage/ar01s10.html
-share/doc/ap-security/html-multipage/apache_request_cycle-modsecurity.jpg
-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
-share/doc/ap-security/html-multipage/modsecurity.gif
-share/doc/ap-security/index.html
-share/doc/ap-security/modsecurity2-apache-reference.html
-share/doc/ap-security/modsecurity2-apache-reference.pdf
-share/doc/ap-security/modsecurity2-apache-reference.xml
-share/doc/ap-security/modsecurity.gif
-share/doc/ap-security/modsecurity-reference.css
-share/examples/ap-security/modsecurity.conf-minimal
-@dirrm share/doc/ap-security/html-multipage
-@dirrm share/doc/ap-security
-@dirrm share/examples/ap-security
+share/doc/ap-modsecurity/apache_request_cycle-modsecurity.jpg
+share/doc/ap-modsecurity/breach-logo-small.gif
+share/doc/ap-modsecurity/html-multipage/actions.html
+share/doc/ap-modsecurity/html-multipage/ar01s11.html
+share/doc/ap-modsecurity/html-multipage/ar01s12.html
+share/doc/ap-modsecurity/html-multipage/ar01s13.html
+share/doc/ap-modsecurity/html-multipage/configuration-directives.html
+share/doc/ap-modsecurity/html-multipage/installation.html
+share/doc/ap-modsecurity/html-multipage/introduction.html
+share/doc/ap-modsecurity/html-multipage/operators.html
+share/doc/ap-modsecurity/html-multipage/processing-phases.html
+share/doc/ap-modsecurity/html-multipage/transformation-functions.html
+share/doc/ap-modsecurity/html-multipage/variables.html
+share/doc/ap-modsecurity/migration-matrix.html
+share/doc/ap-modsecurity/migration-matrix.xml
+share/doc/ap-modsecurity/html-multipage/ar01s02.html
+share/doc/ap-modsecurity/html-multipage/ar01s10.html
+share/doc/ap-modsecurity/html-multipage/apache_request_cycle-modsecurity.jpg
+share/doc/ap-modsecurity/html-multipage/breach-logo-small.gif
+share/doc/ap-modsecurity/html-multipage/index.html
+share/doc/ap-modsecurity/html-multipage/modsecurity-reference.css
+share/doc/ap-modsecurity/html-multipage/modsecurity.gif
+share/doc/ap-modsecurity/index.html
+share/doc/ap-modsecurity/modsecurity2-apache-reference.html
+share/doc/ap-modsecurity/modsecurity2-apache-reference.pdf
+share/doc/ap-modsecurity/modsecurity2-apache-reference.xml
+share/doc/ap-modsecurity/modsecurity.gif
+share/doc/ap-modsecurity/modsecurity-reference.css
+share/examples/ap-modsecurity/modsecurity.conf-minimal
+@dirrm share/doc/ap-modsecurity/html-multipage
+@dirrm share/doc/ap-modsecurity
+@dirrm share/examples/ap-modsecurity
diff --git a/security/ap-modsecurity2/distinfo b/security/ap-modsecurity2/distinfo
index a5183b21168..332ebc332f1 100644
--- a/security/ap-modsecurity2/distinfo
+++ b/security/ap-modsecurity2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/01/04 10:05:51 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2008/10/12 12:50:17 adrianp Exp $
 
-SHA1 (modsecurity-apache_2.1.4.tar.gz) = 2dbd940f8537641a0f0366b6ed6512e53e045589
-RMD160 (modsecurity-apache_2.1.4.tar.gz) = a782e78691f765f68bef13fda1786df750bf31dc
-Size (modsecurity-apache_2.1.4.tar.gz) = 676539 bytes
-SHA1 (patch-aa) = ab35a84c0576968661ae08c5dc14c156e7b9e13b
+SHA1 (modsecurity-apache_2.5.7.tar.gz) = 29a4f8f376dbc1ab3b05c943a1a3c1e4a9e8196a
+RMD160 (modsecurity-apache_2.5.7.tar.gz) = 063f68123bc8b70a4abc457c3794d751ab1ebede
+Size (modsecurity-apache_2.5.7.tar.gz) = 1117167 bytes
diff --git a/security/ap-modsecurity2/options.mk b/security/ap-modsecurity2/options.mk
index ea6bc51ff10..6d0f9e2b10c 100644
--- a/security/ap-modsecurity2/options.mk
+++ b/security/ap-modsecurity2/options.mk
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2007/03/18 10:35:13 adrianp Exp $
+# $NetBSD: options.mk,v 1.3 2008/10/12 12:50:17 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ap-modsecurity2
 
-PKG_SUPPORTED_OPTIONS=	xml
-PKG_SUGGESTED_OPTIONS=	xml
+PKG_SUPPORTED_OPTIONS=	curl
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,5 +11,18 @@ PKG_SUGGESTED_OPTIONS=	xml
 ###
 .if !empty(PKG_OPTIONS:Mxml)
 .  include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libxml
 MESSAGE_SRC+=		${WRKDIR}/.MESSAGE_SRC.xml
+.else
+CONFIGURE_ARGS+=	--without-libxml
+.endif
+
+###
+### Bring in support for curl
+###
+.if !empty(PKG_OPTIONS:Mcurl)
+.  include "../../www/curl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-curl=${PREFIX}/bin/curl
+.else
+CONFIGURE_ARGS+=	--without-curl
 .endif
diff --git a/security/ap-modsecurity2/patches/patch-aa b/security/ap-modsecurity2/patches/patch-aa
deleted file mode 100644
index 713a8efa8a7..00000000000
--- a/security/ap-modsecurity2/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2008/01/04 10:05:51 adrianp Exp $
-
---- apache2/Makefile.orig	2007-11-27 18:37:37.000000000 +0000
-+++ apache2/Makefile
-@@ -32,7 +32,7 @@ builddir     = .
- # XML references in the Core Ruleset if you choose not to include XML support.
- # In future versions of ModSecurity XML support will be required.
- #
--top_dir      = /usr/local/apache2
-+top_dir      = @PREFIX@/share/httpd
- 
- top_srcdir   = ${top_dir}
- top_builddir = ${top_dir}
-@@ -42,9 +42,9 @@ include ${top_builddir}/build/special.mk
- APXS      = apxs
- APACHECTL = apachectl
- 
--INCLUDES = -I /usr/include/libxml2
-+INCLUDES += -I@PREFIX@/include/httpd @XMLINC@
- #INCLUDES = -I /usr/include/libxml2 -I /path/to/httpd-x.y/srclib/pcre
--DEFS = -DWITH_LIBXML2
-+DEFS += @XMLDEFS@
- #DEFS = -DWITH_LIBXML2 -DNO_MODSEC_API
- #LIBS = -Lmy/lib/dir -lmylib
-