[viewvc] Fix bug #871492.

bojan bojan at fedoraproject.org
Wed Oct 31 06:12:07 UTC 2012


commit ebe56bfde6248699def95e16b9e4aa779761a6ab
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed Oct 31 17:11:40 2012 +1100

    Fix bug #871492.

 viewvc-fcgi.conf |   12 ++++++++++--
 viewvc-wsgi.conf |   12 ++++++++++--
 viewvc.spec      |    5 ++++-
 3 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/viewvc-fcgi.conf b/viewvc-fcgi.conf
index c3f60d5..a2fd927 100644
--- a/viewvc-fcgi.conf
+++ b/viewvc-fcgi.conf
@@ -3,6 +3,14 @@ Alias /viewvc-static __datadir__/viewvc/templates/docroot
 
 <Directory __datadir__/viewvc/templates/docroot>
     Options -Indexes
-    Order allow,deny
-    Allow from 127.0.0.1
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require local
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order allow,deny
+        Allow from 127.0.0.1
+        Allow from ::1
+    </IfModule>
 </Directory>
diff --git a/viewvc-wsgi.conf b/viewvc-wsgi.conf
index ae32d65..4fe0725 100644
--- a/viewvc-wsgi.conf
+++ b/viewvc-wsgi.conf
@@ -3,6 +3,14 @@ Alias /viewvc-static __datadir__/viewvc/templates/docroot
 
 <Directory __datadir__/viewvc/templates/docroot>
     Options -Indexes
-    Order allow,deny
-    Allow from 127.0.0.1
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require local
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order allow,deny
+        Allow from 127.0.0.1
+        Allow from ::1
+    </IfModule>
 </Directory>
diff --git a/viewvc.spec b/viewvc.spec
index e48f383..4639691 100644
--- a/viewvc.spec
+++ b/viewvc.spec
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -142,6 +142,9 @@ with decent performance when run under Apache.
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Wed Oct 31 2012 Bojan Smojver <bojan at rexursive.com> - 1.1.17-2
+- fix bug #871492
+
 * Fri Oct 26 2012 Bojan Smojver <bojan at rexursive.com> - 1.1.17-1
 - bump up to 1.1.17
 


More information about the scm-commits mailing list