SPECS (AC-branch): squid.spec - merge 2.6.STABLE18 from HEAD

[glen]

Author: glen                         Date: Wed Jan 23 21:08:34 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge 2.6.STABLE18 from HEAD

---- Files affected:
SPECS:
   squid.spec (1.282.2.5 -> 1.282.2.6) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.282.2.5 SPECS/squid.spec:1.282.2.6
--- SPECS/squid.spec:1.282.2.5	Wed Jan 23 21:50:52 2008
+++ SPECS/squid.spec	Wed Jan 23 22:08:29 2008
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO
 # - use /usr/lib/cgi-bin instead of /home/services
-# - test fd-config.patch (works in Fedora)
 # - test new hit_miss_mark.patch (ZPH TOS)
 #
 # Conditional build:
@@ -15,13 +14,13 @@
 Summary(uk.UTF-8):	Squid - кеш об'єктів Internet
 Summary(zh_CN.UTF-8):	SQUID 高速缓冲代理服务器
 Name:		squid
-Version:	2.6.STABLE17
-Release:	2
+Version:	2.6.STABLE18
+Release:	1
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://www.squid-cache.org/Versions/v2/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5:	e6face0dff4ea054d3ba94236eb56ea1
+# Source0-md5:	eb49bc06ea1a40421b6f1ac9e76d1757
 # http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz
 Source1:	%{name}-FAQ.tar.gz
 # Source1-md5:	cb9a955f8cda9cc166e086fccd412a43
@@ -37,20 +36,17 @@
 # lets have fun - there is no patches... yet :)
 # Other patches:
 # http://www.it-academy.bg/zph/
-Patch100:	%{name}_hit_miss_mark.patch
-Patch101:	%{name}-fhs.patch
-Patch102:	%{name}-location.patch
-Patch103:	%{name}-domainmatch.patch
-Patch104:	%{name}-libnsl_fixes.patch
-Patch106:	%{name}-crash-on-ENOSPC.patch
-Patch107:	%{name}-newssl.patch
-Patch109:	%{name}-more_FD-new.patch
-Patch110:	%{name}-empty-referer.patch
-Patch111:	%{name}-align.patch
-Patch112:	%{name}-2.5.STABLE4-apache-like-combined-log.patch
-Patch113:	%{name}-auth_on_acceleration.patch
-Patch114:	%{name}-fd-config.patch
-Patch115:	%{name}-ppc-m32.patch
+Patch0:	%{name}_hit_miss_mark.patch
+Patch1:	%{name}-fhs.patch
+Patch2:	%{name}-location.patch
+Patch3:	%{name}-domainmatch.patch
+Patch4:	%{name}-libnsl_fixes.patch
+Patch5:	%{name}-crash-on-ENOSPC.patch
+Patch6:	%{name}-newssl.patch
+Patch7:	%{name}-empty-referer.patch
+Patch8:	%{name}-2.5.STABLE4-apache-like-combined-log.patch
+Patch9:	%{name}-auth_on_acceleration.patch
+Patch10:	%{name}-ppc-m32.patch
 URL:		http://www.squid-cache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -439,21 +435,18 @@
 # Bug fixes from Squid home page:
 
 # Other patches:
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch106 -p1
-%patch107 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%{?with_combined_log:%patch112 -p1}
-%patch113 -p1
-%patch114 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%{?with_combined_log:%patch8 -p1}
+%patch9 -p1
 %ifarch ppc
-%patch115 -p1
+%patch10 -p1
 %endif
 
 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl
@@ -608,7 +601,7 @@
 %attr(755,root,root) %{_libexecdir}/fakeauth_auth
 %attr(755,root,root) %{_sbindir}/*
 
-%attr(755,root,root) %dir %{_sysconfdir}
+%dir %{_sysconfdir}
 
 %attr(754,root,root) /etc/rc.d/init.d/squid
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/squid
@@ -654,7 +647,7 @@
 %lang(zh_TW) %{_datadir}/squid/errors/Traditional_Chinese
 %lang(tr) %{_datadir}/squid/errors/Turkish
 
-%attr(755,root,root) %dir %{_libexecdir}
+%dir %{_libexecdir}
 
 %attr(770,root,squid) %dir /var/log/archive/squid
 %attr(770,root,squid) %dir /var/log/squid
@@ -766,6 +759,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.282.2.6  2008-01-23 21:08:29  glen
+- merge 2.6.STABLE18 from HEAD
+
 Revision 1.282.2.5  2008-01-23 20:50:52  glen
 - cleanup backups after patching
 
================================================================

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