summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2013-01-24 15:26:38 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2013-01-24 15:26:38 +0000
commit4c9458db211a5350b270baa1b8c4ca957e6427f7 (patch)
tree4a553b24b09833940ea3bbdd147e721c59dbcc9f /www-apache/modsecurity-crs
parentsecurity bump (bug #448550) (diff)
downloadgentoo-2-4c9458db211a5350b270baa1b8c4ca957e6427f7.tar.gz
gentoo-2-4c9458db211a5350b270baa1b8c4ca957e6427f7.tar.bz2
gentoo-2-4c9458db211a5350b270baa1b8c4ca957e6427f7.zip
Version bump and remove old.
(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'www-apache/modsecurity-crs')
-rw-r--r--www-apache/modsecurity-crs/ChangeLog10
-rw-r--r--www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild (renamed from www-apache/modsecurity-crs/modsecurity-crs-2.2.5.ebuild)27
2 files changed, 26 insertions, 11 deletions
diff --git a/www-apache/modsecurity-crs/ChangeLog b/www-apache/modsecurity-crs/ChangeLog
index a279f27436af..cd89cc3925f9 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.35 2012/12/15 17:56:31 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.36 2013/01/24 15:26:38 flameeyes Exp $
+
+*modsecurity-crs-2.2.7 (24 Jan 2013)
+
+ 24 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+ +modsecurity-crs-2.2.7.ebuild, -modsecurity-crs-2.2.5.ebuild:
+ Version bump and remove old.
15 Dec 2012; Raúl Porcel <armin76@gentoo.org>
modsecurity-crs-2.2.6-r1.ebuild:
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.2.5.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild
index a51ca2fdf38c..1699b5069b02 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-2.2.5.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5.ebuild,v 1.6 2012/09/09 16:01:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild,v 1.1 2013/01/24 15:26:38 flameeyes Exp $
-EAPI=4
+EAPI=5
+
+GITHUB_USER=SpiderLabs
+GITHUB_PROJECT=owasp-${PN}
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"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="lua geoip"
-RDEPEND=">=www-apache/mod_security-2.5.13-r1[lua?,geoip?]"
+RDEPEND=">=www-apache/mod_security-2.7[lua?,geoip?]"
DEPEND=""
-S="${WORKDIR}/${PN}_${PV}"
+S="${WORKDIR}/${GITHUB_PROJECT}-${PV}"
RULESDIR=/etc/modsecurity
LUADIR=/usr/share/${PN}/lua
@@ -70,12 +73,14 @@ src_prepare() {
src_install() {
insinto "${RULESDIR}"
- doins -r base_rules optional_rules experimental_rules
+ # slr_rules as of 2.2.6 have broken IDs that don't work with
+ # ModSecurity 2.7, but the rules require 2.7 to begin with.
+ doins -r base_rules optional_rules experimental_rules #slr_rules
insinto "${LUADIR}"
doins lua/*.lua
- dodoc CHANGELOG README
+ dodoc CHANGELOG README.md
(
cat - <<EOF
@@ -88,6 +93,10 @@ EOF
Include /etc/modsecurity/base_rules/*.conf
+# Include Trustwave SpiderLabs Research Team rules
+# Include /etc/modsecurity/slr_rules/*.conf
+# Not installed yet as of 2.2.6
+
# Optionally use the other rules as well
# Include /etc/modsecurity/optional_rules/*.conf
# Include /etc/modsecurity/experimental_rules/*.conf