[squirrelmail/f18] make configuration work with Apache 2.4 (#905690)

[Michal Hlavinka]

commit 36b365bcd4aba90c16fe09efede090f7cb4166b9
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Jan 31 14:17:23 2013 +0100

    make configuration work with Apache 2.4 (#905690)

 squirrelmail.conf |   19 ++++++++++++++++++-
 squirrelmail.spec |    5 ++++-
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/squirrelmail.conf b/squirrelmail.conf
index f487e41..8584262 100644
--- a/squirrelmail.conf
+++ b/squirrelmail.conf
@@ -5,7 +5,15 @@
 Alias /webmail /usr/share/squirrelmail
 
 <Directory "/usr/share/squirrelmail/plugins/squirrelspell/modules">
-  Deny from all
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    Require all denied
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    Order deny,allow
+    Deny from all
+  </IfModule>
 </Directory>
 
 # this section makes squirrelmail use https connections only, for this you
@@ -15,5 +23,14 @@ Alias /webmail /usr/share/squirrelmail
   RewriteEngine  on
   RewriteCond    %{HTTPS} !=on
   RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    Require all granted
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    Order allow,deny
+    Allow from all
+  </IfModule>
 </Directory>
 
diff --git a/squirrelmail.spec b/squirrelmail.spec
index 4f32c97..e3d2c4a 100644
--- a/squirrelmail.spec
+++ b/squirrelmail.spec
@@ -6,7 +6,7 @@
 Summary: webmail client written in php
 Name: squirrelmail
 Version: 1.4.22
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -287,6 +287,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Thu Jan 31 2013 Michal Hlavinka <mhlavink at redhat.com> - 1.4.22-10
+- make configuration work with Apache 2.4 (#905690)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.22-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild