Version bump; this version re-introduces the lua USE flag.

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

3 files changed, 107 insertions, 5 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 11b20139be6a..d7e7883f7453 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.55 2011/05/19 20:24:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.56 2011/07/07 06:38:52 flameeyes Exp $
+
+*mod_security-2.6.1_rc1 (07 Jul 2011)
+
+  07 Jul 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +mod_security-2.6.1_rc1.ebuild:
+  Version bump; this version re-introduces the lua USE flag.
 
 *mod_security-2.6.0 (19 May 2011)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index fcd2238bf99f..7279370ef386 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -7,15 +7,17 @@ AUX modsecurity.conf 276 RMD160 b8b303a210d05770d307ee60bfcf1400ec83d968 SHA1 35
 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.tar.gz 1137345 RMD160 a9d34e17d80007f394087da5bd92c6047f48d343 SHA1 280061a6cb49c955d7371b9526193f68a12ae2ac SHA256 e36d8ca3a67df6def5ef72c1c241d7ea05d5adba87dd2a0bf3da7b28c5e5674e
+DIST modsecurity-apache_2.6.1-rc1.tar.gz 1162150 RMD160 7059a06e3ea29eca6fc5899458c883455b23a6bc SHA1 bf0fc37aa24f0d6395cf9ed637a78b261fb5bd69 SHA256 17f9451172689d6d84561a5c1c019d6f6fbed0a438806b0ac7a4cd70e15f5c16
 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.ebuild 2390 RMD160 537d19cdd68b0b82068471059894130a3b9c2465 SHA1 166af23def0f926fca7f143ceb1e0b1bc8998f6a SHA256 8ecd3667368df7d417ea820ea1975db3cf30cda7d331d2b54750f38190d59ade
-MISC ChangeLog 14645 RMD160 ae59efd73752f25777e636c72d2d7a830eff0afc SHA1 29ab30bf2b0d686bee3ad97156dfe7135cf4a22b SHA256 1e88b744ad4f7c3dc727390dc5a85244b3256630e9e7954f60cd55c80c3f04f6
+EBUILD mod_security-2.6.1_rc1.ebuild 2427 RMD160 94248ff36db1bfc64579fb3a9b6c58ff5258d59b SHA1 766f723a739b9f2de81d21b00de929cdefb01723 SHA256 75239df27490a9451363c51e2304eba434eb7412c99bcbdcdd2aa8a4f0274e06
+MISC ChangeLog 14836 RMD160 9295a5881ac07ed8e7ae1810eea7b4171ccbee6f SHA1 526ab588e2c783abba0aefc599d984cb0d2ce393 SHA256 152de8a7475228ab2a1645ecd1a9470048afc618fdc909946ea9b1bfa30af45b
 MISC metadata.xml 1314 RMD160 a5ef1462d8c1f9c3526d7eebd328f5aec6ac5396 SHA1 6047ee181f17636836d44bb8f907a3a4cd5448c7 SHA256 d9e91ba25184276208c7c8e5c6e513d0204c77c247d56c9627bd38f117539e0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3VfJcACgkQAiZjviIA2XgtWQCgxHQevicUMKrORsTQ7fYVLvQw
-P3UAnReKynbWcU697AXHqGciMWehEfhS
-=3O69
+iEYEARECAAYFAk4VVGYACgkQAiZjviIA2XjG/QCg2Ouj7Cz3Nn0dnsmyo1YBdChe
+Y8EAn0GIqpHY2ebhnIep0DmMJBn3jPO6
+=7nqk
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.6.1_rc1.ebuild b/www-apache/mod_security/mod_security-2.6.1_rc1.ebuild
new file mode 100644
index 000000000000..a29701d567f4
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.6.1_rc1.ebuild
@@ -0,0 +1,94 @@
+# 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.1_rc1.ebuild,v 1.1 2011/07/07 06:38:52 flameeyes Exp $
+
+EAPI=4
+
+inherit apache-module autotools
+
+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 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"
+}