version bump; fixes #180150, #189995, #191381, #181887, #190301

Package-Manager: portage-2.1.3.7

7 files changed, 51 insertions, 56 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 41be38a14011..738a7234962a 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_security
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.2 2007/08/04 17:25:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.3 2007/09/08 08:10:52 hollow Exp $
+
+*mod_security-2.1.2 (08 Sep 2007)
+
+  08 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
+  -files/mod_security-2.1.1-request_interception.patch,
+  +files/2.1.2/99_mod_security.conf, -mod_security-2.1.1-r1.ebuild,
+  +mod_security-2.1.2.ebuild:
+  version bump; fixes #180150, #189995, #191381, #181887, #190301
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org>
   +files/mod_security-2.1.1-request_interception.patch,
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 12a2e1f9c115..e037edb625f3 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.1.2/99_mod_security.conf 215 RMD160 e6fb99efc300f23f4ac63af79d8e58eb82ea5770 SHA1 068b88055715820d09b0d10767865db7a807bc9b SHA256 50e35b187f10c6a2f29450a4808b722e1e3c40b664b462afa4548f76d26ad3dc
+MD5 f0ee830379ecb89b1005093bdef12242 files/2.1.2/99_mod_security.conf 215
+RMD160 e6fb99efc300f23f4ac63af79d8e58eb82ea5770 files/2.1.2/99_mod_security.conf 215
+SHA256 50e35b187f10c6a2f29450a4808b722e1e3c40b664b462afa4548f76d26ad3dc files/2.1.2/99_mod_security.conf 215
 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 1548 RMD160 b5db85eb3e8e32f2f924ecd59a068aff02a74a38 SHA1 87036dcfabb9e6175ba8d5ccdafc58db4e963524 SHA256 bc274261d4f5e0982dd357cb646b1746fdd5b6e971651612f0dbc4715d6b5b00
-MD5 208e7a44dc2976335e4209bd931d38a6 mod_security-2.1.1-r1.ebuild 1548
-RMD160 b5db85eb3e8e32f2f924ecd59a068aff02a74a38 mod_security-2.1.1-r1.ebuild 1548
-SHA256 bc274261d4f5e0982dd357cb646b1746fdd5b6e971651612f0dbc4715d6b5b00 mod_security-2.1.1-r1.ebuild 1548
+DIST modsecurity-apache_2.1.2.tar.gz 657803 RMD160 3d0d2a767133ab1ec1ef3848e2f85c3c1652cf1f SHA1 ee0f851308c0b0b87b620c83b3532d495528fa8d SHA256 88644e0a512534e394d434df3f0f233889d9e6a5a91ed2e893b5bb9a4d190c8a
 EBUILD mod_security-2.1.1.ebuild 1442 RMD160 99d9e45d5d3812826742b1fcf3302d5c541bbf36 SHA1 cb80ea5b1832f5bd8a02dc978adbad7a44869c4a SHA256 1158812a059773297b3cf8461d7c41b7dd6d481716e74a130cba54ffe4a3ee3b
 MD5 5fbac0417d6fd2f13703cc316b65803d mod_security-2.1.1.ebuild 1442
 RMD160 99d9e45d5d3812826742b1fcf3302d5c541bbf36 mod_security-2.1.1.ebuild 1442
 SHA256 1158812a059773297b3cf8461d7c41b7dd6d481716e74a130cba54ffe4a3ee3b mod_security-2.1.1.ebuild 1442
-MISC ChangeLog 4217 RMD160 c8edf62e053175a1a8c9573cb1ab36aa65a5585b SHA1 9438441d6f6326dcef23606ef12bcf312668b767 SHA256 a171d4455c3d41291a26337405bb92a3d9c509906c3d7b10d11d12da4eea1ecb
-MD5 acfb9ffaa69c66f498373b0a9245ae55 ChangeLog 4217
-RMD160 c8edf62e053175a1a8c9573cb1ab36aa65a5585b ChangeLog 4217
-SHA256 a171d4455c3d41291a26337405bb92a3d9c509906c3d7b10d11d12da4eea1ecb ChangeLog 4217
+EBUILD mod_security-2.1.2.ebuild 1399 RMD160 ca137feab0c8eb0cc2d94f19899b9d616c2b890e SHA1 4b8f4ac6ac867ea29fc0ece0a26ec33981e5c56d SHA256 592fa52aebd57b1acc204742c511b2d69faad8bf1957a3c0ca2cec896e403a40
+MD5 43d973a350a45f050860346f8b11e72a mod_security-2.1.2.ebuild 1399
+RMD160 ca137feab0c8eb0cc2d94f19899b9d616c2b890e mod_security-2.1.2.ebuild 1399
+SHA256 592fa52aebd57b1acc204742c511b2d69faad8bf1957a3c0ca2cec896e403a40 mod_security-2.1.2.ebuild 1399
+MISC ChangeLog 4521 RMD160 5cf573360aae40ede902d624d3a97a6e6307b3b6 SHA1 ccde2a34156375db1906bab86ce8750b07cd68af SHA256 d1859de665ab72bae0c5e47f0d62a86703b801695d2d623d75f350f547b55f4f
+MD5 85f8c2a4e94381a6b0301f461b0d2684 ChangeLog 4521
+RMD160 5cf573360aae40ede902d624d3a97a6e6307b3b6 ChangeLog 4521
+SHA256 d1859de665ab72bae0c5e47f0d62a86703b801695d2d623d75f350f547b55f4f ChangeLog 4521
 MISC metadata.xml 255 RMD160 a80959a97f317179745aa51dc813fc77fc12f431 SHA1 202b14b369f47c3f1f5b44384447c7769cc61755 SHA256 deef3dd2faff775a34529a8909b6e003cce31ee1a9858ace880da761f463ab65
 MD5 351176c1ea97204ce6b3a7516ee9f889 metadata.xml 255
 RMD160 a80959a97f317179745aa51dc813fc77fc12f431 metadata.xml 255
@@ -29,13 +30,13 @@ SHA256 deef3dd2faff775a34529a8909b6e003cce31ee1a9858ace880da761f463ab65 metadata
 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
+MD5 06013dffeb8dd7ba6079798318f44f5f files/digest-mod_security-2.1.2 274
+RMD160 2b93749bfb6442e2e350aaa69e8640165e9fe63c files/digest-mod_security-2.1.2 274
+SHA256 28325cbd937a117103fdb07ecc61dd2d5c536764e27084c78518d2c457c81c35 files/digest-mod_security-2.1.2 274
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGtLaUI1lqEGTUzyQRAtvDAKCIE272PpEomBNu0wpgC04IGnPrcQCg31b/
-wHhiNY9MFux85YQmk3bh9Tc=
-=yOsn
+iD8DBQFG4lkVmPFBzbX68WERArEEAJ9T5apau5UYpriELEIqIFW2n1hPhgCcDPYi
+OILTd70Mtxv5zw4j8Zm+5Z4=
+=1XNv
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/files/2.1.2/99_mod_security.conf b/www-apache/mod_security/files/2.1.2/99_mod_security.conf
new file mode 100644
index 000000000000..78344cde8c87
--- /dev/null
+++ b/www-apache/mod_security/files/2.1.2/99_mod_security.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-r1 b/www-apache/mod_security/files/digest-mod_security-2.1.1-r1
deleted file mode 100644
index af3a5b2f6338..000000000000
--- a/www-apache/mod_security/files/digest-mod_security-2.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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.2 b/www-apache/mod_security/files/digest-mod_security-2.1.2
new file mode 100644
index 000000000000..8cbd7d80b1f3
--- /dev/null
+++ b/www-apache/mod_security/files/digest-mod_security-2.1.2
@@ -0,0 +1,3 @@
+MD5 5ccba4e4db79d63aa5584f15e86b3992 modsecurity-apache_2.1.2.tar.gz 657803
+RMD160 3d0d2a767133ab1ec1ef3848e2f85c3c1652cf1f modsecurity-apache_2.1.2.tar.gz 657803
+SHA256 88644e0a512534e394d434df3f0f233889d9e6a5a91ed2e893b5bb9a4d190c8a modsecurity-apache_2.1.2.tar.gz 657803
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
deleted file mode 100644
index 5f38268e203d..000000000000
--- a/www-apache/mod_security/files/mod_security-2.1.1-request_interception.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/mod_security-2.1.1-r1.ebuild b/www-apache/mod_security/mod_security-2.1.2.ebuild
index 3ebf9e242670..d3c2d9fc8e58 100644
--- a/www-apache/mod_security/mod_security-2.1.1-r1.ebuild
+++ b/www-apache/mod_security/mod_security-2.1.2.ebuild
@@ -1,35 +1,32 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.1.2.ebuild,v 1.1 2007/09/08 08:10:52 hollow Exp $
 
-inherit eutils apache-module
-
-KEYWORDS="amd64 ~mips ppc sparc x86"
+inherit apache-module
 
 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"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 IUSE="doc"
 
+DEPEND="dev-libs/libxml2"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/${MY_P}"
 
-APXS2_ARGS="-S LIBEXECDIR=${S} -c -o ${PN}2.so ${S}/apache2/*.c"
+APXS2_ARGS="-DWITH_LIBXML2 -I/usr/include/libxml2 -lxml2 -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_CONF="${PVR}/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
 
@@ -40,13 +37,9 @@ src_install() {
 	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
+	sed -i -e 's:logs/:/var/log/apache2/:g' "${S}"/rules/*.conf
+	for i in "${S}"/rules/*.conf; do
 		mv $i ${i/modsecurity_crs_/}
 	done