diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-10-26 10:26:14 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-10-26 10:26:14 +0000 |
| commit | 96f42625aae960a9cbf2485313c8eb9057e584ab (patch) | |
| tree | 7eaf73af25c0d9ee6deb5949546bfee7f0e4fd36 /www-apache | |
| parent | x11-proto/dmxproto: sync with overlay, add blocker, fixes bug #288619 (diff) | |
| download | gentoo-2-96f42625aae960a9cbf2485313c8eb9057e584ab.tar.gz gentoo-2-96f42625aae960a9cbf2485313c8eb9057e584ab.tar.bz2 gentoo-2-96f42625aae960a9cbf2485313c8eb9057e584ab.zip | |
Revision bump; install the proper ruleset; install a new config file.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'www-apache')
| -rw-r--r-- | www-apache/mod_security/ChangeLog | 9 | ||||
| -rw-r--r-- | www-apache/mod_security/files/2.5.10/99_mod_security.conf | 12 | ||||
| -rw-r--r-- | www-apache/mod_security/mod_security-2.5.10-r1.ebuild (renamed from www-apache/mod_security/mod_security-2.5.10.ebuild) | 11 |
3 files changed, 26 insertions, 6 deletions
diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog index eb8aafc8c622..d96a8371c538 100644 --- a/www-apache/mod_security/ChangeLog +++ b/www-apache/mod_security/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-apache/mod_security # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.29 2009/10/02 10:46:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.30 2009/10/26 10:26:14 flameeyes Exp $ + +*mod_security-2.5.10-r1 (26 Oct 2009) + + 26 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org> + +files/2.5.10/99_mod_security.conf, -mod_security-2.5.10.ebuild, + +mod_security-2.5.10-r1.ebuild: + Revision bump; install the proper ruleset; install a new config file. 02 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org> mod_security-2.5.10.ebuild, diff --git a/www-apache/mod_security/files/2.5.10/99_mod_security.conf b/www-apache/mod_security/files/2.5.10/99_mod_security.conf new file mode 100644 index 000000000000..bb5bb0ce59d9 --- /dev/null +++ b/www-apache/mod_security/files/2.5.10/99_mod_security.conf @@ -0,0 +1,12 @@ +<IfDefine SECURITY> +LoadModule security2_module modules/mod_security2.so + +# use Core Rule Set by default: +Include /etc/apache2/modules.d/mod_security/*.conf + +# Optionally use the other rules as well +# Include /etc/apache2/modules.d/mod_security/optional_rules/*.conf + +</IfDefine> + +# vim: ts=4 filetype=apache diff --git a/www-apache/mod_security/mod_security-2.5.10.ebuild b/www-apache/mod_security/mod_security-2.5.10-r1.ebuild index 7468d9ee509d..3a8e97dccf09 100644 --- a/www-apache/mod_security/mod_security-2.5.10.ebuild +++ b/www-apache/mod_security/mod_security-2.5.10-r1.ebuild @@ -1,6 +1,6 @@ # 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.10.ebuild,v 1.2 2009/10/02 10:46:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.5.10-r1.ebuild,v 1.1 2009/10/26 10:26:14 flameeyes Exp $ inherit apache-module autotools @@ -24,7 +24,7 @@ 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_CONF="2.5.10/99_mod_security" APACHE2_MOD_DEFINE="SECURITY" need_apache2 @@ -90,9 +90,10 @@ src_install() { sed -i -e 's:logs/:/var/log/apache2/:g' *.conf || die insinto ${APACHE_MODULES_CONFDIR}/mod_security/ - for i in *.conf; do - newins ${i} ${i/modsecurity_crs_/} || die - done + doins *.conf base_rules/* || die + + insinto ${APACHE_MODULES_CONFDIR}/mod_security/optional_rules + doins optional_rules/* || die } pkg_postinst() { |