Version bump.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 151 insertions, 5 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 691d74787b1d..1097f708d06e 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.27 2009/07/27 16:42:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.28 2009/10/01 22:07:37 flameeyes Exp $
+
+*mod_security-2.5.10 (01 Oct 2009)
+
+  01 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +mod_security-2.5.10.ebuild, +files/mod_security-2.5.10-as-needed.patch:
+  Version bump.
 
   27 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   mod_security-2.5.9-r1.ebuild:
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 15326e92e29a..329dfa1fa56a 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,17 +2,20 @@
 Hash: SHA1
 
 AUX 2.1.2/99_mod_security.conf 198 RMD160 cde9de9e21d3e31467737a87fe6af73e18827bc6 SHA1 f41792ed3de6955786d5b08da708c74e2be6d3bf SHA256 45ae219fca3eddadf47b9ebd1ebd44c668833b894a38672c481a828af97cdfcf
+AUX mod_security-2.5.10-as-needed.patch 1169 RMD160 56ea5b1de8673556a0cfff3db606824ccb092e92 SHA1 1417de57c5e3bce8bab6f37f6ef532be44140c6c SHA256 aa1086c66d10b40d4ae184dad1bf9fc18e2fc8c6c3474ad2537b1728a01bd8be
 AUX mod_security-2.5.9-as-needed.patch 1166 RMD160 e70d1e0ff9e8396d4447e25bb0664111a27a31ff SHA1 d2e35d9a823ec37fd11119644bff4c2373b31553 SHA256 4438e7cc1675ce23354cd6ba9c74b5b669f2f80629bdd4cc7532e48cda8ebfd5
 AUX mod_security-2.5.9-broken-autotools.patch 2103 RMD160 795e3fc59b881bf02fa5a65b6dae4f120de253f0 SHA1 773a56d9e177056be3de0b0c85747478fb5f3b2f SHA256 68df2416a6b464719fb41772472fd04b196b9fee7e102fc76f95c6827282a283
+DIST modsecurity-apache_2.5.10.tar.gz 1290172 RMD160 f1934fb2304a090359073c4d74630ce5a34848e1 SHA1 033e91784b3b47ea3f2175996f122c48b104c27f SHA256 c07153cbebd21f90189c2e9647dc48e472e2e4fd2868260b71e1c741b18fbbba
 DIST modsecurity-apache_2.5.9.tar.gz 1252295 RMD160 adab10e5eab50f0d114e3ccb47c343e744119c8f SHA1 875919332a918956371fe8e2f7e46d88081857cf SHA256 02352221ea268f8ae9aae5b84507f51eba2a67c0f7d2efd5cc88e85f1f394056
+EBUILD mod_security-2.5.10.ebuild 2739 RMD160 cd52ab44894d833d37645f89fe5ea6143f685ebb SHA1 a2a1ca444483029774eda1553c0f86c0badae440 SHA256 a28c6b1195a5e25d3d26e66006778d75b99c04376a22430f85be32d241694565
 EBUILD mod_security-2.5.9-r1.ebuild 2791 RMD160 ae084781f213ba77d9bf322ebd511c45cafc0f49 SHA1 98d89c70534b0131f1a5c5b85ad97fb9c00a2b8c SHA256 1992430794f4712bf273933b23be93b7031cdb0570a198bf3ff490664bfdeb90
 EBUILD mod_security-2.5.9.ebuild 1944 RMD160 2007bd7cea81b0179a487ac2c96e1901791b02bb SHA1 0c3a515418374db4cd7e11d95bf6dac31fb5374b SHA256 aa0c4b31738d2c5da6e7ace0d766fceaf9fd5c8cccd8f8707ad9ef36a1912c88
-MISC ChangeLog 8619 RMD160 0b478eebc4ebaeee0a0ea3e66d9a9965c46efc3a SHA1 a89ca3366bb7942de7a1c9d050faa3c6c230ff47 SHA256 3b25e95f103848bfd6b3c55d6b9ec97ed754d4348535d4c0ee5bad7bb9571966
+MISC ChangeLog 8803 RMD160 9fc267da3dcd4075f6ad56c7e9a5c38e59f0f194 SHA1 617d82e4de338d03c3107090543b88ff7395f146 SHA256 1e5aa63586b70b42cbad20dbd6fd9b96f882dc58a7697024d04aff0751a7e4f6
 MISC metadata.xml 355 RMD160 e410b8b84944364f7964a593beee5dcc44120715 SHA1 43dcb86ef95026473f5b7feedd9bdf9a5c10aa5d SHA256 a5c675cccf7a693a7c467e2e154a55ede60bb80663f10e282cc5dd8c906b7f22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpt2QoACgkQAiZjviIA2XhSZQCggGHw47TClPhIf97DQYl1jTGG
-FN0AoMF8EmH1LpLzfuYo3Gx1jgEu82p6
-=nfMM
+iEYEARECAAYFAkrFKCAACgkQAiZjviIA2XhsYgCfVcqfSH3234TDavU9VdvXM0eZ
+XcYAoKaOICEvf2K733WahXmBleEx06sK
+=XKM1
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/files/mod_security-2.5.10-as-needed.patch b/www-apache/mod_security/files/mod_security-2.5.10-as-needed.patch
new file mode 100644
index 000000000000..f664d35efb54
--- /dev/null
+++ b/www-apache/mod_security/files/mod_security-2.5.10-as-needed.patch
@@ -0,0 +1,26 @@
+diff -Naurp -Naurp modsecurity-apache_2.5.9.old/apache2/Makefile.in modsecurity-apache_2.5.9/apache2/Makefile.in
+--- modsecurity-apache_2.5.9.old/apache2/Makefile.in	2009-07-02 19:18:31.000000000 +0200
++++ modsecurity-apache_2.5.9/apache2/Makefile.in	2009-07-02 19:48:23.000000000 +0200
+@@ -52,11 +52,11 @@ APU_LIBS = @APU_LIBS@
+ APU_LINK_LD = @APU_LINK_LD@
+ 
+ CPPFLAGS = @CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML2_CFLAGS) $(LUA_CFLAGS) 
+-LIBS = @LIBS@ $(PCRE_LIBS) $(LIBXML2_LIBS) $(LUA_LIBS)
++LIBS = @LIBS@ $(PCRE_LIBS) $(LIBXML2_LIBS) $(LUA_LIBS) $(APXS_LIBS) $(APR_LIBS) $(APR_LINK_LD) $(APU_LIBS) $(APU_LINK_LD)
+ LDFLAGS = @LDFLAGS@
+ CFLAGS = @CFLAGS@
+ 
+-COMPILE_APACHE_MOD = $(APXS_WRAPPER) -c $(CPPFLAGS) $(LDFLAGS) $(LIBS)
++COMPILE_APACHE_MOD = $(APXS_WRAPPER) -c $(CPPFLAGS) $(LDFLAGS)
+ 
+ INSTALL_MOD_SHARED = $(APXS_WRAPPER) -i
+ 
+@@ -93,7 +93,7 @@ mod_security2.la: $(MOD_SECURITY2_H) *.c
+ 		src="$$src $$f.c"; \
+ 	done; \
+ 	rm -f msc_test msc_test.o msc_test.lo msc_test.slo; \
+-	$(COMPILE_APACHE_MOD) $(APXS_EXTRA_CFLAGS) $(MODSEC_APXS_EXTRA_CFLAGS) $$src
++	$(COMPILE_APACHE_MOD) $(APXS_EXTRA_CFLAGS) $(MODSEC_APXS_EXTRA_CFLAGS) $$src $(LIBS)
+ 
+ ### MLogC
+ mlogc:
diff --git a/www-apache/mod_security/mod_security-2.5.10.ebuild b/www-apache/mod_security/mod_security-2.5.10.ebuild
new file mode 100644
index 000000000000..6bd9f2d62fd7
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.5.10.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 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.5.10.ebuild,v 1.1 2009/10/01 22:07:37 flameeyes Exp $
+
+inherit apache-module autotools
+
+MY_P=${P/mod_security-/modsecurity-apache_}
+MY_P=${MY_P/_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="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="lua perl"
+
+DEPEND="dev-libs/libxml2
+	perl? ( dev-perl/libwww-perl )
+	lua? ( >=dev-lang/lua-5.1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
+APACHE2_MOD_CONF="2.1.2/99_mod_security"
+APACHE2_MOD_DEFINE="SECURITY"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"/apache2
+
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	cd apache2
+
+	econf --with-apxs="${APXS}" \
+		--without-curl \
+		$(use_with lua) \
+		|| die "econf failed"
+
+	APXS_FLAGS=
+	for flag in ${CFLAGS}; do
+		APXS_FLAGS="${APXS_FLAGS} -Wc,${flag}"
+	done
+
+	# Yes we need to prefix it _twice_
+	for flag in ${LDFLAGS}; do
+		APXS_FLAGS="${APXS_FLAGS} -Wl,${flag}"
+	done
+
+	emake \
+		APXS_CFLAGS="${CFLAGS}" \
+		APXS_LDFLAGS="${LDFLAGS}" \
+		APXS_EXTRA_CFLAGS="${APXS_FLAGS}" \
+		|| die "emake failed"
+}
+
+src_test() {
+	cd apache2
+	make test || die
+}
+
+src_install() {
+	apache-module_src_install
+
+	# install rules updater only if perl is enabled (optionally)
+	if use perl; then
+		newsbin tools/rules-updater.pl modsec-rules-updater || die
+	fi
+
+	# install documentation
+	dodoc CHANGES || die
+	newdoc rules/CHANGELOG CHANGES.crs || die
+	newdoc rules/README README.crs || die
+	dohtml -r doc/* || die
+
+	# Prepare the core ruleset
+	cd "${S}"/rules/
+
+	sed -i -e 's:logs/:/var/log/apache2/:g' *.conf || die
+
+	insinto ${APACHE_MODULES_CONFDIR}/mod_security/
+	for i in *.conf; do
+		newins ${i} ${i/modsecurity_crs_/} || die
+	done
+}
+
+pkg_postinst() {
+	elog "Please note that the core rule set distributed with mod_security is quite"
+	elog "draconic. If you're using this on a blog, a forum or another user-submitted"
+	elog "web application where you might talk about standard Unix paths (such as /etc"
+	elog "or /bin), you might want to disable at least rules 950005 and 950907"
+	elog "(command injection) if you're sure it might not be a security risk."
+	elog " "
+	elog "To do that on the most limited case you might want to use something like"
+	elog "the following code (this comes from a Typo weblog instance):"
+	elog " "
+	elog "	<Location /comments>"
+	elog "	SecRuleRemoveById 950005 950907"
+	elog "	</Location>"
+	elog " "
+}