[nagios] * Apache 2.4 configuration fix for Fedora 18+

[Jose Pedro Oliveira]

commit b23762af742de08e212a65f2d5e7e85136aea426
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Wed Dec 5 00:20:21 2012 +0000

     * Apache 2.4 configuration fix for Fedora 18+

 nagios-3.4.3-httpd-2.4-and-2.2.patch |   53 ++++++++++++++++++++++++++++++++++
 nagios.spec                          |    8 ++++-
 2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/nagios-3.4.3-httpd-2.4-and-2.2.patch b/nagios-3.4.3-httpd-2.4-and-2.2.patch
new file mode 100644
index 0000000..fa3d0e9
--- /dev/null
+++ b/nagios-3.4.3-httpd-2.4-and-2.2.patch
@@ -0,0 +1,53 @@
+diff -ruN nagios/sample-config/httpd.conf.in nagios-modified/sample-config/httpd.conf.in
+--- nagios/sample-config/httpd.conf.in	2012-12-05 00:00:18.064170606 +0000
++++ nagios-modified/sample-config/httpd.conf.in	2012-12-05 00:04:27.551179970 +0000
+@@ -12,11 +12,19 @@
+ #  SSLRequireSSL
+    Options ExecCGI
+    AllowOverride None
+-   Order allow,deny
+-   Allow from all
+-#  Order deny,allow
+-#  Deny from all
+-#  Allow from 127.0.0.1
++   <IfModule mod_authz_core.c>
++      # Apache 2.4
++      Require all granted
++      # Require local
++   </IfModule>
++   <IfModule !mod_authz_core.c>
++      # Apache 2.2
++      Order allow,deny
++      Allow from all
++      #  Order deny,allow
++      #  Deny from all
++      #  Allow from 127.0.0.1
++   </IfModule>
+    AuthName "Nagios Access"
+    AuthType Basic
+    AuthUserFile @sysconfdir@/passwd
+@@ -29,11 +37,19 @@
+ #  SSLRequireSSL
+    Options None
+    AllowOverride None
+-   Order allow,deny
+-   Allow from all
+-#  Order deny,allow
+-#  Deny from all
+-#  Allow from 127.0.0.1
++   <IfModule mod_authz_core.c>
++      # Apache 2.4
++      Require all granted
++      # Require local
++   </IfModule>
++   <IfModule !mod_authz_core.c>
++      # Apache 2.2
++      Order allow,deny
++      Allow from all
++      #  Order deny,allow
++      #  Deny from all
++      #  Allow from 127.0.0.1
++   </IfModule>
+    AuthName "Nagios Access"
+    AuthType Basic
+    AuthUserFile @sysconfdir@/passwd
diff --git a/nagios.spec b/nagios.spec
index b111fe5..f1de602 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 3.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -27,6 +27,7 @@ Patch8: nagios-0008-Fix-path-to-CGI-executables.patch
 Patch9: nagios-0009-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch
 Patch10: nagios-0010-Added-several-images-to-the-sample-config.patch
 Patch11: nagios-0011-Fixed-strange-permissions.patch
+Patch12: nagios-3.4.3-httpd-2.4-and-2.2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -131,6 +132,7 @@ may compile against.
 %patch9 -p1 -b .fix_path_to_passwd
 %patch10 -p1 -b .more_images
 %patch11 -p1 -b .fix_perms
+%patch12 -p1 -b .httpd_conf
 
 
 %build
@@ -267,6 +269,10 @@ fi
 
 
 %changelog
+* Tue Dec  4 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.3-2
+- Apache 2.4 configuration fix for Fedora 18+ (#871438);
+  Patch nagios-3.4.3-httpd-2.4-and-2.2.patch
+
 * Tue Dec  4 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.3-1
 - Upgrade to 3.4.3