Moving net-www/mod_security to www-apache/mod_security (#81244).

(Portage version: 2.1.3_rc9)

9 files changed, 297 insertions, 0 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
new file mode 100644
index 000000000000..eed1b562390b
--- /dev/null
+++ b/www-apache/mod_security/ChangeLog
@@ -0,0 +1,122 @@
+# ChangeLog for net-www/mod_security
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.1 2007/07/29 13:47:06 phreak Exp $
+
+  29 Jul 2007; Christian Heim <phreak@gentoo.org>
+  +files/mod_security-2.1.1-request_interception.patch,
+  +files/99_mod_security-2.1.1.conf, +metadata.xml,
+  +mod_security-2.1.1.ebuild, +mod_security-2.1.1-r1.ebuild:
+  Moving net-www/mod_security to www-apache/mod_security (#81244).
+
+*mod_security-2.1.1-r1 (15 Jun 2007)
+
+  15 Jun 2007; Benedikt Böhm <hollow@gentoo.org>
+  +files/mod_security-2.1.1-request_interception.patch,
+  -files/99_mod_security.conf, -mod_security-1.8.7.ebuild,
+  -mod_security-1.9.4.ebuild, +mod_security-2.1.1-r1.ebuild:
+  remove apache-1 version; fix #180150
+
+  11 May 2007; Steve Dibb <beandog@gentoo.org> mod_security-2.1.1.ebuild:
+  amd64 stable, security bug 169778
+
+  08 May 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  mod_security-2.1.1.ebuild:
+  Stable on sparc wrt security #169778
+
+  08 May 2007; Raúl Porcel <armin76@gentoo.org> mod_security-2.1.1.ebuild:
+  x86 stable wrt security bug 169778
+
+  08 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  mod_security-2.1.1.ebuild:
+  ppc stable, bug #169778
+
+*mod_security-2.1.1 (06 May 2007)
+
+  06 May 2007; Christian Heim <phreak@gentoo.org>
+  +files/99_mod_security-2.1.1.conf, +mod_security-2.1.1.ebuild:
+  Version bump, thanks to Nick Palmer <nicholas and slackers.net> and Julien
+  Allanos <dju at gentoo.org> in #151826 for security #169778.
+
+  14 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/1.8.6/99_mod_security.conf, files/99_mod_security.conf,
+  -files/mod_security.conf, mod_security-1.8.7.ebuild,
+  -mod_security-1.9.1.ebuild, mod_security-1.9.4.ebuild:
+  Cleanup.
+
+*mod_security-1.9.4 (05 Jun 2006)
+
+  05 Jun 2006; Benedikt Böhm <hollow@gentoo.org>
+  +mod_security-1.9.4.ebuild:
+  Version bump
+
+  05 Jun 2006; Michael Stewart <vericgar@gentoo.org>
+  -mod_security-1.7.6.ebuild, -mod_security-1.8.6.ebuild,
+  -mod_security-1.8.7_rc2.ebuild:
+  Remove old-style ebuilds
+
+  02 Jun 2006; Luca Longinotti <chtekk@gentoo.org> metadata.xml:
+  Update maintainer metadata.
+
+  18 Apr 2006; Jason Wever <weeve@gentoo.org> mod_security-1.8.7.ebuild:
+  Stable on SPARC.
+
+  19 Feb 2006; Joshua Kinard <kumba@gentoo.org> mod_security-1.9.1.ebuild:
+  Added ~mips to KEYWORDS.
+
+*mod_security-1.9.1 (05 Jan 2006)
+
+  05 Jan 2006; Luca Longinotti <chtekk@gentoo.org>
+  +mod_security-1.9.1.ebuild:
+  Version bump to 1.9.1, fixes bug #115480.
+
+  22 Nov 2005; <dang@gentoo.org> mod_security-1.8.7.ebuild:
+  Marked stable on amd64
+
+  01 Nov 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  mod_security-1.8.7.ebuild:
+  Marked ppc stable, bug #106430
+
+  18 Sep 2005; Michael Stewart <vericgar@gentoo.org>
+  mod_security-1.8.7.ebuild:
+  Stable on x86
+
+  20 Jun 2005; Simon Stelling <blubb@gentoo.org> mod_security-1.8.7.ebuild:
+  added ~amd64 keyword
+
+*mod_security-1.8.7 (06 Mar 2005)
+
+  06 Mar 2005; Elfyn McBratney <beu@gentoo.org> +mod_security-1.8.7.ebuild:
+  Version bump, closes bug #84250.
+
+*mod_security-1.8.7_rc2 (01 Mar 2005)
+
+  01 Mar 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml,
+  +mod_security-1.8.7_rc2.ebuild:
+  Version bump.  Fixes a few segfaults (Apache 2.x only), and a few other bugs.
+
+*mod_security-1.8.6 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/1.8.6/99_mod_security.conf, +mod_security-1.8.6.ebuild:
+  Apache herd package refresh
+
+  18 Oct 2004; Jason Wever <weeve@gentoo.org> mod_security-1.7.6.ebuild:
+  Added ~sparc keyword wrt bug #66615.
+
+  04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  mod_security-1.7.6.ebuild:
+  Masked mod_security-1.7.6.ebuild stable for ppc
+
+  05 Aug 2004; Chuck Short <zul@gentoo.org> mod_security-1.7.6.ebuild:
+  Marked stable for x86.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> mod_security-1.7.6.ebuild:
+  Added to ~ppc.
+
+*mod_security-1.7.6 (03 Jun 2004)
+
+  03 Jun 2004; Chuck Short <zul@gentoo.org> metadata.xml, mod_security-1.7.6.ebuild,
+  files/99_mod_security.conf, files/mod_security.conf:
+  Initial version,e build written by dju` <dju @ elegiac.net>.
+  Closes #32190.
+
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
new file mode 100644
index 000000000000..c0960c76230c
--- /dev/null
+++ b/www-apache/mod_security/Manifest
@@ -0,0 +1,31 @@
+AUX 99_mod_security-2.1.1.conf 215 RMD160 e6fb99efc300f23f4ac63af79d8e58eb82ea5770 SHA1 068b88055715820d09b0d10767865db7a807bc9b SHA256 50e35b187f10c6a2f29450a4808b722e1e3c40b664b462afa4548f76d26ad3dc
+MD5 f0ee830379ecb89b1005093bdef12242 files/99_mod_security-2.1.1.conf 215
+RMD160 e6fb99efc300f23f4ac63af79d8e58eb82ea5770 files/99_mod_security-2.1.1.conf 215
+SHA256 50e35b187f10c6a2f29450a4808b722e1e3c40b664b462afa4548f76d26ad3dc files/99_mod_security-2.1.1.conf 215
+AUX mod_security-2.1.1-request_interception.patch 695 RMD160 806b5241c4fcf356c605e36f89d9ea1fada82b17 SHA1 465ef6a470bb7fbda7a2b2a92df3b13492931c8d SHA256 4e3099c2e8714388abffd5117e8f68a40dea550cfb5cc49bda979da9e0a8007f
+MD5 c7605f93a10d52c1bd4369b8c7c3d4b3 files/mod_security-2.1.1-request_interception.patch 695
+RMD160 806b5241c4fcf356c605e36f89d9ea1fada82b17 files/mod_security-2.1.1-request_interception.patch 695
+SHA256 4e3099c2e8714388abffd5117e8f68a40dea550cfb5cc49bda979da9e0a8007f files/mod_security-2.1.1-request_interception.patch 695
+DIST modsecurity-apache_2.1.1.tar.gz 650607 RMD160 17e94c19d51f7e9e09ef435f81d696ec638aad44 SHA1 06527f16271628b882d375b4a0ad188d13dc7291 SHA256 fadeb3b4ce5672c99c094611792b827d45fcd6b38c4c4fa81c4cfdc63c63b71a
+EBUILD mod_security-2.1.1-r1.ebuild 1545 RMD160 6712451bdb69911f7861bbdbb79b39207b171d7a SHA1 ba644c7aeaf8455e838d74d4c1cbc6bf5c0b3f41 SHA256 c0a79cbe580674c1ea277e126d3b1ee9edb202cf1bfdb266931e03c5bd675dc7
+MD5 b331ca7d78c19199ba128dba0de51f12 mod_security-2.1.1-r1.ebuild 1545
+RMD160 6712451bdb69911f7861bbdbb79b39207b171d7a mod_security-2.1.1-r1.ebuild 1545
+SHA256 c0a79cbe580674c1ea277e126d3b1ee9edb202cf1bfdb266931e03c5bd675dc7 mod_security-2.1.1-r1.ebuild 1545
+EBUILD mod_security-2.1.1.ebuild 1440 RMD160 42b22324265b4bdf5043521f21af50ac0e00a4cd SHA1 5f8766b05c5afeb64af73ba5fb8c1c80cf90cbbd SHA256 e864c38fc67a997b7d8b40148bb41ca19db477111867b5d79c93ce6c07c26011
+MD5 82abd7a62d73132e65799fe4657694dd mod_security-2.1.1.ebuild 1440
+RMD160 42b22324265b4bdf5043521f21af50ac0e00a4cd mod_security-2.1.1.ebuild 1440
+SHA256 e864c38fc67a997b7d8b40148bb41ca19db477111867b5d79c93ce6c07c26011 mod_security-2.1.1.ebuild 1440
+MISC ChangeLog 4210 RMD160 ccbea4992ee83beafb413bf659f5a1bd428cb3b0 SHA1 a241c7909bef217aa4ce81cbfc4d342228b01782 SHA256 18dbaffc360dce0ec3555b8628dc59e0a4930b3a71130d15b5981456bab609e5
+MD5 6194bfb738e402e1198e502e08779a25 ChangeLog 4210
+RMD160 ccbea4992ee83beafb413bf659f5a1bd428cb3b0 ChangeLog 4210
+SHA256 18dbaffc360dce0ec3555b8628dc59e0a4930b3a71130d15b5981456bab609e5 ChangeLog 4210
+MISC metadata.xml 255 RMD160 a80959a97f317179745aa51dc813fc77fc12f431 SHA1 202b14b369f47c3f1f5b44384447c7769cc61755 SHA256 deef3dd2faff775a34529a8909b6e003cce31ee1a9858ace880da761f463ab65
+MD5 351176c1ea97204ce6b3a7516ee9f889 metadata.xml 255
+RMD160 a80959a97f317179745aa51dc813fc77fc12f431 metadata.xml 255
+SHA256 deef3dd2faff775a34529a8909b6e003cce31ee1a9858ace880da761f463ab65 metadata.xml 255
+MD5 48298cf2110a95571ba4db082207687a files/digest-mod_security-2.1.1 274
+RMD160 3613b40a8ef2d2be14afc0b57e087be24e98e986 files/digest-mod_security-2.1.1 274
+SHA256 7d542b268d220da9db5af73af411b8e8c6cc0669cae2588f9dc1ecafc77e2144 files/digest-mod_security-2.1.1 274
+MD5 48298cf2110a95571ba4db082207687a files/digest-mod_security-2.1.1-r1 274
+RMD160 3613b40a8ef2d2be14afc0b57e087be24e98e986 files/digest-mod_security-2.1.1-r1 274
+SHA256 7d542b268d220da9db5af73af411b8e8c6cc0669cae2588f9dc1ecafc77e2144 files/digest-mod_security-2.1.1-r1 274
diff --git a/www-apache/mod_security/files/99_mod_security-2.1.1.conf b/www-apache/mod_security/files/99_mod_security-2.1.1.conf
new file mode 100644
index 000000000000..78344cde8c87
--- /dev/null
+++ b/www-apache/mod_security/files/99_mod_security-2.1.1.conf
@@ -0,0 +1,8 @@
+<IfDefine SECURITY>
+	<IfModule !mod_security2.c>
+		LoadModule security2_module modules/mod_security2.so
+	</IfModule>
+
+	# use Core Rule Set by default:
+	Include /etc/apache2/modules.d/mod_security/*.conf
+</IfDefine>
diff --git a/www-apache/mod_security/files/digest-mod_security-2.1.1 b/www-apache/mod_security/files/digest-mod_security-2.1.1
new file mode 100644
index 000000000000..af3a5b2f6338
--- /dev/null
+++ b/www-apache/mod_security/files/digest-mod_security-2.1.1
@@ -0,0 +1,3 @@
+MD5 ab74ed5f320ffc4ed9f56487bf17c670 modsecurity-apache_2.1.1.tar.gz 650607
+RMD160 17e94c19d51f7e9e09ef435f81d696ec638aad44 modsecurity-apache_2.1.1.tar.gz 650607
+SHA256 fadeb3b4ce5672c99c094611792b827d45fcd6b38c4c4fa81c4cfdc63c63b71a modsecurity-apache_2.1.1.tar.gz 650607
diff --git a/www-apache/mod_security/files/digest-mod_security-2.1.1-r1 b/www-apache/mod_security/files/digest-mod_security-2.1.1-r1
new file mode 100644
index 000000000000..af3a5b2f6338
--- /dev/null
+++ b/www-apache/mod_security/files/digest-mod_security-2.1.1-r1
@@ -0,0 +1,3 @@
+MD5 ab74ed5f320ffc4ed9f56487bf17c670 modsecurity-apache_2.1.1.tar.gz 650607
+RMD160 17e94c19d51f7e9e09ef435f81d696ec638aad44 modsecurity-apache_2.1.1.tar.gz 650607
+SHA256 fadeb3b4ce5672c99c094611792b827d45fcd6b38c4c4fa81c4cfdc63c63b71a modsecurity-apache_2.1.1.tar.gz 650607
diff --git a/www-apache/mod_security/files/mod_security-2.1.1-request_interception.patch b/www-apache/mod_security/files/mod_security-2.1.1-request_interception.patch
new file mode 100644
index 000000000000..5f38268e203d
--- /dev/null
+++ b/www-apache/mod_security/files/mod_security-2.1.1-request_interception.patch
@@ -0,0 +1,15 @@
+Index: apache2/mod_security2.c
+===================================================================
+--- apache2/mod_security2.c	(revision 266)
++++ apache2/mod_security2.c	(working copy)
+@@ -558,6 +558,10 @@
+ 
+     /* Has this phase been completed already? */
+     if (msr->phase_request_body_complete) {
++        if (msr->was_intercepted) {
++            msr_log(msr, 4, "Phase REQUEST_BODY subrequest already intercepted with code %u.", msr->intercept_actionset->intercept_status);
++            return msr->intercept_actionset->intercept_status;
++        }
+         if (msr->txcfg->debuglog_level >= 4) {
+             msr_log(msr, 4, "Phase REQUEST_BODY already complete, skipping.");
+         }
diff --git a/www-apache/mod_security/metadata.xml b/www-apache/mod_security/metadata.xml
new file mode 100644
index 000000000000..cba8a4848628
--- /dev/null
+++ b/www-apache/mod_security/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>apache</herd>
+	<maintainer>
+		<email>chtekk@gentoo.org</email>
+		<name>Luca Longinotti</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apache/mod_security/mod_security-2.1.1-r1.ebuild b/www-apache/mod_security/mod_security-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..3ebf9e242670
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.1.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 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.1.1-r1.ebuild,v 1.1 2007/07/29 13:47:06 phreak Exp $
+
+inherit eutils apache-module
+
+KEYWORDS="amd64 ~mips ppc sparc x86"
+
+MY_P=${P/mod_security-/modsecurity-apache_}
+
+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"
+IUSE="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+APXS2_ARGS="-S LIBEXECDIR=${S} -c -o ${PN}2.so ${S}/apache2/*.c"
+APACHE2_MOD_FILE=".libs/${PN}2.so"
+#APACHE2_MOD_CONF="99_mod_security"
+APACHE2_MOD_DEFINE="SECURITY"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-request_interception.patch
+}
+
+src_install() {
+	apache2_src_install
+
+	# install documentation
+	dodoc CHANGES
+	newdoc rules/CHANGELOG CHANGES.crs
+	newdoc rules/README README.crs
+	dohtml doc/*.html doc/*.gif doc/*.jpg doc/*.css doc/*.pdf
+	cp -r "${S}"/doc/html-multipage "${D}"/usr/share/doc/${P}/html/
+
+	# Once APACHE2_MOD_CONF is able to use newconfd (probably never), this line
+	# should go.
+	insinto ${APACHE2_MODULES_CONFDIR}
+	newins "${FILESDIR}"/99_mod_security-${PV}.conf 99_mod_security.conf
+
+	# Prepare the core ruleset
+	for i in $( ls "${S}"/rules/*.conf ); do
+		mv $i ${i/modsecurity_crs_/}
+	done
+
+	# Install core ruleset
+	insinto ${APACHE2_MODULES_CONFDIR}/mod_security/
+	doins "${S}"/rules/*.conf
+}
diff --git a/www-apache/mod_security/mod_security-2.1.1.ebuild b/www-apache/mod_security/mod_security-2.1.1.ebuild
new file mode 100644
index 000000000000..46a875212aa9
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 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.1.1.ebuild,v 1.1 2007/07/29 13:47:06 phreak Exp $
+
+inherit apache-module
+
+KEYWORDS="amd64 ~mips ppc sparc x86"
+
+MY_P=${P/mod_security-/modsecurity-apache_}
+
+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"
+IUSE="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+APXS2_ARGS="-S LIBEXECDIR=${S} -c -o ${PN}2.so ${S}/apache2/*.c"
+APACHE2_MOD_FILE=".libs/${PN}2.so"
+#APACHE2_MOD_CONF="99_mod_security"
+APACHE2_MOD_DEFINE="SECURITY"
+
+need_apache2
+
+src_install() {
+	apache2_src_install
+
+	# install documentation
+	dodoc CHANGES
+	newdoc rules/CHANGELOG CHANGES.crs
+	newdoc rules/README README.crs
+	dohtml doc/*.html doc/*.gif doc/*.jpg doc/*.css doc/*.pdf
+	cp -r "${S}"/doc/html-multipage "${D}"/usr/share/doc/${P}/html/
+
+	# Once APACHE2_MOD_CONF is able to use newconfd (probably never), this line
+	# should go.
+	insinto ${APACHE2_MODULES_CONFDIR}
+	newins "${FILESDIR}"/99_mod_security-${PV}.conf 99_mod_security.conf
+
+	# Prepare the core ruleset
+	for i in $( ls "${S}"/rules/*.conf ); do
+		mv $i ${i/modsecurity_crs_/}
+	done
+
+	# Install core ruleset
+	insinto ${APACHE2_MODULES_CONFDIR}/mod_security/
+	doins "${S}"/rules/*.conf
+}