[packages/git-core] apache multiversion config

[glen]

commit 95c90ddf33b87f3e89c6f81034c2e0b2ba7cc741
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Sep 26 23:36:20 2013 +0300

    apache multiversion config

 git-core-gitweb-httpd.conf | 30 +++++++++++++++++++++++++++---
 git-core.spec              |  6 +++---
 2 files changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/git-core.spec b/git-core.spec
index 34a3f77..3fcbe06 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -11,7 +11,7 @@ Summary:	Distributed version control system focused on speed, effectivity and us
 Summary(pl.UTF-8):	Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:		git-core
 Version:	1.8.4
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://git-core.googlecode.com/files/git-%{version}.tar.gz
@@ -26,8 +26,8 @@ Patch0:		%{name}-tests.patch
 Patch1:		%{name}-key-bindings.patch
 Patch2:		%{name}-sysconfdir.patch
 Patch3:		cherry-picked-commitlog.patch
-Patch4:	        %{name}-svn-serf.patch
-Patch5:	        %{name}-svn-exit-errors.patch
+Patch4:		%{name}-svn-serf.patch
+Patch5:		%{name}-svn-exit-errors.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
diff --git a/git-core-gitweb-httpd.conf b/git-core-gitweb-httpd.conf
index b779287..0feccbb 100644
--- a/git-core-gitweb-httpd.conf
+++ b/git-core-gitweb-httpd.conf
@@ -1,13 +1,29 @@
 <Directory /usr/share/gitweb>
 	AllowOverride None
-	Allow from All
+	# Apache 2.x
+	<IfModule !mod_authz_core.c>
+		Order allow,deny
+		Allow from all
+	</IfModule>
+	# Apache 2.4
+	<IfModule mod_authz_core.c>
+		Require all granted
+	</IfModule>
 </Directory>
 
 # Version 1 (default): under /cgi-bin/gitweb.cgi address
 Alias /cgi-bin/static/ /usr/share/gitweb/static/
 ScriptAlias /cgi-bin/gitweb.cgi /usr/lib/cgi-bin/gitweb.cgi
 <Location /cgi-bin/gitweb.cgi>
-	Allow from All
+	# Apache 2.x
+	<IfModule !mod_authz_core.c>
+		Order allow,deny
+		Allow from all
+	</IfModule>
+	# Apache 2.4
+	<IfModule mod_authz_core.c>
+		Require all granted
+	</IfModule>
 </Location>
 SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
 
@@ -22,7 +38,15 @@ SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
 #	DirectoryIndex gitweb.cgi
 #	<Location />
 #		Options ExecCGI
-#		Allow from All
+#		# Apache 2.x
+#		<IfModule !mod_authz_core.c>
+#			Order allow,deny
+#			Allow from all
+#		</IfModule>
+#		# Apache 2.4
+#		<IfModule mod_authz_core.c>
+#			Require all granted
+#		</IfModule>
 #	</Location>
 #	SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
 #</VirtualHost>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/95c90ddf33b87f3e89c6f81034c2e0b2ba7cc741