Remove old version. Fix SRC_URI for new one.

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

4 files changed, 9 insertions, 110 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/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"