version bump

Package-Manager: portage-2.1.3.13

5 files changed, 44 insertions, 28 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 662947d5e5d9..830135e9a63b 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2007/09/27 13:56:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.8 2007/10/21 12:35:14 hollow Exp $
+
+*mod_security-2.1.4_rc1 (21 Oct 2007)
+
+  21 Oct 2007; Benedikt Böhm <hollow@gentoo.org>
+  -mod_security-2.1.1.ebuild, +mod_security-2.1.4_rc1.ebuild:
+  version bump
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> mod_security-2.1.2.ebuild:
   sparc stable wrt #191973
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 6ca6cfc5a258..0e3582a0a376 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -6,27 +9,34 @@ AUX 99_mod_security-2.1.1.conf 215 RMD160 e6fb99efc300f23f4ac63af79d8e58eb82ea57
 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
-DIST modsecurity-apache_2.1.1.tar.gz 650607 RMD160 17e94c19d51f7e9e09ef435f81d696ec638aad44 SHA1 06527f16271628b882d375b4a0ad188d13dc7291 SHA256 fadeb3b4ce5672c99c094611792b827d45fcd6b38c4c4fa81c4cfdc63c63b71a
 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
+DIST modsecurity-apache_2.1.4-rc1.tar.gz 676134 RMD160 b35ca41a076a91ded4508430c6abbcf206abecaa SHA1 cf1131be899ad4b56c2c78871ac72e7ff2cb075f SHA256 6af611efc37d6e7fbb41503eb339e7604e0910f4a2867c20c32e6bf21885f8bf
 EBUILD mod_security-2.1.2.ebuild 1396 RMD160 d6cf90a75595d214add980aeae7ba9f3fcca04e0 SHA1 0179c0c0ef07c36b3c3ce17719861e5f0870f020 SHA256 37ca2c6199374867185bc11d3356aae82e1d86ef0cfa4cb3ac1a6597a16bc1e7
 MD5 461d37523b1efc14a7c03df17e871e9a mod_security-2.1.2.ebuild 1396
 RMD160 d6cf90a75595d214add980aeae7ba9f3fcca04e0 mod_security-2.1.2.ebuild 1396
 SHA256 37ca2c6199374867185bc11d3356aae82e1d86ef0cfa4cb3ac1a6597a16bc1e7 mod_security-2.1.2.ebuild 1396
-MISC ChangeLog 4959 RMD160 112b702b5c2a0163fce34fcd75374aa138de281e SHA1 93aa43e90ea5c2a331d55debe5935dc1042b4028 SHA256 7206dead1c997c2a198f86e6c87cb3aa693741598d5772a04d41987323833d2f
-MD5 85855f27a7a1c318b84db8249635aea8 ChangeLog 4959
-RMD160 112b702b5c2a0163fce34fcd75374aa138de281e ChangeLog 4959
-SHA256 7206dead1c997c2a198f86e6c87cb3aa693741598d5772a04d41987323833d2f ChangeLog 4959
+EBUILD mod_security-2.1.4_rc1.ebuild 1429 RMD160 334ad408a6e75e04129918cd921930e9663f750e SHA1 41afaa4b9c2d4e37161c731e51bc807cdd0f9749 SHA256 0c0c2a7a0ec0c0476ebe370f457adbf1b112bc06ffb19a4ff1c719ff35ddebb7
+MD5 898d3c53ef878e56dfe1d1df487fbd0e mod_security-2.1.4_rc1.ebuild 1429
+RMD160 334ad408a6e75e04129918cd921930e9663f750e mod_security-2.1.4_rc1.ebuild 1429
+SHA256 0c0c2a7a0ec0c0476ebe370f457adbf1b112bc06ffb19a4ff1c719ff35ddebb7 mod_security-2.1.4_rc1.ebuild 1429
+MISC ChangeLog 5125 RMD160 6341285c256209909f73e58d248f194314ad0f7f SHA1 f6765851d639ca2af71442858c0ff0c53aaffca3 SHA256 04353350c86a63bc6fa570dca71ce00f367b185a025512bd9d8f750f939edaab
+MD5 81e4d710cdbacb55a5f221f9ebb8390e ChangeLog 5125
+RMD160 6341285c256209909f73e58d248f194314ad0f7f ChangeLog 5125
+SHA256 04353350c86a63bc6fa570dca71ce00f367b185a025512bd9d8f750f939edaab ChangeLog 5125
 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 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
+MD5 7c22e29a32ba5d2d9223901e3c85bc8b files/digest-mod_security-2.1.4_rc1 286
+RMD160 f462aecaad77b0137c75dafd1c43d1c9561b629c files/digest-mod_security-2.1.4_rc1 286
+SHA256 1a153238f6bd93e665060b4161cf131d0f8db61af218d889ca2ad6853ae13ff4 files/digest-mod_security-2.1.4_rc1 286
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHG0eLmPFBzbX68WERAmzmAJsFalsbYkpZcnUtLNFGmqQ8F+ND5ACfa+P4
+29+9bBSTAAQf0Y4AkE8HM+Q=
+=CrbM
+-----END PGP SIGNATURE-----
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
deleted file mode 100644
index af3a5b2f6338..000000000000
--- a/www-apache/mod_security/files/digest-mod_security-2.1.1
+++ /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.4_rc1 b/www-apache/mod_security/files/digest-mod_security-2.1.4_rc1
new file mode 100644
index 000000000000..484477b528f4
--- /dev/null
+++ b/www-apache/mod_security/files/digest-mod_security-2.1.4_rc1
@@ -0,0 +1,3 @@
+MD5 823ce2823cf3596cfefd9fbc1317e133 modsecurity-apache_2.1.4-rc1.tar.gz 676134
+RMD160 b35ca41a076a91ded4508430c6abbcf206abecaa modsecurity-apache_2.1.4-rc1.tar.gz 676134
+SHA256 6af611efc37d6e7fbb41503eb339e7604e0910f4a2867c20c32e6bf21885f8bf modsecurity-apache_2.1.4-rc1.tar.gz 676134
diff --git a/www-apache/mod_security/mod_security-2.1.1.ebuild b/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild
index 46a875212aa9..703c8052cfa7 100644
--- a/www-apache/mod_security/mod_security-2.1.1.ebuild
+++ b/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild
@@ -1,31 +1,35 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild,v 1.1 2007/10/21 12:35:14 hollow Exp $
 
 inherit apache-module
 
-KEYWORDS="amd64 ~mips ppc sparc x86"
-
 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="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="2.1.2/99_mod_security"
 APACHE2_MOD_DEFINE="SECURITY"
 
 need_apache2
 
 src_install() {
-	apache2_src_install
+	apache-module_src_install
 
 	# install documentation
 	dodoc CHANGES
@@ -34,13 +38,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