Version bump; don't force usage of CRS in the configuration file for the module; rename mod_security to modsecurity in it for consistency with upstream and future Debian.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 52 insertions, 10 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index b4c6cf6656d3..b8f2ccc51277 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apache/mod_security
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.49 2011/02/26 14:44:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.50 2011/03/23 23:05:00 flameeyes Exp $
+
+*mod_security-2.5.13-r2 (23 Mar 2011)
+
+  23 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/2.5.13-r2/79_modsecurity.conf, -mod_security-2.5.12-r1.ebuild,
+  +mod_security-2.5.13-r2.ebuild:
+  Version bump; don't force usage of CRS in the configuration file for the
+  module; rename mod_security to modsecurity in it for consistency with
+  upstream and future Debian.
 
   26 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
   mod_security-2.5.13-r1.ebuild:
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 99ac67985148..57e4adc6515b 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.5.10/99_mod_security.conf 457 RMD160 8f0e24cdfa7a71487365b42fd194a87e5ce426a8 SHA1 2d3cf537fb777dca964a40de2f512245bf390641 SHA256 541fbaa2f62f501190cfef67bb760f2c4ef7aef7d260a544b3d8886aca6aea2d
+AUX 2.5.13-r2/79_modsecurity.conf 166 RMD160 6eafb86894d50f7a2319b1c55acb04d1b8a79f45 SHA1 09ef3129d1abb6634bdf01607fa4b47e0a5e0650 SHA256 641a1eb86f9ee38b7b04e564c13b02f24833ffd7df494935d8a6917568ed1e6c
 AUX 2.5.13/79_mod_security.conf 472 RMD160 9fdc0d82806271b62d2265a934b4e3dcfec09d14 SHA1 cc7e75bc25c9d0ca293393875a3f799ec95f4d94 SHA256 4a228f2a1006745bcbd1cd12a0846f421783a837e3c0f9e2b0ef7b08efb8d1a9
 AUX mod_security-2.5.10-as-needed.patch 1169 RMD160 56ea5b1de8673556a0cfff3db606824ccb092e92 SHA1 1417de57c5e3bce8bab6f37f6ef532be44140c6c SHA256 aa1086c66d10b40d4ae184dad1bf9fc18e2fc8c6c3474ad2537b1728a01bd8be
 DIST modsecurity-apache_2.5.12.tar.gz 1392209 RMD160 e7dae0754e5866c247083f1291bcd5cd08db87d5 SHA1 eb2068e5d31525fa53769dabd1a1c65896fd4e76 SHA256 168bb6591a0f9665169e0ed223a00d63a1c87e11d1e56388abcf431f30efaa84
 DIST modsecurity-apache_2.5.13.tar.gz 1406635 RMD160 18d598462e7fedc02019f2612002bd0acbcb61fa SHA1 c498277a93de6c8ced2bd204d09c8a91a487fc1f SHA256 0d570fa602c5bbb231f467ace2abb35e4cd0647fd962d4bc21eac1a1efed8b6a
-EBUILD mod_security-2.5.12-r1.ebuild 1796 RMD160 3c888aa2247c6d6bf5eb7985a2e8e3ac560905dc SHA1 2eae1453c62a3065c62cca1ee2d0212cd334668d SHA256 d3aef64f88abb61050dda32654db47d3e0300e8aa3f0161d8b4eeb7b9d80e782
 EBUILD mod_security-2.5.12.ebuild 3780 RMD160 93051a495325ef39354c8f7cd0ecfd202a537db9 SHA1 8d638448793d19bd1e74b1017cdda5632a48664b SHA256 2eb168002097badb690bf895e1770171c98b0f3aaf60828e435c960ce4737fd7
 EBUILD mod_security-2.5.13-r1.ebuild 2317 RMD160 ccb2a826a38040f348f456f7c5d65fb9e0f6ec62 SHA1 323aa8e2a7eb662f786cfe6fc3e3c4b0d77221a4 SHA256 fd4c00d1cc92aa6afc2091b079f568ff0b994a92890af95c63770afe369945ee
-MISC ChangeLog 13196 RMD160 1906906d3f77c88b821ad08dd451eb1264fd99c3 SHA1 6634d3cc8e0e4b4b0dadcd0739158e6c0a004371 SHA256 934df32156d8dd860d179f95c823766e96ceeac19aa2b46c86fd6d3427b28094
+EBUILD mod_security-2.5.13-r2.ebuild 2389 RMD160 02f4238e76ef5e7db210299ffa7bf7a93d91429b SHA1 e907e748552b69660ef84c0aed9e2dbcace623a2 SHA256 4259fb7d744e11a4f3a2473b71b101126c6e3cc6103afc259ef3abecca9fb61d
+MISC ChangeLog 13574 RMD160 8fbea47831afecfbce48b8e541a565ced2fa307a SHA1 70cded818d706288a2d854ec8477a479f9acd3ca SHA256 0df4464c9c15099f34f9835798bd0d23ee64968a7a0508fc05c00818b5b5e022
 MISC metadata.xml 897 RMD160 31443d00b492a9e39bba6556c867c9c84775560e SHA1 e96370de59f922a1ed1b46920e82a16fff04bb54 SHA256 6acdb58a20b4004b0d571df0183e7090f8eb97f904028c84bcecece8cf64f547
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2KfIoACgkQAiZjviIA2Xg8ngCghVw7PJtH83RsuNA79MZdnnin
+VrAAoJFIiOY1P3fW1b7MLsLtNVTwi7r+
+=gi9g
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/files/2.5.13-r2/79_modsecurity.conf b/www-apache/mod_security/files/2.5.13-r2/79_modsecurity.conf
new file mode 100644
index 000000000000..77a42bab1920
--- /dev/null
+++ b/www-apache/mod_security/files/2.5.13-r2/79_modsecurity.conf
@@ -0,0 +1,8 @@
+<IfDefine SECURITY>
+LoadModule security2_module modules/mod_security2.so
+
+SecDataDir /var/cache/modsecurity
+</IfDefine>
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_security/mod_security-2.5.12-r1.ebuild b/www-apache/mod_security/mod_security-2.5.13-r2.ebuild
index c4a9f4c065df..065f4e41bc67 100644
--- a/www-apache/mod_security/mod_security-2.5.12-r1.ebuild
+++ b/www-apache/mod_security/mod_security-2.5.13-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.12-r1.ebuild,v 1.3 2010/10/24 17:45:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.5.13-r2.ebuild,v 1.1 2011/03/23 23:05:00 flameeyes Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.modsecurity.org/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="lua"
 
 DEPEND="dev-libs/libxml2
@@ -27,7 +27,7 @@ PDEPEND="www-apache/modsecurity-crs"
 S="${WORKDIR}/${MY_P}"
 
 APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
-APACHE2_MOD_CONF="2.5.10/99_mod_security"
+APACHE2_MOD_CONF="2.5.13-r2/79_modsecurity"
 APACHE2_MOD_DEFINE="SECURITY"
 
 need_apache2
@@ -80,7 +80,21 @@ src_install() {
 	dodoc CHANGES || die
 	dohtml -r doc/* || die
 
-	keepdir /var/cache/mod_security || die
-	fowners apache:apache /var/cache/mod_security || die
-	fperms 0770 /var/cache/mod_security || die
+	keepdir /var/cache/modsecurity || die
+	fowners apache:apache /var/cache/modsecurity || die
+	fperms 0770 /var/cache/modsecurity || die
+}
+
+pkg_postinst() {
+	if [[ -f "${ROOT}"/etc/apache/modules.d/99_mod_security.conf ]]; then
+		ewarn "You still have the configuration file 99_mod_security.conf."
+		ewarn "Please make sure to remove that and keep only 79_mod_security.conf."
+		ewarn ""
+	fi
+	elog "The base configuration file has been renamed 79_modsecurity.conf"
+	elog "so that you can put your own configuration as 90_modsecurity_local.conf or"
+	elog "equivalent."
+	elog ""
+	elog "That would be the correct place for site-global security rules."
+	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
 }