[packages/squid] - migrated to apache 2.4

[baggins]

commit 61cf77cbe9ba85e4643d6d2cc0a67c22e129b497
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri May 17 11:36:15 2013 +0200

    - migrated to apache 2.4

 squid-cachemgr-httpd.conf |  5 +++++
 squid.spec                | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/squid.spec b/squid.spec
index 97228b5..1695ccf 100644
--- a/squid.spec
+++ b/squid.spec
@@ -17,7 +17,7 @@ Summary(uk.UTF-8):	Squid - кеш об'єктів Internet
 Summary(zh_CN.UTF-8):	SQUID 高速缓冲代理服务器
 Name:		squid
 Version:	3.2.11
-Release:	1
+Release:	2
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
@@ -32,6 +32,7 @@ Source5:	%{name}.logrotate
 Source6:	%{name}.pamd
 Source7:	%{name}-cachemgr-apache.conf
 Source8:	%{name}.tmpfiles
+Source9:	%{name}-cachemgr-httpd.conf
 Patch0:		%{name}-fhs.patch
 Patch1:		%{name}-location.patch
 Patch2:		%{name}-crash-on-ENOSPC.patch
@@ -202,6 +203,7 @@ Requires:	webserver
 Requires:	webserver(access)
 Requires:	webserver(alias)
 Requires:	webserver(cgi)
+Conflicts:	apache-base < 2.4.0-1
 
 %description cachemgr
 Cachemgr.cgi is a CGI script that allows administrator to check
@@ -678,7 +680,7 @@ install %{SOURCE8} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/squid.conf
 
 %{__mv} -f $RPM_BUILD_ROOT%{_libdir}/squid/cachemgr.cgi $RPM_BUILD_ROOT%{_cgidir}
 %{__cp} -a %{SOURCE7} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-%{__cp} -a %{SOURCE7} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+%{__cp} -a %{SOURCE9} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 %{__rm} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/cachemgr.conf.default
 
 cd $RPM_BUILD_ROOT/etc/squid
@@ -751,10 +753,10 @@ fi
 %triggerun cachemgr -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin cachemgr -- apache < 2.2.0, apache-base
+%triggerin cachemgr -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun cachemgr -- apache < 2.2.0, apache-base
+%triggerun cachemgr -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- cachemgr < 7:3.0.STABLE10-0.2
diff --git a/squid-cachemgr-httpd.conf b/squid-cachemgr-httpd.conf
new file mode 100644
index 0000000..622f815
--- /dev/null
+++ b/squid-cachemgr-httpd.conf
@@ -0,0 +1,5 @@
+ScriptAlias /cgi-bin/cachemgr.cgi /usr/lib/cgi-bin/cachemgr/cachemgr.cgi
+
+<Directory /usr/lib/cgi-bin/cachemgr>
+	Require all granted
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/squid.git/commitdiff/61cf77cbe9ba85e4643d6d2cc0a67c22e129b497