3 files changed, 91 insertions, 15 deletions
diff --git a/www-apache/modsecurity-crs/ChangeLog b/www-apache/modsecurity-crs/ChangeLog
index 8fc5f6b22ee2..b91ddfa446d3 100644
--- a/www-apache/modsecurity-crs/ChangeLog
+++ b/www-apache/modsecurity-crs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/modsecurity-crs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.10 2011/09/03 09:05:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.11 2011/09/17 08:56:50 flameeyes Exp $
+
+*modsecurity-crs-2.2.1 (17 Sep 2011)
+
+  17 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +modsecurity-crs-2.2.1.ebuild:
+  Version bump; thanks to Kilburn Abrahams in bug #382119.
 
   03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   modsecurity-crs-2.1.2.ebuild, metadata.xml:
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 71aa63c9617f..bcdf512856fa 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -2,23 +2,15 @@
 Hash: SHA1
 
 DIST modsecurity-crs_2.1.2.tar.gz 173951 RMD160 4c4b23388e0455afb12cd0eed8d8d01bf5ca9392 SHA1 206bcb2392477187696efbad788cd86e722303db SHA256 78216d659b13dc18ab25bd6e01d58e5b636edf6a20666629f462e2fabea068a7
+DIST modsecurity-crs_2.2.1.tar.gz 381673 RMD160 7f2881c5203cda0505894231867cf09a29b112a5 SHA1 ab5591b7f10cbad720abe13172b5af081013a819 SHA256 99a7ffc0592a30792a2fb2b7ebc5467db275c4790638afb567a5319c0de3f930
 EBUILD modsecurity-crs-2.1.2.ebuild 2118 RMD160 9dafd9a844cc3f924b1b76d31f551a50f3d555ea SHA1 c506c19fb9ebc259ecac410f02978ba2683dfc5f SHA256 780d1d755026fe23d0756e6951ecba89bb3547455dae04532382ccf24373875b
-MISC ChangeLog 1811 RMD160 a4f57b612ab705133450b485e5a90b43abe0c2be SHA1 b868f87daa9b32216eca10d56bfd1c7a6c633e52 SHA256 e79882bd2aff0430d2a09bc86d59efddd01df8455a72e624652908b5317c7986
+EBUILD modsecurity-crs-2.2.1.ebuild 2123 RMD160 0265c6a4b62333ac2cd73476ae1b756d14d9ff55 SHA1 5e76c98ea64efa4e939c16b1e62eef34c2712128 SHA256 99443efdc78ba88b0a1b5f98f180b3e3c3850118b8f104fad749dc93d9e62016
+MISC ChangeLog 1998 RMD160 76d71a672393c8fc8d6a518373fb28ddc2ccccba SHA1 37f5f52985fe97792e8fad01d233174118a3d519 SHA256 1ff57e682298517848c43cbd5a34e2dea29c083e406ec82535638c4c141c8fd5
 MISC metadata.xml 267 RMD160 511ac4eac08cf7c7598b7f0dd2c2a7b54b2a6d17 SHA1 7cfd482a8ab9b30e3e424c19cfef49ccc93013c8 SHA256 0c11886362b779764fbeda77806037b3625b1c11375b7ecc1b7ad3e20ec6a1ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOYe3MAAoJEOSiRoyO7jvoCygP/1PVqQX3+D+k8jJ4PHL8R8Eq
-x0FA2HqS/sYb8CbzPdopJU0Ke0e1yfuvOdsg3yfEzYdKLtVm7d2TL8bjCnWPOXE0
-Jd/qWyaC4xHX0hoMk093zKqTvRFAEQOsdpqHKtLp+J3QDiaaxlJIFXqvLv+vYCdG
-Arl0Q32fm0B4AzHk+YHq0+0Y3Oba8vDYdaEsXxcYGYtnlipweZVWObNwZ08zf3Lw
-HTAk4Wk5GJgcHAYX8L4PVgZqfyYM2jQCjlbK5NBDpNFe8pHIKg8FMh9XIXBhBF1d
-lbAkfLMDUaPOLFVX5RFSls2mDe6qBZqaXBacYlxG764J2TixY1v3aFmv/33K2Wmd
-X+w5ZINpFXmH8xMgHb1d8zMcsAS+guCvCbohrxkzAu5dNWGZyTr/mtQFfGULeoK/
-PBCkzgBODiWScXD2jlSX7ggqqknMofG4L2MSpmlhaUREl2LPpXJ//khS2csRexsk
-eW8XhlKiUEeSWdWYWtQ5xy7h4MsV75cx5GpdpluzJU0ot0m+Zqa1ClP3zGGznqk6
-l+CgU57ua+QG8kuNb++FGxRxtRyT9AP50769pJBmU2w+fjRL9TdX/ZWIxHRMykhZ
-6A4iradVvJjl75t35Hz7TzLO2T2ozrbb/jqW1aOu3216LytB3mE7/RY0HEFyEqW5
-09gc9Af/mvqzR1V+4Fga
-=anQ6
+iEYEARECAAYFAk50YL8ACgkQAiZjviIA2XgfzwCfdUi0NgnV/wt7Cnv9AvrQvDok
+isQAoODCA+joCMtMlgKSpductLIx3BdF
+=8YkX
 -----END PGP SIGNATURE-----
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.2.1.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.2.1.ebuild
new file mode 100644
index 000000000000..54aa7a86f759
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-2.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/modsecurity-crs-2.2.1.ebuild,v 1.1 2011/09/17 08:56:50 flameeyes Exp $
+
+EAPI=4
+
+DESCRIPTION="Core Rule Set for ModSecurity"
+HOMEPAGE="http://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project"
+SRC_URI="mirror://sourceforge/mod-security/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=www-apache/mod_security-2.5.13-r1"
+DEPEND=""
+
+S="${WORKDIR}/${PN}_${PV}"
+
+RULESDIR=/etc/modsecurity
+
+src_install() {
+	insinto "${RULESDIR}"/base_rules
+	doins base_rules/*
+
+	insinto "${RULESDIR}"/optional_rules
+	doins optional_rules/*
+
+	insinto "${RULESDIR}"/experimental_rules
+	doins experimental_rules/*
+
+	dodoc CHANGELOG README
+
+	(
+		cat - <<EOF
+<IfDefine SECURITY>
+EOF
+
+		cat modsecurity_crs_10_config.conf.example
+
+		cat - <<EOF
+
+Include /etc/modsecurity/base_rules/*.conf
+
+# Optionally use the other rules as well
+# Include /etc/modsecurity/optional_rules/*.conf
+# Include /etc/modsecurity/experimental_rules/*.conf
+</IfDefine>
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
+
+EOF
+	) > "${T}"/"80_${PN}.conf"
+
+	insinto /etc/apache2/modules.d/
+	doins "${T}"/"80_${PN}.conf"
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want to enable further rules, check the following directories:"
+	elog "	${RULESDIR}/optional_rules"
+	elog "	${RULESDIR}/experimental_rules"
+	elog ""
+	elog "Starting from version 2.0.9, the default for the Core Rule Set is again to block"
+	elog "when rules hit. If you wish to go back to the 2.0.8 method of anomaly scoring, you"
+	elog "should change 80_${PN}.conf so that you have these settings enabled:"
+	elog ""
+	elog "    #SecDefaultAction \"phase:2,deny,log\""
+	elog "    SecAction \"phase:1,t:none,nolog,pass,setvar:tx.anomaly_score_blocking=on\""
+	elog ""
+	elog "Starting from version 2.1.2 rules are installed, for consistency, under"
+	elog "/etc/modsecurity, and can be configured with the following file:"
+	elog "  /etc/apache2/modules.d/80_${PN}.conf"
+	elog ""
+}