Remove 2.6.8 as that version is never going stable. Require a newer version of the CRS so that rules missing IDs are not going to be present.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 17 insertions, 108 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index b3dd25d10216..a011ed86dc2d 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_security
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.84 2012/10/17 01:21:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.85 2012/10/25 17:45:59 flameeyes Exp $
+
+  25 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  -mod_security-2.6.8.ebuild, mod_security-2.7.0.ebuild:
+  Remove 2.6.8 as that version is never going stable. Require a newer version of
+  the CRS so that rules missing IDs are not going to be present.
 
 *mod_security-2.7.0 (17 Oct 2012)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 1f948f94f696..6eb7fd57a849 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -4,21 +4,19 @@ Hash: SHA256
 AUX modsecurity-2.7.conf 394 SHA256 dba21b2c25146392aa0f2df66ca994d1c82222df26a842879fc3ca6a9096ae60 SHA512 ab8c1ee6372249613f853654f115102c7951ea021f47389510bca6c5d1226e7aa9d90bb47649cf4ca62b8d8f926eba9f5c0b02321851ec2e8452de70dd4c1839 WHIRLPOOL b78ed54075fb9da19bd08dd4993d071285da01b66dda9820882b9bf437c1ff431cf3b68e25d744950316d5e07b1c060f200ab01d48a5d78d7d271ec8c7048634
 AUX modsecurity.conf 276 SHA256 00b6f23a10c142828fafeb0362f23846f95ce5d2129a7a3c053dc20554bd078a SHA512 123d4929cc881171ad384dfd951b2c003c8353da9a0bd71d1660d609a4084656029f8246925ba02b09f62b61732a8fd64afab42e56062fb95f2b1cbb3d9a4410 WHIRLPOOL 89096b82e3b6c6e9088f320fdbea9c052adc50345465fe8a56e990372c37c4e82f49c2b28cf0d836f67786f4fdef5d39cf7c3780310b81e9d1881267dc34f378
 DIST modsecurity-apache_2.6.6.tar.gz 781984 SHA256 a0cb075d5898230d17da5805eb102d1bbba07fe0748dcc32920990c4711b7708 SHA512 4aa82c579026d5984895e2d60e98c0a6c39cfe8dab847eb4e19a213c5ca727c850675041a08625bb12c248b912ccea0d913ec59a785a7fd2b300b183cf45dd5a WHIRLPOOL 86ca11cca2752a155cbaeb79415859501a97b25c11a50732a41224db10241f43bd8aac0235bf1e5b181b1eb7d31a3bc7b98c14d51b7f2c7d8c5a1be7905c0641
-DIST modsecurity-apache_2.6.8.tar.gz 786008 SHA256 b903e526471b6d7214f03856f13ed3130b2f4b59c7e2df543bafc18e7cdc3515 SHA512 afb8efe7ea2d82e314fd7ab0914b592e044fb9ac9b394fa3b00936ed1bd7a1778af3ffda4ed75fa986f2b3587a291d4a98cbccb0df3005d030f404722385d5ea WHIRLPOOL 693a51556b49a6172e9a8f82aeaf58b38ec16fef167ad13c1b55037b28e40ab7e2060f1389a2eca980b37def959629a05af5d7cb3d87db5414963c006eb86e78
 DIST modsecurity-apache_2.7.0.tar.gz 1045006 SHA256 9d6d36edae3ce816c336149c37d7f32371ac0eee9f06eb3b65981d37871e0ae5 SHA512 6ceba6d62d97d7ee755afbfa95366c2056dd6bc7427d00e884f1abc076971e2d1b51ee21d4dc496c25e575cda5cf26b1e139cd1b245d7a783e551da5c01ee292 WHIRLPOOL f4622d15904e80daf5e52380fb600a5192e8fcb87c0927b161d5eb0b9d5c69a4808030ab6001ee6fa7642e80fde4d768a0fce8e541a372c7b69757d385e4614b
 EBUILD mod_security-2.6.6.ebuild 2447 SHA256 1ecb0aa0621400bf9c42f74aee1e04ff0f357afbc20bb4d81e7ea54a00abb969 SHA512 e2642150f5be9eed326daf019dd3e67e1b6f06b209847704fd8b984732e3491868e0b6fd6d5d11d2bcd6e215afbb1921230dee5a206ad8489acd0f66c93fef2c WHIRLPOOL 52b9fce3532ea84bdf7a68ccbcd542a6907ff985f58d0697e0967a9db9d9b4e4804b94fcf0ffb30789ff19fded5c4398a04dca7c0762975013373fd69a63bd81
-EBUILD mod_security-2.6.8.ebuild 2453 SHA256 3230ee57da2100b770116cbd8be8b5bca319a04e6c1ef1e66c0f25cdb8899baa SHA512 76e19c0c0eb6ebd2207c752e0b40d3c8a6be856713b6bfa406682874a7ecb5135520fa79f31808607f0255fa74029d346ab17f52ec2fd117524d11e0e7dc3c9d WHIRLPOOL 3ba606bb18007278fb2fd46e43bb3e318acdaed0e33a48180032956f45a27c9426eb44b9c6cbca5e0350cac1166e45d2cfaa632a448a9182f0b3220d0f4228dc
-EBUILD mod_security-2.7.0.ebuild 2548 SHA256 1c01373c2792bfab806063b6f6d5495bad95ca851e390d4a08d1fe6b9f368e26 SHA512 76100d71109ef8ce6090c03c55d1341db10de0a8bde94df346be238ff10eae37145eda0dcfa7bda611ef99f53979f13f8a4cf882a3be5e1a9326e8b85bee3b44 WHIRLPOOL fe23277861132d6b6fd2ca80f05f4e1372064196029f34650897ffb2ca74f114a59e52bfcb75b186fc5c0602b6789c777a42ae521c2778046300aff53e97ea7a
-MISC ChangeLog 19424 SHA256 064d44a941b23ba15ccc52f79f3136da675b76181f2c0bfa71646fc6ef19bb90 SHA512 10e3ebcb7b57bfcc418ea93e2ce98c9c36baf67418645a158396532ac5df4c88a0f0690cb2d4a49bc7de3b25bc0d55db40d5605009f25b50e5ea314dc513223d WHIRLPOOL d6ce67f2fdc7dcc934378c45df8188a3d4a8ed7fd0b562a7109e8130b4811304afaa6d998dba0d34447c45581deeb692b0bcad581cae1e95253fbb2ade19f3ec
+EBUILD mod_security-2.7.0.ebuild 2551 SHA256 efd8d4083722b8b934066829762b87b084684f63017b259f97e6b4c8d4c40dcc SHA512 ba4bb851e2614294c593c78b98883c8ee73c3e793c3b2cd299f7cd47103558f5fd196335a7d6b57c2728f421669d66e5d221bea5a744c5ff6fad5473fbcc7647 WHIRLPOOL 417f565076cd7b2bacbf29fa45cea6dad90d04d95802abb287cb9653ec351d3cb0885470124617fd0e5ecfd7d277b06d6b07047fa268e79925b50b7c76a94ff2
+MISC ChangeLog 19684 SHA256 4c62bb1dcc6d02bb7a30473de782d6d7f42b060d2f9398f77baa49a61d8f90e3 SHA512 30ef1703494eeff74d3c4017f262d4d3f1ab3d71a98ac0925bd24edf3ea3ec76dd9e15f939f5e37a452c0a030df713eb6273518dda995bb62720ae6422e131b1 WHIRLPOOL a50f321db2c5645b997464ab0f131c390aed5f8008aa0e125e37f70d97c70f723fc30832c9eb8a4a3c0e18011607c43fcdfa0666d3af7dfb1f6c8e36b2ee877c
 MISC metadata.xml 918 SHA256 6b84449bf1930174a13bdc787f9031b03f882f4056d9050cae8091b989b7f976 SHA512 5d206cf23b365b4cf0145b66ce8f2b751ac39b88882e3ea8f044eed92bfdbc03de9c0124c48988175ead27143c3c8add521c5ad18fd6ca97c34d2601ad63f1f8 WHIRLPOOL ce88ac6245ae39217f48048aaa112ac719cb05279b4365e293d6c56fda8ac7210f090ca83e10ef08bfc01cc91c8d84ca2f0e3d3b545b078e2f9e15d7f39a905b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQfgglAAoJEBzRPIrUMBNCinEH/AxVLWeW8H1ggz8Ot9l3PLw1
-5rovY3suLigunuSHo/JBDqMsjUybAapJ0bRW95SJP8ui5lEmVoCVSJrhuZB6uwHY
-xeXXbW5BfSuq4uVf1MvcqVTRGi1mHEDWXURzAwNrTG4Enko94u6AGXdD0dCM/Jow
-Ni90H26jGxu/txNsbYTqVHC+dgV6obyXNgVwjj78f5g5067tljRBPCFQnee5TXPd
-gdzhSuwoFLCxR5xFouh/EMr4WNNfTpAfnPSYxGhpz+qb4+ulqMR3UVglHW+nLyVj
-iS21YpbWFhyUv3YUN7jmePKhCmxH4zVG4xWEZFSshBMa3R9TtvEJrrgkcf3GlkQ=
-=XBdq
+iQEcBAEBCAAGBQJQiXrfAAoJEBzRPIrUMBNCbPIH/im/dUll7s4RgKibRxLBOVjo
+e5MCM/KIpkSS2bAyvMhij81lUQ9ElWXiDhzZ7mZINVCTWVp5JQWQNFTf/emAtG7C
+NZODS/hBKOQnYVhDNFEIKiUq6k3IQx71vTfDSIfqah0OV+4Bh1iEsIuLP1/WH7AN
+d1MU1GRMggMD5xkxVARMs1pNdsVm6KeHcAlEobc7BRVwKIPyrFN3IxQ4g+7+bg8a
+ZjDhdImTEJ84v0KKH29zODvHIqSVeRYCoFNySVoL7xd+gdCj4zzc5MX8L7rw+V5a
+APaP2nEf90iuKa52lcTjR00mf6Cb3Jmn9oLUxCqBQ1M0vLFD86czhvspDcLoGCs=
+=nPGv
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.6.8.ebuild b/www-apache/mod_security/mod_security-2.6.8.ebuild
deleted file mode 100644
index d6586ec7ab0e..000000000000
--- a/www-apache/mod_security/mod_security-2.6.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.6.8.ebuild,v 1.1 2012/09/28 06:28:05 flameeyes Exp $
-
-EAPI=4
-
-inherit apache-module
-
-MY_PN=modsecurity-apache
-MY_PV=${PV/_rc/-rc}
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="Web application firewall and Intrusion Detection System for Apache."
-HOMEPAGE="http://www.modsecurity.org/"
-SRC_URI="mirror://sourceforge/project/mod-security/${MY_PN}/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="geoip curl lua"
-
-DEPEND=">=dev-libs/libxml2-2.7.8
-	dev-libs/libpcre
-	lua? ( >=dev-lang/lua-5.1 )
-	curl? ( >=net-misc/curl-7.15.1 )
-	www-servers/apache[apache2_modules_unique_id]"
-RDEPEND="${DEPEND}
-	geoip? ( dev-libs/geoip )"
-PDEPEND="www-apache/modsecurity-crs"
-
-S="${WORKDIR}/${MY_P}"
-
-APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
-APACHE2_MOD_DEFINE="SECURITY"
-
-# Tests require symbols only defined within the Apache binary.
-RESTRICT=test
-
-need_apache2
-
-src_prepare() {
-	cp "${FILESDIR}"/modsecurity.conf "${T}"/79_modsecurity.conf || die
-}
-
-src_configure() {
-	econf \
-		--enable-shared --disable-static \
-		--with-apxs="${APXS}" \
-		$(use_enable curl mlogc) \
-		$(use_with lua) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if ! use geoip; then
-		sed -i -e '/SecGeoLookupDb/s:^:#:' \
-			"${T}"/79_modsecurity.conf || die
-	fi
-
-	emake || die
-}
-
-src_test() {
-	emake check || die
-}
-
-src_install() {
-	apache-module_src_install
-
-	# install manually rather than by using the APACHE2_MOD_CONF
-	# variable since we have to edit it to set things up properly.
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${T}"/79_modsecurity.conf
-
-	dodoc CHANGES
-
-	keepdir /var/cache/modsecurity
-	fowners apache:apache /var/cache/modsecurity
-	fperms 0770 /var/cache/modsecurity
-}
-
-pkg_postinst() {
-	if [[ -f "${ROOT}"/etc/apache/modules.d/99_mod_security.conf ]]; then
-		ewarn "You still have the configuration file 99_mod_security.conf."
-		ewarn "Please make sure to remove that and keep only 79_modsecurity.conf."
-		ewarn ""
-	fi
-	elog "The base configuration file has been renamed 79_modsecurity.conf"
-	elog "so that you can put your own configuration as 90_modsecurity_local.conf or"
-	elog "equivalent."
-	elog ""
-	elog "That would be the correct place for site-global security rules."
-	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
-}
diff --git a/www-apache/mod_security/mod_security-2.7.0.ebuild b/www-apache/mod_security/mod_security-2.7.0.ebuild
index 279cead6fd81..9f66d5ab3870 100644
--- a/www-apache/mod_security/mod_security-2.7.0.ebuild
+++ b/www-apache/mod_security/mod_security-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.7.0.ebuild,v 1.1 2012/10/17 01:21:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.7.0.ebuild,v 1.2 2012/10/25 17:45:59 flameeyes Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ DEPEND=">=dev-libs/libxml2-2.7.8
 	www-servers/apache[apache2_modules_unique_id]"
 RDEPEND="${DEPEND}
 	geoip? ( dev-libs/geoip )"
-PDEPEND=">=www-apache/modsecurity-crs-2.2.5"
+PDEPEND=">=www-apache/modsecurity-crs-2.2.6-r1"
 
 S="${WORKDIR}/${MY_P}"