summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2013-01-24 15:27:15 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2013-01-24 15:27:15 +0000
commit80c170534fe4aa0ebd5835063ba89c4ee8169fc4 (patch)
tree0f7dd63c6deb22008d015e945da1ecd76f29bc0d /www-apache
parentsecurity bump (bug #448550) (diff)
downloadhistorical-80c170534fe4aa0ebd5835063ba89c4ee8169fc4.tar.gz
historical-80c170534fe4aa0ebd5835063ba89c4ee8169fc4.tar.bz2
historical-80c170534fe4aa0ebd5835063ba89c4ee8169fc4.zip
Version bump and remove old.
Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64 Manifest-Sign-Key: 0x1CD13C8AD4301342
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/modsecurity-crs/ChangeLog10
-rw-r--r--www-apache/modsecurity-crs/Manifest16
-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
3 files changed, 36 insertions, 17 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/Manifest b/www-apache/modsecurity-crs/Manifest
index ebd6b9807621..2347e94a7153 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -2,15 +2,19 @@
Hash: SHA256
DIST modsecurity-crs-2.2.6.tar.gz 291070 SHA256 1c837fc7ace28f732b5034c90a17635e31fe3c9a45425c079fd1fd6bae01b790 SHA512 0e6c2735814dd24ba2329bc756e382b0430937a703d492b2ac00f95af6598903961b43013e99cd49240fe6b7a5439a7b1b3e79c3b7a48828465252dafd586165 WHIRLPOOL d8c85f8e6db07ecbc5a9a680e843f485d87294c71ceeb84aa83e562441ea78db477f9850431ded67371fbe455438fb89fedb5d3070e524abebe53b3c9a039f72
-DIST modsecurity-crs_2.2.5.tar.gz 295400 SHA256 7036b73d5656333b777ea725b8ae4fbea56ca01c12106297e2e2f54a2084b210 SHA512 94bed19f696c800849f8922303f79af9b09b89a348d9183424ac3ca641a1ae3ca71fe6f0383e42ba2e634f621c0bcb4cfb6bac0a33a26a7c078a2f3fc651e961 WHIRLPOOL ba5adbe93952f83a936ba2e1ba4e34efbb9d63ed886dbe3e5e71a7415a40e1f7198a8da05ae37c9dc4c3e45f9ba91350cd42800eff472eb1cbad97514dff4490
-EBUILD modsecurity-crs-2.2.5.ebuild 3845 SHA256 9bc85bdc7131a1236a0a5589b0dfc0352848b8795a51cd07d432b87b34164130 SHA512 e538b7fdd19f537cb5d56359352d50d44f2e6cf6c9325443e78df4daf27cedbf5e7a55174214fe4d0efcdd46dacd7e79ba55bb0ea69547e06479c3199b0bddf6 WHIRLPOOL 9638c466d14b6aeec72bd49f737cc98325e39dd7eec1829e8a8d04bdbfcf4e56de3d76571e66bb75a5aab3a9e1a40672a5f60662ff49879469b409e586a13f11
+DIST modsecurity-crs-2.2.7.tar.gz 294137 SHA256 54bc74815d6e6c3b476aec673a48e3ce08ee82b76bfe941408efab757aa8a0f7 SHA512 d0d3dac1b391c8ab730cc16546c9508d93c85dd674b2750d12fff99c17e5575b36bea0cf00e06fdd20c2db5dfdbdc3fd7bbaa26502988617632acfde1ee88927 WHIRLPOOL fc72bdbd5c79dffa0b2c65893cb8cdab0708705ce48ca3d49115339a5b4ff8cbe7cc42bcb49abd966243a2e48cb2af290ea125c6de4b185eb8b1c20e7eb66057
EBUILD modsecurity-crs-2.2.6-r1.ebuild 4273 SHA256 2d83799a2c7dc62ff85c647597582ed2d4fa568b21e828e53c3b7fe816e83b48 SHA512 78e891e0b94ef7c694c0ebc8a4b36054045e23937879d58454afa2f6c566ac9e7ce50a06ef0ba5c1004cbf50350b01dd332bf5ae245017a50bd0559ac388b9f3 WHIRLPOOL 9a8e6d1f47e26a86bda316787dae350fd9b730aa21ce8e9d1696cf3429cd3f2cad5b0ae76db436bee1a717954136b8cc0f964e9e6dcf5e0a168e4f3791de10a0
-MISC ChangeLog 5477 SHA256 a5e4c9f9634c0e298a3980bc43d82d1bacdb3bf3b2b36087aed5b00ace87ab8e SHA512 3d36d1f9a02361e296e30e2cdedd7415ec060b530980412ad54ce123ab3645810996b4d0dd6dcee3dea9503339b5946a46adbd97fa829717e31342ecc2cdb6cd WHIRLPOOL f9eab543454442d54be27551ede3072819a07d430d66c657cf05c552e6f4542f0e0dc348ce80a81044de2e15656a87801256d7e1e627f4dd063a1b9676693b4a
+EBUILD modsecurity-crs-2.2.7.ebuild 4208 SHA256 93456c66806da8f34055d660d9d944c1c4ecc92327b33c43dcbfe926929e775d SHA512 387a2e83369c0568363533670058e91fa9fb6e172207cffd3b3f985bb1410f58418ac807848d4b4ac4c8e8c49eff2b088005cf234e6cea4ee9612ad0b3aea516 WHIRLPOOL 0db26699c61551a685537ac2359f60ff6b93833c1af2efbd7dfdb8e97a5b7e22bf3e85c85ac1e3af31ce8ad0935918d9ebc78c6072b2d4ae480d8d58c26ace9e
+MISC ChangeLog 5669 SHA256 59ad7c250a044305ce89840a15f7ea65300b56b094a459364125b753bddbee22 SHA512 b6c546ada5a8c296c15e72006e6a00a09497c3992b45604f7898211f480ca4fa97b27975e337d53850aabeabc2a79d371247af3fb5585b0183f433964c8108d5 WHIRLPOOL 97db7aa12eeb6606445fd182b95aee5347c1f44798df9b4aeb30effae6194b2fdb92f44aef7d7a705e5fec36ac3c37a24d689e571978f29a05b0a589e3f6426f
MISC metadata.xml 245 SHA256 228231a9aec0fcb8550de5ac221b474926881b2f07259015a314c33c5ddda2e3 SHA512 b699ac1095929943f92b68337f5f2626109677d145621b61005df15a0b4a089db39600c05160a6c874159ba5db7cc417ff2a97bea601802e7e87506ea1c5c02f WHIRLPOOL 194930efcee735bcd38d478d07b10a61b41479a8073f3bfbc99a8661824eee1de22e47da4dde0fa82d6402aa5569936c225072fbf5834bf99a373c9f7807c505
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlDMudAACgkQuQc30/atMkBbyACgvxneXOKtPKTd40sKKAIuEK7r
-uoQAn3kustBgEYMM6AjItd/1v5CJ2/wr
-=JEyZ
+iQEcBAEBCAAGBQJRAVLSAAoJEBzRPIrUMBNCV0sIAIe4a4KJAxz0OgU3MwHpHEk1
+oLUHNDaik/l8FYCoZyFqUHpiGdfzfWWKO7lwD8YmODscz5wniVyahjvKp+jSGmYt
+4V2QFLRhr95kEPKMjcn4X51o9WgAhfAqw81fQ7+JIyPJJud03sZzTF+BnabysBoV
+ksIM47i6k1b20f9On9cTflxhxRBZdO5dyCjksaDLzQSbtcBctzz5QNy0ZGW6wllr
+WCyVCI4dbWl8WPnQpiE3mXTlOH4ZXtIZxKLKhuascBz7Sh7Ar+wYlSOLGFhqzY7i
+Rszrnu0g3TJ/+UKpC4UCSVpdpRzgYCzqlMwRyhhHjR1elY0RNte5AB7nbpTL1cA=
+=2pLI
-----END PGP SIGNATURE-----
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