- up to 2.6.STABLE18

- removed obsolete patches, renumbered

Changed files:
    squid.spec -> 1.289

diff --git a/squid.spec b/squid.spec
index 5fbf3a82cad8f5acb117fb7ce8d44800441ddf06..769d9c3a44da9ee9c94f194b56b29bd725bbc422 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -1,6 +1,5 @@
 # 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:
@@ -14,13 +13,13 @@ Summary(ru.UTF-8):  Squid - кэш объектов Internet
 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
@@ -36,20 +35,17 @@ Source7:    %{name}.pamd
 # 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
@@ -440,21 +436,18 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 # 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
@@ -497,9 +490,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
        --sysconfdir=%{_sysconfdir} \
        --with-auth-on-acceleration \
        --with-pthreads \
-       --with-large-files \
-       --enable-fd-config \
-       --with-maxfd=32768
+       --with-large-files
 
 %{__make}