Bump to final 2.6.0 version.

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

4 files changed, 15 insertions, 104 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 92e1a12a7af1..11b20139be6a 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.54 2011/05/02 17:12:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.55 2011/05/19 20:24:42 flameeyes Exp $
+
+*mod_security-2.6.0 (19 May 2011)
+
+  19 May 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -mod_security-2.6.0_rc1.ebuild, -mod_security-2.6.0_rc2.ebuild,
+  +mod_security-2.6.0.ebuild:
+  Bump to final 2.6.0 version.
 
 *mod_security-2.6.0_rc2 (02 May 2011)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 5cda5ea8d3f7..fcd2238bf99f 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -6,18 +6,16 @@ AUX mod_security-2.5.10-as-needed.patch 1169 RMD160 56ea5b1de8673556a0cfff3db606
 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.5.13.tar.gz 1406635 RMD160 18d598462e7fedc02019f2612002bd0acbcb61fa SHA1 c498277a93de6c8ced2bd204d09c8a91a487fc1f SHA256 0d570fa602c5bbb231f467ace2abb35e4cd0647fd962d4bc21eac1a1efed8b6a
-DIST modsecurity-apache_2.6.0-rc1.tar.gz 1063050 RMD160 48684362b43b80dc8320c7dd37ff43212d0af285 SHA1 64488b639f0ea285cbc0cc481c12f4c4dde4f36b SHA256 8328e60737a238c37e5c97d14c29d19c05820e2ab16409ad29745e473e6f0d8f
-DIST modsecurity-apache_2.6.0-rc2.tar.gz 1136954 RMD160 0f924544ae4e8a01bd16cafb165752d66c0df3f2 SHA1 b9780e5a135ebd7d5a77b12883469f4ee8ea5bd6 SHA256 dae67bb4d16373b751cc69c4d1059b00b0bf7bb66843611284af7f9b3319e179
+DIST modsecurity-apache_2.6.0.tar.gz 1137345 RMD160 a9d34e17d80007f394087da5bd92c6047f48d343 SHA1 280061a6cb49c955d7371b9526193f68a12ae2ac SHA256 e36d8ca3a67df6def5ef72c1c241d7ea05d5adba87dd2a0bf3da7b28c5e5674e
 EBUILD mod_security-2.5.12.ebuild 3780 RMD160 93051a495325ef39354c8f7cd0ecfd202a537db9 SHA1 8d638448793d19bd1e74b1017cdda5632a48664b SHA256 2eb168002097badb690bf895e1770171c98b0f3aaf60828e435c960ce4737fd7
 EBUILD mod_security-2.5.13-r2.ebuild 2858 RMD160 ba2e1eef13ffaba6d35d3aa25b117807129ae5bd SHA1 96626711783fd6151016dcc7989ffe188c2a94ab SHA256 213750542f3c51eb89889514e0803b9fa6507a3dc5de20a5ff65ac498e2f5986
-EBUILD mod_security-2.6.0_rc1.ebuild 2593 RMD160 bc01e99eed23fab03ede8fccb6ea81921a5b1d72 SHA1 595578023c97513ac6e005a43ab6f1eba392fc7b SHA256 0ac314be0126ef5c15dde8fb30e9e623bbef6b537a2f43acaefa06ea7d22ced6
-EBUILD mod_security-2.6.0_rc2.ebuild 2394 RMD160 789a94d4416299aefc773da885e8c7c545cf5233 SHA1 311e2c3513ffb6d3ad5c54957ed9d57c9972e085 SHA256 29e8545ffdcdf4fc35861893c63749fe4feff9bdf7a7832c71fa49fd36f72b8a
-MISC ChangeLog 14426 RMD160 4e8ee4040324e0b65558ceeb71ba28873b54a0a7 SHA1 a53fa339b0e5592ca2dcccc705dd32f6cf22de8b SHA256 0093afac590e891c73dac6bc2b6658b832a151cb5817e8fc083eaa7d0648af25
+EBUILD mod_security-2.6.0.ebuild 2390 RMD160 537d19cdd68b0b82068471059894130a3b9c2465 SHA1 166af23def0f926fca7f143ceb1e0b1bc8998f6a SHA256 8ecd3667368df7d417ea820ea1975db3cf30cda7d331d2b54750f38190d59ade
+MISC ChangeLog 14645 RMD160 ae59efd73752f25777e636c72d2d7a830eff0afc SHA1 29ab30bf2b0d686bee3ad97156dfe7135cf4a22b SHA256 1e88b744ad4f7c3dc727390dc5a85244b3256630e9e7954f60cd55c80c3f04f6
 MISC metadata.xml 1314 RMD160 a5ef1462d8c1f9c3526d7eebd328f5aec6ac5396 SHA1 6047ee181f17636836d44bb8f907a3a4cd5448c7 SHA256 d9e91ba25184276208c7c8e5c6e513d0204c77c247d56c9627bd38f117539e0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2+5eoACgkQAiZjviIA2XiIjwCg5J2x78IjrgTnGxvm25njd1lS
-OeAAn27Ecv6zFe2uWGh0nMi9E3V6rq4u
-=yMaw
+iEYEARECAAYFAk3VfJcACgkQAiZjviIA2XgtWQCgxHQevicUMKrORsTQ7fYVLvQw
+P3UAnReKynbWcU697AXHqGciMWehEfhS
+=3O69
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.6.0_rc2.ebuild b/www-apache/mod_security/mod_security-2.6.0.ebuild
index 9d731694a336..ab9d952aece5 100644
--- a/www-apache/mod_security/mod_security-2.6.0_rc2.ebuild
+++ b/www-apache/mod_security/mod_security-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0_rc2.ebuild,v 1.1 2011/05/02 17:12:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.6.0.ebuild,v 1.1 2011/05/19 20:24:42 flameeyes Exp $
 
 EAPI=4
 
diff --git a/www-apache/mod_security/mod_security-2.6.0_rc1.ebuild b/www-apache/mod_security/mod_security-2.6.0_rc1.ebuild
deleted file mode 100644
index 1b52feda5a5d..000000000000
--- a/www-apache/mod_security/mod_security-2.6.0_rc1.ebuild
+++ /dev/null
@@ -1,94 +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.0_rc1.ebuild,v 1.2 2011/04/19 08:10:34 flameeyes Exp $
-
-EAPI=3
-
-inherit apache-module
-
-MY_P=modsecurity-apache_${PV/_rc/-rc}
-
-DESCRIPTION="Web application firewall and Intrusion Detection System for Apache."
-HOMEPAGE="http://www.modsecurity.org/"
-SRC_URI="http://www.modsecurity.org/download/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="geoip curl"
-
-DEPEND=">=dev-libs/libxml2-2.7.8
-	dev-libs/libpcre
-	>=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}/${PV/_rc/-rc}"
-
-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) \
-		|| 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
-
-	# install documentation; don't install index.html as it references
-	# the PDF and split-pages versions of the same documentation.
-	dodoc CHANGES
-	dohtml "${S}"/doc/*.{css,gif,jpg} "${S}"/doc/modsecurity2*.html
-
-	keepdir /var/cache/modsecurity || die
-	fowners apache:apache /var/cache/modsecurity || die
-	fperms 0770 /var/cache/modsecurity || die
-}
-
-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"
-}