version bump wrt security #240946

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.22-vs2.3.0.34-gentoo x86_64

4 files changed, 14 insertions, 84 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 8e691525f611..c07ffef214de 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_security
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.15 2008/07/01 19:43:17 hollow Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.16 2009/01/01 14:11:36 hollow Exp $
+
+*mod_security-2.5.6 (01 Jan 2009)
+
+  01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
+  -mod_security-2.5.1.ebuild, -mod_security-2.5.4.ebuild,
+  +mod_security-2.5.6.ebuild:
+  version bump wrt security #240946
 
 *mod_security-2.5.5 (01 Jul 2008)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 6d15a38ae7db..41616ccdc71d 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.1.2/99_mod_security.conf 198 RMD160 cde9de9e21d3e31467737a87fe6af73e18827bc6 SHA1 f41792ed3de6955786d5b08da708c74e2be6d3bf SHA256 45ae219fca3eddadf47b9ebd1ebd44c668833b894a38672c481a828af97cdfcf
 DIST modsecurity-apache_2.1.2.tar.gz 657803 RMD160 3d0d2a767133ab1ec1ef3848e2f85c3c1652cf1f SHA1 ee0f851308c0b0b87b620c83b3532d495528fa8d SHA256 88644e0a512534e394d434df3f0f233889d9e6a5a91ed2e893b5bb9a4d190c8a
 DIST modsecurity-apache_2.1.6.tar.gz 679366 RMD160 3133e67f415ba3273563e6f4e0a43c7ecc7812ae SHA1 08c2d18d555159fa7cab626c410f92a7bbfa57b3 SHA256 144e2c82a5b0f356e11148184d97634302c6c4281aef68d2700b970b84536273
-DIST modsecurity-apache_2.5.1.tar.gz 1045582 RMD160 43f1c0ab702363ebfe15a220d17dcbe1c535daa1 SHA1 b9965bb801445833aa04ac62c90c0e374426dd73 SHA256 d66838c6f88c1c38dad7c862a5f08b33cb6b80220c66b3a17439570e89169b0e
-DIST modsecurity-apache_2.5.4.tar.gz 1071980 RMD160 a4fd4029ef3bd17a2a68b5f3bbbb3a11bdcbcdfb SHA1 b17dd1a65b6aace86e65f44271a418e2b119a323 SHA256 be515456add43ecac6c441da1fcdb1ab94908ae6ff0c837854bcf141343932ae
 DIST modsecurity-apache_2.5.5.tar.gz 1073723 RMD160 04b116c6a1d0d4af38ec100bb62302294bb7106c SHA1 41a08b9af902b67eabaabe2dd3c257d35aaf5d30 SHA256 626909c8408e2fd9e387f592f49e9d2c6501513b4cdc18dd89a8e9f3e124d959
+DIST modsecurity-apache_2.5.6.tar.gz 1079094 RMD160 a051211538334aa9a753e92ab787ff49ffd0b685 SHA1 5fb2b5ff3933d4bf766f2e46242bb991603e7081 SHA256 9f38176cdb69e610238e5aa5401b0fc72972fc72af5d9203ada98f962833bdca
 EBUILD mod_security-2.1.2.ebuild 1400 RMD160 1182531b3194a46b014a140212d2190a2957fe96 SHA1 023b1817c4e1181a77f8b9a9b2135dae39d29e31 SHA256 5edc46ed1e7fc8a4d2f232e2c7f45de54ba10e9c5b43b2274d64764a46b23037
 EBUILD mod_security-2.1.6.ebuild 1424 RMD160 687f4e0692cb8443411d5df23ab9d301215c9a37 SHA1 961cf48f6330f014c57a476838388ac386273377 SHA256 6578d751df77c29dc41e4cf1d8b80b86434efc32393327eaaa184c05d68cba3b
-EBUILD mod_security-2.5.1.ebuild 1577 RMD160 62cca868a725ed26313f03f7fb7e6309ba943936 SHA1 d5ed30f65747836a920cd7fd8e30a7e235773e6c SHA256 e0584327b4f0045e263ba1c04b6238970c7d72fbdf5c4b00cffe14222188207d
-EBUILD mod_security-2.5.4.ebuild 1577 RMD160 4438563d8dee4179294da05531d0b621c0711503 SHA1 ee67d7e36cbc1ecfad8cc235053e85e82b5a6682 SHA256 10bf217cb6a9e3cfd53788c1d36c8f6ca50b5a4758d949db39f09769e4faf32e
 EBUILD mod_security-2.5.5.ebuild 1577 RMD160 2b281cbafc657bd9ea51f67ff52f6b2c4fa5b2af SHA1 d5435cee8c95bc7f0193d9e2f31a32bdcdee2c3e SHA256 f2421ccda41f7e0576054eccfa07c77b01324c7aca6f4647bf38674b23a24031
-MISC ChangeLog 6192 RMD160 b4b22cc7a991ef790aeda9b11f07f88584e46955 SHA1 6086d348339d322e178087786cb3c5bc74a590e8 SHA256 a17853aa929c4f0a8a527a97e1008dad40594a9a55e86ab2ce6154a6afed45ab
+EBUILD mod_security-2.5.6.ebuild 1577 RMD160 af8265649bd7c8fed94019abd36ef3964237baed SHA1 f16baa6eefc63b6a56c34e526d3a3ffe36ed4af9 SHA256 1bf795f7bde942f683c0377e876b31eda4df7218fe3e88b1789c644c14a220b2
+MISC ChangeLog 6402 RMD160 dbd6e87e6b185fb6b057534efdf30fec4294f7de SHA1 d3494d552bdc5061537e8be5d8ced86be65ccdeb SHA256 9e461e32b68c650ef57b59ecbffb3df2e303b543e5490dbd18e55ebe68606ea3
 MISC metadata.xml 255 RMD160 a80959a97f317179745aa51dc813fc77fc12f431 SHA1 202b14b369f47c3f1f5b44384447c7769cc61755 SHA256 deef3dd2faff775a34529a8909b6e003cce31ee1a9858ace880da761f463ab65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhqiN4ACgkQmPFBzbX68WFqSACcD6fT594glEhhu/R60rM/WK/E
-akoAn2xjcfRmNXVl5ldKgWREd8PKwf6w
-=29S3
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.5.4.ebuild b/www-apache/mod_security/mod_security-2.5.4.ebuild
deleted file mode 100644
index 8986a2eca5a3..000000000000
--- a/www-apache/mod_security/mod_security-2.5.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 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.4.ebuild,v 1.1 2008/06/01 12:40:31 hollow Exp $
-
-inherit apache-module
-
-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"
-
-DEPEND="dev-libs/libxml2
-	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_compile() {
-	cd apache2
-
-	econf --with-apxs="${APXS}" \
-		--without-curl \
-		$(use_with lua) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	apache-module_src_install
-
-	# install rules updater
-	newbin tools/rules-updater.pl rules-updater
-
-	# 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
-	insinto /usr/share/doc/${P}/html/
-	doins -r doc/html-multipage
-
-	# Prepare the core ruleset
-	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
-
-	# Install core ruleset
-	insinto ${APACHE_MODULES_CONFDIR}/mod_security/
-	doins "${S}"/rules/*.conf
-}
diff --git a/www-apache/mod_security/mod_security-2.5.1.ebuild b/www-apache/mod_security/mod_security-2.5.6.ebuild
index 42f05e5bbe70..26cb7161ac7b 100644
--- a/www-apache/mod_security/mod_security-2.5.1.ebuild
+++ b/www-apache/mod_security/mod_security-2.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1.ebuild,v 1.2 2008/04/25 11:20:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.5.6.ebuild,v 1.1 2009/01/01 14:11:36 hollow Exp $
 
 inherit apache-module