SPECS (AC-branch): squid.spec - restore fd-config.patch; rel 2

[glen]

Author: glen                         Date: Wed Feb  6 15:38:59 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- restore fd-config.patch; rel 2

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

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.282.2.6 SPECS/squid.spec:1.282.2.7
--- SPECS/squid.spec:1.282.2.6	Wed Jan 23 22:08:29 2008
+++ SPECS/squid.spec	Wed Feb  6 16:38:54 2008
@@ -15,7 +15,7 @@
 Summary(zh_CN.UTF-8):	SQUID 高速缓冲代理服务器
 Name:		squid
 Version:	2.6.STABLE18
-Release:	1
+Release:	2
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
@@ -33,20 +33,21 @@
 Source6:	%{name}.logrotate
 Source7:	%{name}.pamd
 # Bug fixes from Squid home page, please include URL
-# lets have fun - there is no patches... yet :)
+# lets have fun - there is no patches... yet:)
 # Other patches:
 # http://www.it-academy.bg/zph/
-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
+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
+Patch11:	%{name}-fd-config.patch
 URL:		http://www.squid-cache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -414,8 +415,8 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description session_acl
-This  helper maintains a concept of sessions by monitoring requests and
-timing out sessions if no requests have been seen for the idle  timeout
+This helper maintains a concept of sessions by monitoring requests and
+timing out sessions if no requests have been seen for the idle timeout
 timer.
 
 %package scripts
@@ -448,6 +449,7 @@
 %ifarch ppc
 %patch10 -p1
 %endif
+%patch11 -p1
 
 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl
 
@@ -759,6 +761,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.282.2.7  2008-02-06 15:38:54  glen
+- restore fd-config.patch; rel 2
+
 Revision 1.282.2.6  2008-01-23 21:08:29  glen
 - merge 2.6.STABLE18 from HEAD
 
================================================================

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