summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_security/ChangeLog8
-rw-r--r--www-apache/mod_security/mod_security-2.5.4.ebuild (renamed from www-apache/mod_security/mod_security-2.1.4_rc1.ebuild)27
2 files changed, 28 insertions, 7 deletions
diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 2e83c1dde87a..1e3c92f99304 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.13 2008/04/25 11:20:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.14 2008/06/01 12:40:31 hollow Exp $
+
+*mod_security-2.5.4 (01 Jun 2008)
+
+ 01 Jun 2008; Benedikt Böhm <hollow@gentoo.org>
+ -mod_security-2.1.4_rc1.ebuild, +mod_security-2.5.4.ebuild:
+ version bump wrt #221763
25 Apr 2008; Benedikt Böhm <hollow@gentoo.org> mod_security-2.5.1.ebuild:
install rules-updater wrt #219059
diff --git a/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild b/www-apache/mod_security/mod_security-2.5.4.ebuild
index c062e688e90d..8986a2eca5a3 100644
--- a/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild
+++ b/www-apache/mod_security/mod_security-2.5.4.ebuild
@@ -1,6 +1,6 @@
# 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.1.4_rc1.ebuild,v 1.2 2008/01/29 18:01:39 hollow Exp $
+# $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
@@ -14,29 +14,44 @@ SRC_URI="http://www.modsecurity.org/download/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="doc"
+IUSE="lua"
-DEPEND="dev-libs/libxml2"
+DEPEND="dev-libs/libxml2
+ lua? ( >=dev-lang/lua-5.1 )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
-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_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
- cp -r "${S}"/doc/html-multipage "${D}"/usr/share/doc/${P}/html/
+ 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