3 files changed, 11 insertions, 69 deletions
diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 8e691525f611..c07ffef214de 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_security
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.15 2008/07/01 19:43:17 hollow Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.16 2009/01/01 14:11:36 hollow Exp $
+
+*mod_security-2.5.6 (01 Jan 2009)
+
+  01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
+  -mod_security-2.5.1.ebuild, -mod_security-2.5.4.ebuild,
+  +mod_security-2.5.6.ebuild:
+  version bump wrt security #240946
 
 *mod_security-2.5.5 (01 Jul 2008)
 
diff --git a/www-apache/mod_security/mod_security-2.5.4.ebuild b/www-apache/mod_security/mod_security-2.5.4.ebuild
deleted file mode 100644
index 8986a2eca5a3..000000000000
--- a/www-apache/mod_security/mod_security-2.5.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 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.5.4.ebuild,v 1.1 2008/06/01 12:40:31 hollow Exp $
-
-inherit apache-module
-
-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="lua"
-
-DEPEND="dev-libs/libxml2
-	lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
-APACHE2_MOD_CONF="2.1.2/99_mod_security"
-APACHE2_MOD_DEFINE="SECURITY"
-
-need_apache2
-
-src_compile() {
-	cd apache2
-
-	econf --with-apxs="${APXS}" \
-		--without-curl \
-		$(use_with lua) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	apache-module_src_install
-
-	# install rules updater
-	newbin tools/rules-updater.pl rules-updater
-
-	# install documentation
-	dodoc CHANGES
-	newdoc rules/CHANGELOG CHANGES.crs
-	newdoc rules/README README.crs
-	dohtml doc/*.html doc/*.gif doc/*.jpg doc/*.css doc/*.pdf
-	insinto /usr/share/doc/${P}/html/
-	doins -r doc/html-multipage
-
-	# Prepare the core ruleset
-	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
-
-	# Install core ruleset
-	insinto ${APACHE_MODULES_CONFDIR}/mod_security/
-	doins "${S}"/rules/*.conf
-}
diff --git a/www-apache/mod_security/mod_security-2.5.1.ebuild b/www-apache/mod_security/mod_security-2.5.6.ebuild
index 42f05e5bbe70..26cb7161ac7b 100644
--- a/www-apache/mod_security/mod_security-2.5.1.ebuild
+++ b/www-apache/mod_security/mod_security-2.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.5.1.ebuild,v 1.2 2008/04/25 11:20:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.5.6.ebuild,v 1.1 2009/01/01 14:11:36 hollow Exp $
 
 inherit apache-module