SPECS: squid.spec - up to 2.6.STABLE18 - removed obsolete patches, ...

[dzeus]

Author: dzeus                        Date: Sat Jan 19 17:10:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.6.STABLE18
- removed obsolete patches, renumbered

---- Files affected:
SPECS:
   squid.spec (1.288 -> 1.289) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.288 SPECS/squid.spec:1.289
--- SPECS/squid.spec:1.288	Sun Jan 13 14:57:30 2008
+++ SPECS/squid.spec	Sat Jan 19 18:10:47 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
+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
@@ -441,21 +437,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
@@ -498,9 +491,7 @@
 	--sysconfdir=%{_sysconfdir} \
 	--with-auth-on-acceleration \
 	--with-pthreads \
-	--with-large-files \
-	--enable-fd-config \
-	--with-maxfd=32768
+	--with-large-files
 
 %{__make}
 
@@ -766,6 +757,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.289  2008-01-19 17:10:47  dzeus
+- up to 2.6.STABLE18
+- removed obsolete patches, renumbered
+
 Revision 1.288  2008-01-13 13:57:30  glen
 - revert, epoll not poll
 
================================================================

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