Version bump. This time disable some draconic/nearly-idiotic rules.

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

3 files changed, 123 insertions, 5 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index d96a8371c538..996eaa2a6e7a 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2009/10/26 10:26:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.31 2009/11/16 10:18:52 flameeyes Exp $
+
+*mod_security-2.5.11 (16 Nov 2009)
+
+  16 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +mod_security-2.5.11.ebuild:
+  Version bump. This time disable some draconic/nearly-idiotic rules.
 
 *mod_security-2.5.10-r1 (26 Oct 2009)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index e0927370ead6..b59c69e32cdc 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -8,16 +8,18 @@ AUX mod_security-2.5.10-broken-autotools.patch 626 RMD160 5c11f992e483b64cfada87
 AUX mod_security-2.5.9-as-needed.patch 1166 RMD160 e70d1e0ff9e8396d4447e25bb0664111a27a31ff SHA1 d2e35d9a823ec37fd11119644bff4c2373b31553 SHA256 4438e7cc1675ce23354cd6ba9c74b5b669f2f80629bdd4cc7532e48cda8ebfd5
 AUX mod_security-2.5.9-broken-autotools.patch 2103 RMD160 795e3fc59b881bf02fa5a65b6dae4f120de253f0 SHA1 773a56d9e177056be3de0b0c85747478fb5f3b2f SHA256 68df2416a6b464719fb41772472fd04b196b9fee7e102fc76f95c6827282a283
 DIST modsecurity-apache_2.5.10.tar.gz 1290172 RMD160 f1934fb2304a090359073c4d74630ce5a34848e1 SHA1 033e91784b3b47ea3f2175996f122c48b104c27f SHA256 c07153cbebd21f90189c2e9647dc48e472e2e4fd2868260b71e1c741b18fbbba
+DIST modsecurity-apache_2.5.11.tar.gz 1338425 RMD160 1d9769bda6ddc0c65f5e7be452515c4f1980b8c1 SHA1 aa8ec8d637efb0c646c41eb6880e684df04f8214 SHA256 fd81a8998327ef2010426fcc2899312eddfe4dc462c417e9e7aeb64a6d4ed2bf
 DIST modsecurity-apache_2.5.9.tar.gz 1252295 RMD160 adab10e5eab50f0d114e3ccb47c343e744119c8f SHA1 875919332a918956371fe8e2f7e46d88081857cf SHA256 02352221ea268f8ae9aae5b84507f51eba2a67c0f7d2efd5cc88e85f1f394056
 EBUILD mod_security-2.5.10-r1.ebuild 2851 RMD160 0ead0f2cf06d1a10d30c549480a1342eb0b86a7e SHA1 676064e71b926971734aca80064af41706a8b22f SHA256 62bd9389ca3d55403b530b97fdbaf086799f1196967a047e1a801c194399f8be
+EBUILD mod_security-2.5.11.ebuild 2795 RMD160 afee7295e01f7664ee7e717700213b41fd95c4ac SHA1 6bf6df1529d96b3bd5113e6bb61f10f51587ea55 SHA256 91148490cce3d80cb4911ec456dc2ff5a9b36beb46bfacca84845ed934db6eed
 EBUILD mod_security-2.5.9-r1.ebuild 2791 RMD160 ae084781f213ba77d9bf322ebd511c45cafc0f49 SHA1 98d89c70534b0131f1a5c5b85ad97fb9c00a2b8c SHA256 1992430794f4712bf273933b23be93b7031cdb0570a198bf3ff490664bfdeb90
 EBUILD mod_security-2.5.9.ebuild 1944 RMD160 2007bd7cea81b0179a487ac2c96e1901791b02bb SHA1 0c3a515418374db4cd7e11d95bf6dac31fb5374b SHA256 aa0c4b31738d2c5da6e7ace0d766fceaf9fd5c8cccd8f8707ad9ef36a1912c88
-MISC ChangeLog 9266 RMD160 540520407e88efd4a41362d8f7863ee46321c885 SHA1 0439c4277b30d0053cf3c16875eac9b279442580 SHA256 21717344f17247694e343a9fed1b671b8f74f8fd2c9510d8dd45e4cd74f623c1
+MISC ChangeLog 9460 RMD160 33c167d6a66b5d7cf1472ea6afd4ebb0d6399eed SHA1 b1539bd5a4b8f518ae56c4dbc3fd8879a087c5ae SHA256 69c97e5276692ce9596813ba892ef4c6258e3b205fa062a1e8bfd02f1e42fc15
 MISC metadata.xml 355 RMD160 e410b8b84944364f7964a593beee5dcc44120715 SHA1 43dcb86ef95026473f5b7feedd9bdf9a5c10aa5d SHA256 a5c675cccf7a693a7c467e2e154a55ede60bb80663f10e282cc5dd8c906b7f22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrleVkACgkQAiZjviIA2Xj7CgCeOeKDCrViXo6Y3k+BIp6vg2yE
-bx0AoLjhi8C8OL/pOmqI5QEWH2a2p6e2
-=Q4sy
+iEYEARECAAYFAksBJxgACgkQAiZjviIA2XgVbACeNLIxbf80jvxAO7/TYN5ID2Wv
+iJwAn3o/EE/b/t9cfXAIP4If9YYhDXrc
+=tN23
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.5.11.ebuild b/www-apache/mod_security/mod_security-2.5.11.ebuild
new file mode 100644
index 000000000000..fd5a5b6154a5
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.5.11.ebuild
@@ -0,0 +1,110 @@
+# 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.11.ebuild,v 1.1 2009/11/16 10:18:52 flameeyes Exp $
+
+inherit apache-module autotools
+
+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 perl"
+
+DEPEND="dev-libs/libxml2
+	perl? ( dev-perl/libwww-perl )
+	lua? ( >=dev-lang/lua-5.1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
+APACHE2_MOD_CONF="2.5.10/99_mod_security"
+APACHE2_MOD_DEFINE="SECURITY"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"/apache2
+
+	epatch "${FILESDIR}"/${PN}-2.5.10-broken-autotools.patch
+	epatch "${FILESDIR}"/${PN}-2.5.10-as-needed.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	cd apache2
+
+	econf --with-apxs="${APXS}" \
+		--without-curl \
+		$(use_with lua) \
+		|| die "econf failed"
+
+	APXS_FLAGS=
+	for flag in ${CFLAGS}; do
+		APXS_FLAGS="${APXS_FLAGS} -Wc,${flag}"
+	done
+
+	# Yes we need to prefix it _twice_
+	for flag in ${LDFLAGS}; do
+		APXS_FLAGS="${APXS_FLAGS} -Wl,${flag}"
+	done
+
+	emake \
+		APXS_CFLAGS="${CFLAGS}" \
+		APXS_LDFLAGS="${LDFLAGS}" \
+		APXS_EXTRA_CFLAGS="${APXS_FLAGS}" \
+		|| die "emake failed"
+}
+
+src_test() {
+	cd apache2
+	make test || die
+}
+
+src_install() {
+	apache-module_src_install
+
+	# install rules updater only if perl is enabled (optionally)
+	if use perl; then
+		newsbin tools/rules-updater.pl modsec-rules-updater || die
+	fi
+
+	# install documentation
+	dodoc CHANGES || die
+	newdoc rules/CHANGELOG CHANGES.crs || die
+	newdoc rules/README README.crs || die
+	dohtml -r doc/* || die
+
+	# Prepare the core ruleset
+	cd "${S}"/rules/
+
+	sed -i -e 's:logs/:/var/log/apache2/:g' *.conf || die
+
+	insinto ${APACHE_MODULES_CONFDIR}/mod_security/
+	doins *.conf base_rules/* || die
+
+	insinto ${APACHE_MODULES_CONFDIR}/mod_security/optional_rules
+	doins optional_rules/* || die
+
+	mv "${D}"${APACHE_MODULES_CONFDIR}/mod_security/modsecurity_*{41_phpids,50_outbound}* \
+		"${D}"${APACHE_MODULES_CONFDIR}/mod_security/optional_rules || die
+}
+
+pkg_postinst() {
+	elog "Please note that the core rule set distributed with mod_security is quite"
+	elog "draconic; to make it more usable, the Gentoo distribution disables a few"
+	elog "rule set files, that are relevant for PHP-only websites or that would make it"
+	elog "kill a website that discussed of source code."
+	elog
+	elog "If you want to enable further rules, check the following directory:"
+	elog "	${APACHE_MODULES_CONFDIR}/mod_security/optional_rules"
+}