Version bump, the phpids is optional upstream now.

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

3 files changed, 87 insertions, 2 deletions

diff --git a/www-apache/modsecurity-crs/ChangeLog b/www-apache/modsecurity-crs/ChangeLog
index 95b9b5122b02..ee9c29661e59 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.3 2010/10/24 17:41:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.4 2010/12/01 21:38:02 flameeyes Exp $
+
+*modsecurity-crs-2.0.10 (01 Dec 2010)
+
+  01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +modsecurity-crs-2.0.10.ebuild:
+  Version bump, the phpids is optional upstream now.
 
   24 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   modsecurity-crs-2.0.8.ebuild:
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index b7f6e73c4708..244326ef86bb 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST modsecurity-crs_2.0.10.tar.gz 149997 RMD160 00ef9f03b69e86b5dcd930ce352b734b80ef8560 SHA1 32e52f534f84d0c2bb9ce57464670bf76b8578be SHA256 9f26c579f802fe1ef9ab254e34a6a34a4c3e468bfe0d61d09eea36485b208865
 DIST modsecurity-crs_2.0.8.tar.gz 155889 RMD160 c4fb5ef6c48a8aade6d9b8c95e9acd2f9c5d2a40 SHA1 382713ecdb6ab57904a03fdae0eae311f8d4b3c3 SHA256 11ec4bb68f455924298e998a283664ba710aeb45d4ea6e70dd5ac8a22345f890
+EBUILD modsecurity-crs-2.0.10.ebuild 2334 RMD160 bfe32f9dd6a5a54b1904fd147a3799b5714714e4 SHA1 e83add2857f40282f65840a749080b50ae223f89 SHA256 4a1e925356ebacd7cb94ded2f0620f0b3e483a3762802bc81c6bd10807f6514e
 EBUILD modsecurity-crs-2.0.8.ebuild 2176 RMD160 1c627c98c4491a89db6e0aeabaeac3005fe28b38 SHA1 7c98f5444697f8af091d48782af8c2fb49d5f5fd SHA256 6586b994e412d1122a1dd3f6fde94c4cbae75140e6beb067b9a2a6847dc537ea
-MISC ChangeLog 667 RMD160 d7b854826520b5b0a6279dd9619e2fdf7c615ad6 SHA1 0209e50638729d960e8b5865f1bf6af3723a408f SHA256 5ff38024f4989297a9486c3d587c9d52b59c804ab9a26ccb8004299f8aa11766
+MISC ChangeLog 852 RMD160 cac106db4790c1b99bab514c5482eb18a2aeb0ea SHA1 36106859ca1568c59c70d25f29f88c390700541c SHA256 0bd4ed072edc4aa662498362891bec19ed20a441ce34029589c141e9e9382d85
 MISC metadata.xml 663 RMD160 86ce5a300643284f72a5c9a657f6946163e23e44 SHA1 6b9a9355f552f3c869a1b00ad8586b77a132cf16 SHA256 aceb77ecf1564c16e052cfb222a508649ffe176ed6745d13a22d2b1a2cceae45
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz2wDwACgkQAiZjviIA2XgHMgCeMa5aCT0h4ia1sxnS8TPvGF+X
+v3gAoOcbV/gp2/NyE3lkTLUkbkMnLHqy
+=h0CY
+-----END PGP SIGNATURE-----
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.0.10.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.0.10.ebuild
new file mode 100644
index 000000000000..5bdbb41a67fd
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-2.0.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 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.0.10.ebuild,v 1.1 2010/12/01 21:38:02 flameeyes Exp $
+
+EAPI=2
+
+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="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="vanilla"
+
+RDEPEND=">=www-apache/mod_security-2.5.12-r1"
+DEPEND=""
+
+S="${WORKDIR}/${PN}_${PV}"
+
+RULESDIR=/etc/apache2/modules.d/mod_security
+
+src_install() {
+	insinto "${RULESDIR}" || die
+	doins base_rules/* || die
+
+	# these are considered examples, but we install them anyway, and let
+	# etc-update deal with them.
+	for file in *.conf.example; do
+		newins "${file}" "${file%.example}" || die "failed to install ${file}"
+	done
+
+	insinto "${RULESDIR}"/optional_rules
+	doins optional_rules/* || die
+
+	# These are not conditionals because they actually need to be
+	# moved for the rules to work — bug #329131
+	mv "${D}${RULESDIR}"/modsecurity_42_comment_spam.data \
+		"${D}${RULESDIR}"/optional_rules || die
+
+	if ! use vanilla; then
+		mv "${D}${RULESDIR}"/modsecurity_*50_outbound* \
+			"${D}${RULESDIR}"/optional_rules || die
+	fi
+
+	dodoc CHANGELOG README || die
+}
+
+pkg_postinst() {
+	if ! use vanilla; then
+		elog "Please note that the Core Rule Set is quite draconic; to make it more usable,"
+		elog "the Gentoo distribution disables a few rule set files, that are relevant for"
+		elog "PHP-only websites or that would make it kill a website that discussed of source code."
+		elog
+		elog "Furthermore we disable the 'HTTP Parameter Pollution' tests that disallow"
+		elog "multiple parameters with the same name, because that's common practice both"
+		elog "for Rails-based web-applications and Bugzilla."
+	else
+		elog "You decided to enable the original Core Rule Set from ModSecurity."
+		elog "Be warned that the original Core Rule Set is draconic and most likely will"
+		elog "render your web application unusable if you don't disable at leat some of"
+		elog "the rules."
+	fi
+	elog
+	elog "If you want to enable further rules, check the following directory:"
+	elog "	${APACHE_MODULES_CONFDIR}/mod_security/optional_rules"
+}