version bump; fixes #180150, #189995, #191381, #181887, #190301

(Portage version: 2.1.3.7)

6 files changed, 31 insertions, 37 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 41be38a14011..738a7234962a 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_security
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.2 2007/08/04 17:25:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.3 2007/09/08 08:10:52 hollow Exp $
+
+*mod_security-2.1.2 (08 Sep 2007)
+
+  08 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
+  -files/mod_security-2.1.1-request_interception.patch,
+  +files/2.1.2/99_mod_security.conf, -mod_security-2.1.1-r1.ebuild,
+  +mod_security-2.1.2.ebuild:
+  version bump; fixes #180150, #189995, #191381, #181887, #190301
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org>
   +files/mod_security-2.1.1-request_interception.patch,
diff --git a/www-apache/mod_security/files/2.1.2/99_mod_security.conf b/www-apache/mod_security/files/2.1.2/99_mod_security.conf
new file mode 100644
index 000000000000..78344cde8c87
--- /dev/null
+++ b/www-apache/mod_security/files/2.1.2/99_mod_security.conf
@@ -0,0 +1,8 @@
+<IfDefine SECURITY>
+	<IfModule !mod_security2.c>
+		LoadModule security2_module modules/mod_security2.so
+	</IfModule>
+
+	# use Core Rule Set by default:
+	Include /etc/apache2/modules.d/mod_security/*.conf
+</IfDefine>
diff --git a/www-apache/mod_security/files/digest-mod_security-2.1.1-r1 b/www-apache/mod_security/files/digest-mod_security-2.1.1-r1
deleted file mode 100644
index af3a5b2f6338..000000000000
--- a/www-apache/mod_security/files/digest-mod_security-2.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ab74ed5f320ffc4ed9f56487bf17c670 modsecurity-apache_2.1.1.tar.gz 650607
-RMD160 17e94c19d51f7e9e09ef435f81d696ec638aad44 modsecurity-apache_2.1.1.tar.gz 650607
-SHA256 fadeb3b4ce5672c99c094611792b827d45fcd6b38c4c4fa81c4cfdc63c63b71a modsecurity-apache_2.1.1.tar.gz 650607
diff --git a/www-apache/mod_security/files/digest-mod_security-2.1.2 b/www-apache/mod_security/files/digest-mod_security-2.1.2
new file mode 100644
index 000000000000..8cbd7d80b1f3
--- /dev/null
+++ b/www-apache/mod_security/files/digest-mod_security-2.1.2
@@ -0,0 +1,3 @@
+MD5 5ccba4e4db79d63aa5584f15e86b3992 modsecurity-apache_2.1.2.tar.gz 657803
+RMD160 3d0d2a767133ab1ec1ef3848e2f85c3c1652cf1f modsecurity-apache_2.1.2.tar.gz 657803
+SHA256 88644e0a512534e394d434df3f0f233889d9e6a5a91ed2e893b5bb9a4d190c8a modsecurity-apache_2.1.2.tar.gz 657803
diff --git a/www-apache/mod_security/files/mod_security-2.1.1-request_interception.patch b/www-apache/mod_security/files/mod_security-2.1.1-request_interception.patch
deleted file mode 100644
index 5f38268e203d..000000000000
--- a/www-apache/mod_security/files/mod_security-2.1.1-request_interception.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: apache2/mod_security2.c
-===================================================================
---- apache2/mod_security2.c	(revision 266)
-+++ apache2/mod_security2.c	(working copy)
-@@ -558,6 +558,10 @@
- 
-     /* Has this phase been completed already? */
-     if (msr->phase_request_body_complete) {
-+        if (msr->was_intercepted) {
-+            msr_log(msr, 4, "Phase REQUEST_BODY subrequest already intercepted with code %u.", msr->intercept_actionset->intercept_status);
-+            return msr->intercept_actionset->intercept_status;
-+        }
-         if (msr->txcfg->debuglog_level >= 4) {
-             msr_log(msr, 4, "Phase REQUEST_BODY already complete, skipping.");
-         }
diff --git a/www-apache/mod_security/mod_security-2.1.1-r1.ebuild b/www-apache/mod_security/mod_security-2.1.2.ebuild
index 3ebf9e242670..d3c2d9fc8e58 100644
--- a/www-apache/mod_security/mod_security-2.1.1-r1.ebuild
+++ b/www-apache/mod_security/mod_security-2.1.2.ebuild
@@ -1,35 +1,32 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.1.1-r1.ebuild,v 1.1 2007/07/29 13:47:06 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.1.2.ebuild,v 1.1 2007/09/08 08:10:52 hollow Exp $
 
-inherit eutils apache-module
-
-KEYWORDS="amd64 ~mips ppc sparc x86"
+inherit apache-module
 
 MY_P=${P/mod_security-/modsecurity-apache_}
 
 DESCRIPTION="Web application firewall and Intrusion Detection System for Apache."
 HOMEPAGE="http://www.modsecurity.org/"
 SRC_URI="http://www.modsecurity.org/download/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 IUSE="doc"
 
+DEPEND="dev-libs/libxml2"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/${MY_P}"
 
-APXS2_ARGS="-S LIBEXECDIR=${S} -c -o ${PN}2.so ${S}/apache2/*.c"
+APXS2_ARGS="-DWITH_LIBXML2 -I/usr/include/libxml2 -lxml2 -S LIBEXECDIR=${S} -c -o ${PN}2.so ${S}/apache2/*.c"
 APACHE2_MOD_FILE=".libs/${PN}2.so"
-#APACHE2_MOD_CONF="99_mod_security"
+APACHE2_MOD_CONF="${PVR}/99_mod_security"
 APACHE2_MOD_DEFINE="SECURITY"
 
 need_apache2
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-request_interception.patch
-}
-
 src_install() {
 	apache2_src_install
 
@@ -40,13 +37,9 @@ src_install() {
 	dohtml doc/*.html doc/*.gif doc/*.jpg doc/*.css doc/*.pdf
 	cp -r "${S}"/doc/html-multipage "${D}"/usr/share/doc/${P}/html/
 
-	# Once APACHE2_MOD_CONF is able to use newconfd (probably never), this line
-	# should go.
-	insinto ${APACHE2_MODULES_CONFDIR}
-	newins "${FILESDIR}"/99_mod_security-${PV}.conf 99_mod_security.conf
-
 	# Prepare the core ruleset
-	for i in $( ls "${S}"/rules/*.conf ); do
+	sed -i -e 's:logs/:/var/log/apache2/:g' "${S}"/rules/*.conf
+	for i in "${S}"/rules/*.conf; do
 		mv $i ${i/modsecurity_crs_/}
 	done