Version bump.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

3 files changed, 92 insertions, 6 deletions

diff --git a/www-apache/modsecurity-crs/ChangeLog b/www-apache/modsecurity-crs/ChangeLog
index 7ef8c3dff397..7acbfb63e989 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.13 2011/09/20 15:35:13 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.14 2011/10/17 21:58:10 flameeyes Exp $
+
+*modsecurity-crs-2.2.2 (17 Oct 2011)
+
+  17 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +modsecurity-crs-2.2.2.ebuild:
+  Version bump.
 
   20 Sep 2011; Andreas Schuerch <nativemad@gentoo.org>
   modsecurity-crs-2.1.2.ebuild:
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index fe225f266257..7d647526b26c 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -3,14 +3,16 @@ 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
+DIST modsecurity-crs_2.2.2.tar.gz 291713 RMD160 293ed9e41270020d17c1c1fcf4025394c37fa0a9 SHA1 60efc8df5210ada0f3ab2d5ef5f93979675be19c SHA256 5b3e3187b49be3dc5ba026b39f2f76cf4a76b0d6cf9077fc0f650ec52d59e52a
 EBUILD modsecurity-crs-2.1.2.ebuild 2116 RMD160 0145c9ad4750abe8a64b2ebfba349ec5c41897a1 SHA1 169b08d87ae97eaa9ddb12b805417668a13264c5 SHA256 810bbdbe1de249edbf95246640dcdb1be86662b92132deb0d9f4808787608e53
 EBUILD modsecurity-crs-2.2.1.ebuild 2123 RMD160 0265c6a4b62333ac2cd73476ae1b756d14d9ff55 SHA1 5e76c98ea64efa4e939c16b1e62eef34c2712128 SHA256 99443efdc78ba88b0a1b5f98f180b3e3c3850118b8f104fad749dc93d9e62016
-MISC ChangeLog 2304 RMD160 dd791e03bc6b6e9bde038d2020ef4112bdd5676d SHA1 501eef5b85a8785875f17405e33d6247d543f42e SHA256 c01bf9a9f995b6dc81df04909f34eada2cb779fbb242c6d4b13813750a118b10
+EBUILD modsecurity-crs-2.2.2.ebuild 2123 RMD160 81bd199004e97c165c9ab29db983d203a2a8523c SHA1 14998353ed004bf32f1b445180c78927e05d0db1 SHA256 8727de5a3403b37d0c54e9615e725de80a5caa502ea2e09e71a7329a6d30863c
+MISC ChangeLog 2448 RMD160 658ff8ef42c84a9efd3bf2bf6eb0593cd9108456 SHA1 757d7a55ba96d07be2fc213400d24f687e9fbaa4 SHA256 3fcbf82ca2585f7064add066bba5b0e096b35ae727f4168bc90cc6932c044dfd
 MISC metadata.xml 267 RMD160 511ac4eac08cf7c7598b7f0dd2c2a7b54b2a6d17 SHA1 7cfd482a8ab9b30e3e424c19cfef49ccc93013c8 SHA256 0c11886362b779764fbeda77806037b3625b1c11375b7ecc1b7ad3e20ec6a1ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk55ItUACgkQB6aLYPQCwOCQbQCeO6o77scYx0rT7JEavxJA48gZ
-9GsAoOZkqxDMaAFnFn81t/esirNvjghH
-=jh/8
+iEYEARECAAYFAk6cpKwACgkQAiZjviIA2XhaVgCgtIKUZwbd15f5UC9a1u50kNC3
+2IcAn1q4E+Y/KR5v3vXCJlCD9XPdqXEQ
+=x716
 -----END PGP SIGNATURE-----
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.2.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.2.2.ebuild
new file mode 100644
index 000000000000..ca5484e011d7
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-2.2.2.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.2.ebuild,v 1.1 2011/10/17 21:58:10 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 ""
+}