Revision bump to change the installed modsecurity conf file from 99_ to 79_, makes easier to add site-global rules.

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

4 files changed, 48 insertions, 10 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index a7c206fea009..104320a05ff5 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_security
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.47 2010/12/01 21:58:50 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.48 2011/01/09 17:20:56 flameeyes Exp $
+
+*mod_security-2.5.13-r1 (09 Jan 2011)
+
+  09 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/2.5.13/79_mod_security.conf, -mod_security-2.5.13.ebuild,
+  +mod_security-2.5.13-r1.ebuild:
+  Revision bump to change the installed modsecurity conf file from 99_ to 79_,
+  makes easier to add site-global rules.
 
 *mod_security-2.5.13 (01 Dec 2010)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 82731de8a250..01f770339ca8 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX 2.5.10/99_mod_security.conf 457 RMD160 8f0e24cdfa7a71487365b42fd194a87e5ce426a8 SHA1 2d3cf537fb777dca964a40de2f512245bf390641 SHA256 541fbaa2f62f501190cfef67bb760f2c4ef7aef7d260a544b3d8886aca6aea2d
+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.ebuild 1795 RMD160 f4160520851d6ef86ca4b3c38e436b8570af6bbd SHA1 b1e77d901c98fa08f278fb91954aa75411355edc SHA256 8cc11f0d339b603a64fbaa971ccdd52949da579ca69e9dc77e10d8cae97c8be6
-MISC ChangeLog 12764 RMD160 32045a0446a54b232b92ffb21fca3bae96e92cfd SHA1 6f1c092fd59f75f6c9b5b1e9f74dde83b12fd791 SHA256 7bf8021996eb9820d0e1756b97fa6d2eaae37e8fb0b9cb5197658ff621b26737
+EBUILD mod_security-2.5.13-r1.ebuild 2311 RMD160 ba5c04ba1495b164bfdaea23d533423b1b8ca00a SHA1 f2b6ff1a8763149ca5271a805bdeb1351b09c53d SHA256 808bc7fc1897a1e395324227e307f1aa62faaf19ec7ffd596ef4a5e8a330cf82
+MISC ChangeLog 13081 RMD160 a709610f28365d5124fbf5d566e7c927d670bbbe SHA1 79e65e6edd3c5e132cde6c5cae6b5774c932f454 SHA256 f50d9081d6babe034a1b4660779aaf435ded6c11c60496cce51aa06f61e97f73
 MISC metadata.xml 897 RMD160 31443d00b492a9e39bba6556c867c9c84775560e SHA1 e96370de59f922a1ed1b46920e82a16fff04bb54 SHA256 6acdb58a20b4004b0d571df0183e7090f8eb97f904028c84bcecece8cf64f547
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkz2xRsACgkQAiZjviIA2XjxwACfTkNRcy7J0XhUMQwEtpvwk/vJ
-NMkAn280Q+BDHMFuIpSnCxrUuQ3DB20r
-=hhC3
+iEYEARECAAYFAk0p7mcACgkQAiZjviIA2XhwjgCcDlAa69lwBIBs2L0JqiPsFmzm
+zVsAoKvG+IKQU1n/CSKfgxDrz73bBxc6
+=3uy0
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/files/2.5.13/79_mod_security.conf b/www-apache/mod_security/files/2.5.13/79_mod_security.conf
new file mode 100644
index 000000000000..ba1fb64729a4
--- /dev/null
+++ b/www-apache/mod_security/files/2.5.13/79_mod_security.conf
@@ -0,0 +1,16 @@
+<IfDefine SECURITY>
+LoadModule security2_module modules/mod_security2.so
+
+SecDataDir /var/cache/mod_security
+
+# use Core Rule Set by default, but no optional or experimental rules
+Include /etc/apache2/modules.d/mod_security/*.conf
+
+# Optionally use the other rules as well
+# Include /etc/apache2/modules.d/mod_security/optional_rules/*.conf
+# Include /etc/apache2/modules.d/mod_security/experimental_rules/*.conf
+
+</IfDefine>
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_security/mod_security-2.5.13.ebuild b/www-apache/mod_security/mod_security-2.5.13-r1.ebuild
index b1564dd65713..008d5e66a6b5 100644
--- a/www-apache/mod_security/mod_security-2.5.13.ebuild
+++ b/www-apache/mod_security/mod_security-2.5.13-r1.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.13.ebuild,v 1.1 2010/12/01 21:58:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.5.13-r1.ebuild,v 1.1 2011/01/09 17:20:56 flameeyes Exp $
 
 EAPI=2
 
@@ -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/79_mod_security"
 APACHE2_MOD_DEFINE="SECURITY"
 
 need_apache2
@@ -84,3 +84,16 @@ src_install() {
 	fowners apache:apache /var/cache/mod_security || die
 	fperms 0770 /var/cache/mod_security || 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_mod_security.conf"
+	elog "so that you can put your own configuration as 80_mod_security_local.conf or"
+	elog "equivalent."
+	elog ""
+	elog "That would be the correct place for site-global security rules."
+}