version bump

(Portage version: 2.1.3.13)

4 files changed, 22 insertions, 16 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 662947d5e5d9..830135e9a63b 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2007/09/27 13:56:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.8 2007/10/21 12:35:14 hollow Exp $
+
+*mod_security-2.1.4_rc1 (21 Oct 2007)
+
+  21 Oct 2007; Benedikt Böhm <hollow@gentoo.org>
+  -mod_security-2.1.1.ebuild, +mod_security-2.1.4_rc1.ebuild:
+  version bump
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> mod_security-2.1.2.ebuild:
   sparc stable wrt #191973
diff --git a/www-apache/mod_security/files/digest-mod_security-2.1.1 b/www-apache/mod_security/files/digest-mod_security-2.1.1
deleted file mode 100644
index af3a5b2f6338..000000000000
--- a/www-apache/mod_security/files/digest-mod_security-2.1.1
+++ /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.4_rc1 b/www-apache/mod_security/files/digest-mod_security-2.1.4_rc1
new file mode 100644
index 000000000000..484477b528f4
--- /dev/null
+++ b/www-apache/mod_security/files/digest-mod_security-2.1.4_rc1
@@ -0,0 +1,3 @@
+MD5 823ce2823cf3596cfefd9fbc1317e133 modsecurity-apache_2.1.4-rc1.tar.gz 676134
+RMD160 b35ca41a076a91ded4508430c6abbcf206abecaa modsecurity-apache_2.1.4-rc1.tar.gz 676134
+SHA256 6af611efc37d6e7fbb41503eb339e7604e0910f4a2867c20c32e6bf21885f8bf modsecurity-apache_2.1.4-rc1.tar.gz 676134
diff --git a/www-apache/mod_security/mod_security-2.1.1.ebuild b/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild
index 46a875212aa9..703c8052cfa7 100644
--- a/www-apache/mod_security/mod_security-2.1.1.ebuild
+++ b/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild
@@ -1,31 +1,35 @@
 # 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.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.4_rc1.ebuild,v 1.1 2007/10/21 12:35:14 hollow Exp $
 
 inherit apache-module
 
-KEYWORDS="amd64 ~mips ppc sparc x86"
-
 MY_P=${P/mod_security-/modsecurity-apache_}
+MY_P=${MY_P/_rc/-rc}
 
 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="2.1.2/99_mod_security"
 APACHE2_MOD_DEFINE="SECURITY"
 
 need_apache2
 
 src_install() {
-	apache2_src_install
+	apache-module_src_install
 
 	# install documentation
 	dodoc CHANGES
@@ -34,13 +38,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