Version bump to new release candidate.

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

3 files changed, 110 insertions, 6 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 6890bc85822a..3230d453e87f 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.64 2011/12/27 21:46:34 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.65 2012/02/23 15:16:20 flameeyes Exp $
+
+*mod_security-2.6.4_rc1 (23 Feb 2012)
+
+  23 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +mod_security-2.6.4_rc1.ebuild:
+  Version bump to new release candidate.
 
 *mod_security-2.6.3 (27 Dec 2011)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index b2696ec7f15f..ab57c2280590 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -8,16 +8,18 @@ DIST modsecurity-apache_2.5.12.tar.gz 1392209 RMD160 e7dae0754e5866c247083f1291b
 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-rc1.tar.gz 783028 RMD160 297aede00f12b76d283df01cd477ee54222e6457 SHA1 a9e06ebd9669e4d29166b1c8fd9ebf78b2905ebb SHA256 1fac46d17b488f128885ba47552531ac57caa9ee150bfbfe6b43246afd39236d
 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
-MISC ChangeLog 16155 RMD160 5d9fbfa273bcac9eefa6f237736950c9e8281e63 SHA1 fde60b45a26f607d384262740a13b2542fa32114 SHA256 55fc4326d2904f83bbe109414e934f0b7485f419f6a0f43d305d848ab18c3d7b
+EBUILD mod_security-2.6.4_rc1.ebuild 2481 RMD160 b3701398abf32b262bf6a4603a0ecf72f827dcf1 SHA1 5bb90ff4684fe8e03e62692f41c7ec52d0e9a3f7 SHA256 89d46d1cb4ede90aeff4bbd20d0e1b21831a89d7ce0e4a139d41fceffd1a92ab
+MISC ChangeLog 16326 RMD160 f7971ae0892c056ad7406d72d2613a2e5d5b96b9 SHA1 b10b4762c5fa8cce0b13fb4414ec7e8fe99140a4 SHA256 9b75b5e0396313e9afe512b76a429cad61de16d6f224cff38e0764375341e1a0
 MISC metadata.xml 1314 RMD160 a5ef1462d8c1f9c3526d7eebd328f5aec6ac5396 SHA1 6047ee181f17636836d44bb8f907a3a4cd5448c7 SHA256 d9e91ba25184276208c7c8e5c6e513d0204c77c247d56c9627bd38f117539e0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk76PIQACgkQAiZjviIA2XhPkgCfdkOsyXKXOgSX/rZFfTzsJy16
-r9wAoNR6O41dVI1mEl76u5pvCo7XUr0S
-=a0KA
+iEYEARECAAYFAk9GWAUACgkQAiZjviIA2XjVxACfayZNkoF5psWIT6TLY6FEVE8A
+ixUAn2HA7hzLn74s2SQdcrLCyDdoPZV6
+=ueMU
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.6.4_rc1.ebuild b/www-apache/mod_security/mod_security-2.6.4_rc1.ebuild
new file mode 100644
index 000000000000..691ea93ace15
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.6.4_rc1.ebuild
@@ -0,0 +1,96 @@
+# 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_rc1.ebuild,v 1.1 2012/02/23 15:16:20 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"
+}