Version bump; remove old.

Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64

4 files changed, 12 insertions, 113 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 8ed8d8c291af..f6b05f8cca64 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,13 @@
 # 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.66 2012/03/09 20:34:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.67 2012/03/21 16:29:24 flameeyes Exp $
+
+*mod_security-2.6.5 (21 Mar 2012)
+
+  21 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +mod_security-2.6.5.ebuild, -mod_security-2.6.2.ebuild,
+  -mod_security-2.6.4.ebuild:
+  Version bump; remove old.
 
 *mod_security-2.6.4 (09 Mar 2012)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 7c04911bc92c..04a21945c2bd 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,25 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.5.10/99_mod_security.conf 457 RMD160 8f0e24cdfa7a71487365b42fd194a87e5ce426a8 SHA1 2d3cf537fb777dca964a40de2f512245bf390641 SHA256 541fbaa2f62f501190cfef67bb760f2c4ef7aef7d260a544b3d8886aca6aea2d
 AUX mod_security-2.5.10-as-needed.patch 1169 RMD160 56ea5b1de8673556a0cfff3db606824ccb092e92 SHA1 1417de57c5e3bce8bab6f37f6ef532be44140c6c SHA256 aa1086c66d10b40d4ae184dad1bf9fc18e2fc8c6c3474ad2537b1728a01bd8be
 AUX modsecurity.conf 276 RMD160 b8b303a210d05770d307ee60bfcf1400ec83d968 SHA1 35badbac9fe301c18cdda5abacf578e81f36d607 SHA256 00b6f23a10c142828fafeb0362f23846f95ce5d2129a7a3c053dc20554bd078a
 DIST modsecurity-apache_2.5.12.tar.gz 1392209 RMD160 e7dae0754e5866c247083f1291bcd5cd08db87d5 SHA1 eb2068e5d31525fa53769dabd1a1c65896fd4e76 SHA256 168bb6591a0f9665169e0ed223a00d63a1c87e11d1e56388abcf431f30efaa84
 DIST modsecurity-apache_2.6.1.tar.gz 1161076 RMD160 9740690b772bf9e78dbf84a7eb3bdc0a042872a5 SHA1 dcd88621dfcc9d8607ca33d3c745a2cf671fc606 SHA256 e2e7d939f22ec05c0d17defd462724e181bfe947c5689b76cf88f96e8e423096
-DIST modsecurity-apache_2.6.2.tar.gz 731087 RMD160 9e75dbb790cc9f2b48a6d38beb5bd4c8755e013e SHA1 c9efe00b5acd04ade252f96065e969998e6103e3 SHA256 99eb400cb35a2a7cfd8069774bf39197e577a57d2c5126036c67f661268f3e5a
 DIST modsecurity-apache_2.6.3.tar.gz 780896 RMD160 102ce304bda05e6d0fd83ebeba27a88b5e0388fe SHA1 d21b8eab268f2614204323720159f7dfe3d9a205 SHA256 6ae9339623e582c965e6a188f7f61f540402a5af8c37cc7a8d22daa4565ca71b
-DIST modsecurity-apache_2.6.4.tar.gz 783102 RMD160 202222cc7451c3e6641113b03afbb11fdbc6d7a8 SHA1 362e34875e084e9d8eee8f6de5db5cab02f6311e SHA256 aa3f0024ea1f9e9cb4c47a0d9ca6582e781c469d12649376ac50b0b681927492
+DIST modsecurity-apache_2.6.5.tar.gz 781626 RMD160 e5df3c4915f08e902def1645dd18b21b78f21a94 SHA1 30f8363adee0684a8b63d6ca7abf5fd29a794f88 SHA256 5bc57fe42825e87fbccab1d88ba5480eaba32c5a166802ac7aa6daae19b44e5f
 EBUILD mod_security-2.5.12.ebuild 3775 RMD160 ada146f4de81ecf5bd055464eb87326e29195621 SHA1 3f3c7ba9d6ee04cabe3f076128eb595006326ef5 SHA256 ffe86a572153aa330bfa34fd43b9e718f4cb686634aad74fa5a32496332e2cef
 EBUILD mod_security-2.6.1.ebuild 2472 RMD160 1c9edf05ad07ed1d2146601a51f56ad40b67fc2c SHA1 898a513ff629234aa5c44582129d3f703becb360 SHA256 6c1de519734bfc296bbcc5a2cda16ffd511f2a9ca9ff1be425fb142159746912
-EBUILD mod_security-2.6.2.ebuild 2477 RMD160 dc3a511c7ec5aaea76d6ef9b0d23bda0a4f34d73 SHA1 0ef2fd6eecbf071ae44fcacaac4a3163762515cc SHA256 00d003e481938a71a875ffb2ba4929048dcc451b9fe5f54602bdb03ab8a1f8d4
 EBUILD mod_security-2.6.3.ebuild 2477 RMD160 f402ffd63b72d758674fc34625c3a8854a1b4792 SHA1 05f7ce94e4b4c01d0fde6bfd27a35ab7e0e9a270 SHA256 f3ac943c5cda2b1785e362f637535876520f57873ff7ce91e0ca49d6a72a7925
-EBUILD mod_security-2.6.4.ebuild 2477 RMD160 2e84143284f394a399dd0c7556ea537def4406b4 SHA1 a140e915411f143124b4712cac0d44d739929514 SHA256 403be88618208f0c08656dba0f2517484a5c7e2d26071e5ffced05aa3fbda00c
-MISC ChangeLog 16496 RMD160 534cefd7a50de7688360108690ed2408da7d3399 SHA1 bc0b54d93c25ce7aee41afccf2edc96d7ff0ef40 SHA256 e87dde58d37fbe4039ebc5e4ce3d5e99dc794338d086afa27e927a217167d6bb
+EBUILD mod_security-2.6.5.ebuild 2477 RMD160 a9e50a4f4d4aaf07ae8f1404a6d639ff284620a4 SHA1 89738086cd0bf1d06de2ac657518e6df6eeaa8b3 SHA256 74f5a1c2a55d951ab41b65fb9437ee47faf9c9b006b3bd1fbf748861521c510f
+MISC ChangeLog 16704 RMD160 a09c8f6fcec7a7cdee7fe5cf0c219c9a113d9367 SHA1 24793be8f4c9030874be5d9f4fb824496a19c3d8 SHA256 eceb86de870175e4a96c1464c252794b9c1ecb404a6eb757557a75aa49083327
 MISC metadata.xml 1314 RMD160 a5ef1462d8c1f9c3526d7eebd328f5aec6ac5396 SHA1 6047ee181f17636836d44bb8f907a3a4cd5448c7 SHA256 d9e91ba25184276208c7c8e5c6e513d0204c77c247d56c9627bd38f117539e0c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk9aaU0ACgkQAiZjviIA2XjhTwCfSfnAvqfrizCmehh2vGp88Wff
-yk4An0NlBF3QVgc6RKxodb8sxk7qtflK
-=jQQq
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.6.2.ebuild b/www-apache/mod_security/mod_security-2.6.2.ebuild
deleted file mode 100644
index c54e0e90558d..000000000000
--- a/www-apache/mod_security/mod_security-2.6.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 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.2.ebuild,v 1.1 2011/10/02 13:40:01 flameeyes Exp $
-
-EAPI=4
-
-inherit apache-module autotools
-
-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
-
-	eautoreconf
-}
-
-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.6.4.ebuild b/www-apache/mod_security/mod_security-2.6.5.ebuild
index 6a31f277f5ce..4e209b840289 100644
--- a/www-apache/mod_security/mod_security-2.6.4.ebuild
+++ b/www-apache/mod_security/mod_security-2.6.5.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.6.4.ebuild,v 1.1 2012/03/09 20:34:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.6.5.ebuild,v 1.1 2012/03/21 16:29:24 flameeyes Exp $
 
 EAPI=4