Remove old version. Fix SRC_URI for new one.

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

5 files changed, 18 insertions, 118 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 72636dc8f12f..c204d996170f 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,10 @@
 # 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.91 2012/12/15 18:10:10 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.92 2013/01/24 15:06:56 flameeyes Exp $
+
+  24 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> -files/modsecurity.conf,
+  -mod_security-2.6.6.ebuild, mod_security-2.7.1.ebuild:
+  Remove old version. Fix SRC_URI for new one.
 
   15 Dec 2012; Raúl Porcel <armin76@gentoo.org> mod_security-2.7.0.ebuild:
   sparc stable wrt #438724
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 3bcff167a5d4..0b54e77e786a 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,19 +2,20 @@
 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.7.0.tar.gz 1045006 SHA256 9d6d36edae3ce816c336149c37d7f32371ac0eee9f06eb3b65981d37871e0ae5 SHA512 6ceba6d62d97d7ee755afbfa95366c2056dd6bc7427d00e884f1abc076971e2d1b51ee21d4dc496c25e575cda5cf26b1e139cd1b245d7a783e551da5c01ee292 WHIRLPOOL f4622d15904e80daf5e52380fb600a5192e8fcb87c0927b161d5eb0b9d5c69a4808030ab6001ee6fa7642e80fde4d768a0fce8e541a372c7b69757d385e4614b
 DIST modsecurity-apache_2.7.1.tar.gz 915188 SHA256 cb6b738f341c9ec673d17d22085dde56abdaf38ac772a5de25ddf529c785defc SHA512 1c58da8ee3e68280b69d4cd631a291dac7906ff0fdba834cab32748880691d61e2ace32d1b62cc77d34a179f4f4686d15c0920ce03c45bfe3e7d9ee527eaa54d WHIRLPOOL 4c61b8773adaea668091a8463a9fb815d18b9bb48a2208d23cef722f1c5b403e232bf990e4943510f3a74bc928c184bd18fb161eeda4aad28d9b0acfbd495727
-EBUILD mod_security-2.6.6.ebuild 2447 SHA256 1ecb0aa0621400bf9c42f74aee1e04ff0f357afbc20bb4d81e7ea54a00abb969 SHA512 e2642150f5be9eed326daf019dd3e67e1b6f06b209847704fd8b984732e3491868e0b6fd6d5d11d2bcd6e215afbb1921230dee5a206ad8489acd0f66c93fef2c WHIRLPOOL 52b9fce3532ea84bdf7a68ccbcd542a6907ff985f58d0697e0967a9db9d9b4e4804b94fcf0ffb30789ff19fded5c4398a04dca7c0762975013373fd69a63bd81
 EBUILD mod_security-2.7.0.ebuild 2545 SHA256 9ad1537ac042f6225c929ce527a9e33e4d79c5454083711f43ad9afd7a2596a4 SHA512 fdb6d09b8fb12df471ce8ada5f36c73d986a9e1c75855084c3939600e22614681f94d8dc31ebf4a19376c3381d00b5e46bd5e679b5d5f228b41e9207677f2f48 WHIRLPOOL f44fc843ef6cccb98d094293c605a45d2b5fbedd62b0ce1e5f308527c2020841c38072f572ea02fd93bf327a2a39de208ad2706eb24f8317fee80e64777b3b7c
-EBUILD mod_security-2.7.1.ebuild 2543 SHA256 2dd9189740be80e17d91711e20ff359adaf6fc1d7943e35f8c16e9f151bf94d3 SHA512 37025abd797ee8e4beb5b90cb0c65aef67cd8779ea0b00876e3263d6f1b4c159b85c4a177e96a84e1900ff3725a18a62c79da0a6beecd81e9c405e9dc1b1abc0 WHIRLPOOL 338c4770dc5c73b7174d51bf61071f4917158415f096c2141f6bb1a135a9cd8d6748533e787bf786184463fe1c1d0cf8f7f2c7aaa865ee0b155b4126dd138f09
-MISC ChangeLog 20417 SHA256 ad33c23c074f2c5ffcfe55d2d9bf691ff3a65182f9db522881a8681fa9383a93 SHA512 f132b77a7cd8a8f1a8d751cb273683947968c9ecd81e69da688449c4acf5540d76823128cd8a7da72dd2d82cb0c2d0729591e5413bd6817fa8626f61b01ef992 WHIRLPOOL 0bb17cd39c361da5039d5017f75001de45be255df23992f6275c40a9af0ad4ecf832dc8fd0ea95b22c47e32e417f37a245e1c90fb8257d594c2a5865a2f187d9
+EBUILD mod_security-2.7.1.ebuild 2530 SHA256 4af2e40946e4d7fa24e34572e8ab8f138ba2e9506cc55abe31e34cc2956aac3f SHA512 d174e94ee3b6a4078b02eb3a278d9a479e20668d52ed59ddecd47edc92a56c3726e28cad0250cbbdd67ab6f2b96d56cc6238f48b545f5946541ff44e5dce4436 WHIRLPOOL ae27f160acf31184416380d0c42c11451e1b9a39fec2da1f180a400cbfc9332d95389c2f3437473e90ce62a86549918b4f6d6922adb7e0072b0f2b24c19e3396
+MISC ChangeLog 20605 SHA256 3572c220baa183281d37e8a5e195dd37aedea90a29bf756af993b0f6f0e6544b SHA512 baaf913e27f53e77adb6fd7ac0c86efe70a815d8c1dd6f0dad0dea99c08c415667b069a7a20ee9843f20c7a3cf1412b156b9343b7ab1f7d15bf259da9365c251 WHIRLPOOL 916af57434ba2a674ddfc29862488d6748ff4823655345535afc8ebac22be39be55bf9395cbd403a18c4cfb1411e55b8c6d614657632d02ff44ea065ef6d58dc
 MISC metadata.xml 896 SHA256 b788f24cadf7e0daf6c0a97078d7427367e37ba6f129cc591fac0e0c415ade24 SHA512 1a1914552d4c75e372aa8debc1f1772556cd450e3516f82e257e66155b830f89fece0f1afe3b54689a87c18f2b1baf50cf2b58c2c7343f604869b1cb46afa488 WHIRLPOOL abbbd826477cb8cd180ec0824f07480dacbd3449f7a07cd11db41b515def50ee132c7fd9bb8f1545ecdfc637e632d9cfa7920aa5ddcc93c162437d8dbb3586f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDMvQQACgkQuQc30/atMkAv9ACcD8ayLNSLvP3QH8abCTGkmyeP
-sbsAnRxjaC5igYBL5dnUzn1HoePdSZx2
-=O1wO
+iQEcBAEBCAAGBQJRAU4dAAoJEBzRPIrUMBNClQgH/3kyU8BZaZQikKffwHRtpjZO
++0dxcTRTIDxAjDmjOGkjtVN6uhkIO8bsYrIf2gUNbQGHO36daFfH7Llsh/mTFUp6
+C/kTEORzvk/VXJCicaGWCWpr/v7865VeI2iVDjyG4khUnS1VSlXij9plQtgP5EzU
++ud1UVOSxEHsnRUAj+r10Z2oPbfGDHInMHCbyxzIN9txCMab5pbzjFj79bWvF2on
+7HqyS1pPLuU1OgcNHIRptQAGzB0ZC02UPkLN89uFkx/jMQ0oWbKLOKzLBPkoBwpm
+J+inycWZZ1PSwvf1SjBNeSyJKkXzIOxWt6JcErgy02YO4F4pWkm5/g6gWYPk4gw=
+=+Dlf
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/files/modsecurity.conf b/www-apache/mod_security/files/modsecurity.conf
deleted file mode 100644
index 254ecf4094b8..000000000000
--- a/www-apache/mod_security/files/modsecurity.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<IfDefine SECURITY>
-LoadModule security2_module modules/mod_security2.so
-
-# Enable looking up geolocation data from MaxMind's GeoIP database
-SecGeoLookupDb /usr/share/GeoIP/GeoIP.dat
-
-SecDataDir /var/cache/modsecurity
-</IfDefine>
-
-# -*- apache -*-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_security/mod_security-2.6.6.ebuild b/www-apache/mod_security/mod_security-2.6.6.ebuild
deleted file mode 100644
index 02edd3d5866a..000000000000
--- a/www-apache/mod_security/mod_security-2.6.6.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.6.ebuild,v 1.5 2012/07/15 17:01:16 armin76 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.1.ebuild b/www-apache/mod_security/mod_security-2.7.1.ebuild
index 6e86318f3e0d..ff3c0ac27525 100644
--- a/www-apache/mod_security/mod_security-2.7.1.ebuild
+++ b/www-apache/mod_security/mod_security-2.7.1.ebuild
@@ -1,6 +1,6 @@
-# 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/mod_security/mod_security-2.7.1.ebuild,v 1.1 2012/11/15 20:32:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.7.1.ebuild,v 1.2 2013/01/24 15:06:56 flameeyes Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ MY_P=${MY_PN}_${MY_PV}
 
 DESCRIPTION="Web application firewall and Intrusion Detection System for Apache."
 HOMEPAGE="http://www.modsecurity.org/"
-SRC_URI="https://github.com/downloads/SpiderLabs/ModSecurity/${MY_P}.tar.gz"
+SRC_URI="mirror://github/SpiderLabs/ModSecurity/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"