Version bump.

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

3 files changed, 114 insertions, 5 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index fe69c7edf833..d1eaea2d1d30 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,12 @@
 # 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.87 2012/11/15 14:48:48 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.88 2012/11/15 20:32:31 flameeyes Exp $
+
+*mod_security-2.7.1 (15 Nov 2012)
+
+  15 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +mod_security-2.7.1.ebuild:
+  Version bump.
 
   15 Nov 2012; Andreas Schuerch <nativemad@gentoo.org>
   mod_security-2.7.0.ebuild:
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 6cceea5cd10b..b21330bce1e0 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -5,14 +5,20 @@ AUX modsecurity-2.7.conf 394 SHA256 dba21b2c25146392aa0f2df66ca994d1c82222df26a8
 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 2549 SHA256 4b7164c77db1d1acdc5051fba5a6653fabb94df7ca33829dcb2d109448a816a6 SHA512 617827cfe94d79bba784860861605ef75d8fabd999e54d0fa88e2a741f8cb037d507684ff828ec6db54c568439769faacaaf9e09813fe5b3ae87de437fe99b0c WHIRLPOOL bf12bcd61b41fd0975d4ef43fe32e282f03f29d30be31c062f4a3d77e1e3f761ee4bf871755b5de1eec47e5dddba28a1145d1d2cf7906a48314fc629ecbe8696
-MISC ChangeLog 19911 SHA256 de6846def83ffce7f89fe668d5ef68c3b3bf5ca34320e2fdca4486be3bfe8c8b SHA512 846ae86e01859b016f01064d44a9b99b9a5ba699871ba1a4953e71f4ef4c684f4c3c25747f38ebc78d3528144125ac02a1f16a89c1262c233dc5f9c151995d10 WHIRLPOOL 1d63324cf85310fa861e0a4fa3f22f8b95a29f6fecd83449b79067a80c1268e8740775726ce060ccf33cdb6b1baaa121ddcc4f58e033a0d2561ad03e560f2c0c
+EBUILD mod_security-2.7.1.ebuild 2543 SHA256 2dd9189740be80e17d91711e20ff359adaf6fc1d7943e35f8c16e9f151bf94d3 SHA512 37025abd797ee8e4beb5b90cb0c65aef67cd8779ea0b00876e3263d6f1b4c159b85c4a177e96a84e1900ff3725a18a62c79da0a6beecd81e9c405e9dc1b1abc0 WHIRLPOOL 338c4770dc5c73b7174d51bf61071f4917158415f096c2141f6bb1a135a9cd8d6748533e787bf786184463fe1c1d0cf8f7f2c7aaa865ee0b155b4126dd138f09
+MISC ChangeLog 20049 SHA256 bc96782a2814cda4e20e5bc043ea5fc824e766aff3523d9651e9b55c21fd2fc3 SHA512 e64f5b968821077abc74ee0c8171595c7b87f200f53413e931eb851cadded71dcf006d8761b72845e1b29277661952682aa5e97eece12471586e827213f0d19e WHIRLPOOL 1d0af256912f27d56776a051ce46dfd07d6026096a3af6733b954d7ced8f73c82589643b18c1d49122a2c52d5c711f1930b005f8c937055b8facb941c813bdd6
 MISC metadata.xml 918 SHA256 6b84449bf1930174a13bdc787f9031b03f882f4056d9050cae8091b989b7f976 SHA512 5d206cf23b365b4cf0145b66ce8f2b751ac39b88882e3ea8f044eed92bfdbc03de9c0124c48988175ead27143c3c8add521c5ad18fd6ca97c34d2601ad63f1f8 WHIRLPOOL ce88ac6245ae39217f48048aaa112ac719cb05279b4365e293d6c56fda8ac7210f090ca83e10ef08bfc01cc91c8d84ca2f0e3d3b545b078e2f9e15d7f39a905b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlClb8MACgkQakKUmsHeVLKdsgCfaKHadqNVNEU+Sj5+5XOAzxM+
-QMcAnRbXPde/wsGO+h09k1E5AQcc8x1p
-=ua9H
+iQEcBAEBCAAGBQJQpVFjAAoJEBzRPIrUMBNCjdoH/AnMCSQhd4GWHKqr5QY2vzBc
+bvaR023dAWCi+zySGB9h23g3+jwKw/P1FPiYwituaDId9XnWaNezNK1Qr+ZGlXEP
+mqfdVi7nW5sfk/ZFGUcneqo13zc9C8uCjak/LN5+3uX6/yzaEHopiR9rAPkIEo4X
+Vgrhe1Ot91DMAJgdY1hIp+WW0VSTzihA9C8sL+zykcYz3NtPbjNDtNiUOgjpsZ7c
+T3H/2CLHSPtOPl4VP7JU2oiXbzP+gx9jTmJ/PHDSZThutwGx0eQSG8haB4XPGOI9
+KSpLxyS7CVoKghu+nVCwo+rdpBrxzKHY6y0Fh9bGIK4c0p3I6O8F1zSkezub97o=
+=WAn8
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.7.1.ebuild b/www-apache/mod_security/mod_security-2.7.1.ebuild
new file mode 100644
index 000000000000..6e86318f3e0d
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.7.1.ebuild
@@ -0,0 +1,97 @@
+# 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.1.ebuild,v 1.1 2012/11/15 20:32:31 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="https://github.com/downloads/SpiderLabs/ModSecurity/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="geoip curl lua jit"
+
+DEPEND=">=dev-libs/libxml2-2.7.8
+	dev-libs/libpcre[jit?]
+	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-2.2.6-r1"
+
+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-2.7.conf "${T}"/79_modsecurity.conf || die
+}
+
+src_configure() {
+	econf \
+		--enable-shared --disable-static \
+		--with-apxs="${APXS}" \
+		--enable-request-early \
+		$(use_enable curl mlogc) \
+		$(use_with lua) \
+		$(use_enable jit pcre-jit)
+}
+
+src_compile() {
+	if ! use geoip; then
+		sed -i -e '/SecGeoLookupDb/s:^:#:' \
+			"${T}"/79_modsecurity.conf || die
+	fi
+
+	emake
+}
+
+src_test() {
+	emake check
+}
+
+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 NOTICE README.TXT README_WINDOWS.TXT
+
+	dohtml -r doc/*
+
+	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"
+}