SPECS: squid.spec - cachemgr uses webapps and is standalone from squid

Wed Nov 12 15:28:31 CET 2008

Author: glen                         Date: Wed Nov 12 14:28:31 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cachemgr uses webapps and is standalone from squid

---- Files affected:
SPECS:
   squid.spec (1.306 -> 1.307) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.306 SPECS/squid.spec:1.307

--- SPECS/squid.spec:1.306	Tue Oct 28 21:57:17 2008
+++ SPECS/squid.spec	Wed Nov 12 15:28:25 2008
@@ -1,11 +1,13 @@
 # $Revision$, $Date$
 # TODO
 # - REVIEW patches and configuration
-# - use /usr/lib/cgi-bin instead of /home/services
 # - ZPH TOS -
 # For this to work correctly, you will need to patch your linux
 # kernel with the TOS preserving ZPH patch.
 # The kernel patch can be downloaded from http://zph.bratcheda.org
+# - Installed (but unpackaged) file(s) found:
+#   /usr/share/squid/errors/templates/ERR_ACCESS_DENIED
+#   /usr/share/squid/errors/templates/ERR_ZERO_SIZE_OBJECT
 #
 # Conditional build:
 %bcond_with	combined_log	# enables apache-like combined log format
@@ -20,7 +22,7 @@
 Name:		squid
 Version:	3.0.STABLE10
 # review patches before stable release
-Release:	0.1
+Release:	0.2
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
@@ -41,6 +43,7 @@
 # lets have fun - there is no patches... yet:)
 # Other patches:
 # http://zph.bratcheda.org/
+Source8:	%{name}-cachemgr-apache.conf
 Patch0:		%{name}_hit_miss_mark.patch
 Patch1:		%{name}-fhs.patch
 Patch2:		%{name}-location.patch
@@ -50,6 +53,7 @@
 Patch8:		%{name}-2.5.STABLE4-apache-like-combined-log.patch
 Patch9:		%{name}-auth_on_acceleration.patch
 Patch10:	%{name}-ppc-m32.patch
+Patch11:	%{name}-cachemgr-webapp.patch
 URL:		http://www.squid-cache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -84,9 +88,11 @@
 Conflicts:	logrotate < 3.7-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_webapps	/etc/webapps
+%define		_webapp		cachemgr
 %define		_libexecdir	%{_libdir}/%{name}
 %define		_sysconfdir	/etc/%{name}
-%define		_cgidir		/home/services/httpd/cgi-bin
+%define		_cgidir		%{_prefix}/lib/cgi-bin/%{_webapp}
 
 %description
 Squid is a high-performance proxy caching server for web clients,
@@ -187,9 +193,14 @@
 %package cachemgr
 Summary:	CGI script for Squid management
 Summary(pl.UTF-8):	Skrypt CGI do zarządzania Squidem przez WWW
-Group:		Networking/Admin
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Group:		Applications/WWW
+# does not require squid locally
+Requires:	group(http)
+Requires:	webapps
 Requires:	webserver
+Requires:	webserver(access)
+Requires:	webserver(alias)
+Requires:	webserver(cgi)
 
 %description cachemgr
 Cachemgr.cgi is a CGI script that allows administrator to chceck
@@ -452,6 +463,7 @@
 %ifarch ppc
 %patch10 -p1
 %endif
+%patch11 -p1
 
 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl
 
@@ -505,7 +517,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_cgidir} \
+install -d $RPM_BUILD_ROOT{%{_cgidir},%{_webapps}/%{_webapp}} \
 	$RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security,sysconfig,logrotate.d} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_libexecdir}/contrib} \
 	$RPM_BUILD_ROOT%{_mandir}/man8 \
@@ -522,6 +534,9 @@
 touch $RPM_BUILD_ROOT/etc/security/blacklist.squid
 
 mv -f $RPM_BUILD_ROOT%{_libdir}/squid/cachemgr.cgi $RPM_BUILD_ROOT%{_cgidir}
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+rm -f $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/cachemgr.conf.default
 
 cd $RPM_BUILD_ROOT/etc/squid
 cp -f squid.conf{,.default}
@@ -595,6 +610,24 @@
 %triggerpostun -- squid < 7:2.5.STABLE7-5
 %addusertogroup stats squid
 
+%triggerin cachemgr -- apache1 < 1.3.37-3, apache1-base
+%webapp_register apache %{_webapp}
+
+%triggerun cachemgr -- apache1 < 1.3.37-3, apache1-base
+%webapp_unregister apache %{_webapp}
+
+%triggerin cachemgr -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun cachemgr -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
+%triggerpostun -- cachemgr < 7:3.0.STABLE10-0.2
+if [ -f %{_sysconfdir}/cachemgr.conf.rpmsave ]; then
+	cp -f %{_webapps}/%{_webapp}/cachemgr.conf{,.rpmsave}
+	mv -f %{_sysconfdir}/cachemgr.conf.rpmsave %{_webapps}/%{_webapp}/cachemgr.conf
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc CONTRIBUTORS COPYRIGHT CREDITS README ChangeLog QUICKSTART RELEASENOTES.html SPONSORS
@@ -668,8 +701,11 @@
 
 %files cachemgr
 %defattr(644,root,root,755)
-%attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cachemgr.conf
-%attr(755,root,root) %{_cgidir}/*
+%dir %attr(750,root,http) %{_webapps}/%{_webapp}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/cachemgr.conf
+%attr(755,root,root) %{_cgidir}/cachemgr.cgi
 %{_mandir}/man8/cachemgr.cgi.8*
 
 %files ldap_auth
@@ -765,6 +801,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.307  2008/11/12 14:28:25  glen
+- cachemgr uses webapps and is standalone from squid
+
 Revision 1.306  2008/10/28 20:57:17  dzeus
 - up to 3.0.STABLE10
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/squid.spec?r1=1.306&r2=1.307&f=u

