From 6ef5b9a2299176b2feebd0f32dc7d47b8445e382 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Wed, 31 Oct 2012 14:28:53 +0100
Subject: [PATCH] Update mrtg-httpd.conf to work with httpd 2.4

---
 mrtg-httpd.conf | 8 +++-----
 mrtg.spec       | 6 +++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mrtg-httpd.conf b/mrtg-httpd.conf
index b10a71e..b2fd2ea 100644
--- a/mrtg-httpd.conf
+++ b/mrtg-httpd.conf
@@ -6,9 +6,7 @@
 Alias /mrtg /var/www/mrtg
 
 <Location /mrtg>
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
-    Allow from ::1
-    # Allow from .example.com
+    Require local
+    # Require ip 10.1.2.3
+    # Require host example.org
 </Location>
diff --git a/mrtg.spec b/mrtg.spec
index 0b26a6c..811b08a 100644
--- a/mrtg.spec
+++ b/mrtg.spec
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.17.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5
@@ -130,6 +130,10 @@ fi
 %{_unitdir}/mrtg.timer
 
 %changelog
+* Wed Oct 31 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.4-5
+- Update mrtg-httpd.conf to work with httpd 2.4
+  Resolves: #871434
+
 * Wed Aug 22 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.4-4
 - Use new systemd-rpm macros
   Resolves: #850215