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.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

3 files changed, 39 insertions, 8 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/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"
 }