[packages/cvsweb] multi apache version package

[glen]

commit 63ba4d819e6a18eb9271e3b6e0212583f3740f58
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Nov 3 01:52:30 2013 +0200

    multi apache version package

 cvsweb-apache.conf | 30 +++++++++++++++++++++++++++---
 cvsweb.spec        |  3 ++-
 2 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/cvsweb.spec b/cvsweb.spec
index 5c6ee8c..9d55c7e 100644
--- a/cvsweb.spec
+++ b/cvsweb.spec
@@ -3,7 +3,7 @@ Summary:	Visual (www) interface to explore a CVS repository
 Summary(pl.UTF-8):	Wizualny (WWW) interfejs do przeglądania repozytorium CVS
 Name:		cvsweb
 Version:	3.0.6
-Release:	6
+Release:	8
 Epoch:		1
 License:	BSD
 Group:		Development/Tools
@@ -23,6 +23,7 @@ Requires:	filesystem >= 3.0-11
 Requires:	mailcap
 Requires:	rcs
 Requires:	webapps
+Requires:	webserver(access)
 Conflicts:	apache-base < 2.2.0-8
 Conflicts:	apache1 < 1.3.34-6
 BuildArch:	noarch
diff --git a/cvsweb-apache.conf b/cvsweb-apache.conf
index 3c80dd9..faa246b 100644
--- a/cvsweb-apache.conf
+++ b/cvsweb-apache.conf
@@ -1,14 +1,30 @@
 
 <Directory /usr/share/cvsweb>
 	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>
 
 # Version1 (default): under /cgi-bin/cvsweb.cgi address
 ScriptAlias /cgi-bin/cvsweb.cgi /usr/lib/cgi-bin/cvsweb.cgi
 Alias /cvsweb/ /usr/share/cvsweb/
 <Location /cgi-bin/cvsweb.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>
 
 	# See also $charset in cvsweb.conf.
 	#AddDefaultCharset UTF-8
@@ -30,6 +46,14 @@ Alias /cvsweb/ /usr/share/cvsweb/
 #	DocumentRoot /usr/lib/cgi-bin/cvsweb.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>
 #</VirtualHost>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cvsweb.git/commitdiff/63ba4d819e6a18eb9271e3b6e0212583f3740f58