- new upstream + the latest CVS snapshot from 2006/07/18

- updated fd config patch
- enabled epoll
- fixed release format (#197405)
- enabled WCCPv2 support (#198642)

sources

@@ -1 +1 @@
-f413e0b887a5f9b2a75350243ed5564c  squid-2.5.STABLE14.tar.bz2
+d6bb23a67b0475cca11d4af8d574d054  squid-2.6.STABLE1.tar.bz2

squid.spec

@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.5.STABLE14
+Version: 2.6.STABLE1
-Release: 2.1
+Release: 1%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,24 +19,20 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch100: squid-2.5.STABLE14-httpReplyDestroy.patch
+# the latest upstream CVS snapshot
+Patch100: squid-2.6.STABLE1-20060718.patch
 
 # External patches
-Patch150: squid-2.5.STABLE12-follow-xff.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
 Patch201: squid-2.5.STABLE11-config.patch
 Patch202: squid-2.5.STABLE4-location.patch
-Patch203: squid-2.5.STABLE7-build.patch
+Patch203: squid-2.6.STABLE1-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
-Patch205: squid-2.5.STABLE5-pipe.patch
+Patch205: squid-2.5.STABLE12-smb-path.patch
-Patch206: squid-2.5.STABLE13-libbind.patch
+Patch206: squid-2.6.STABLE1-fd-config.patch
-Patch207: squid-2.5.STABLE12-64bit.patch
-Patch208: squid-2.5.STABLE12-fd-config.patch
-Patch209: squid-2.5.STABLE12-fd-config-fix.patch
-Patch210: squid-2.5.STABLE12-smb-path.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -59,20 +55,14 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
-%patch100 -p1 -b .rpl
+%patch100 -p1
-
-%patch150 -p1 -b .follow-xff
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
-%patch205 -p1 -b .pipe
+%patch205 -p1 -b .smb
-%patch206 -p1 -b .libbind
+%patch206 -p1 -b .fd
-%patch207 -p1 -b .stat
-%patch208 -p1 -b .fdc
-%patch209 -p1 -b .fdc
-%patch210 -p1 -b .path
 
 %build
  export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
@@ -83,7 +73,7 @@ lookup program (dnsserver), a program for retrieving FTP data
    --localstatedir=/var \
    --datadir=%{_datadir} \
    --sysconfdir=/etc/squid \
-   --enable-poll \
+   --enable-epoll \
    --enable-snmp \
    --enable-removal-policies="heap,lru" \
    --enable-storeio="aufs,coss,diskd,null,ufs" \
@@ -92,8 +82,8 @@ lookup program (dnsserver), a program for retrieving FTP data
    --enable-delay-pools \
    --enable-linux-netfilter \
    --with-pthreads \
-   --enable-ntlm-auth-helpers="SMB,winbind,fakeauth" \
+   --enable-ntlm-auth-helpers="SMB,fakeauth" \
-   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group,winbind_group" \
+   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
    --enable-auth="basic,digest,ntlm" \
    --enable-digest-auth-helpers="password" \
    --with-winbind-auth-challenge \
@@ -102,14 +92,17 @@ lookup program (dnsserver), a program for retrieving FTP data
    --disable-dependency-tracking \
    --enable-cachemgr-hostname=localhost \
    --enable-underscores \
-   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,winbind" \
+   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
    --enable-cache-digests \
    --enable-ident-lookups \
    %ifnarch ppc64 ia64 x86_64 s390x
    --with-large-files \
    %endif
-   --enable-fd-config \
    --enable-follow-x-forwarded-for \
+   --enable-wccpv2 \
+   --enable-fd-config \
+
+
 
 export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
 make %{?_smp_mflags}
@@ -180,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) /etc/pam.d/squid
 %attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
 %attr(4750,root,squid) %{_libdir}/squid/pam_auth
+%attr(755,root,root) %{_sbindir}/cossdump
 
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
@@ -330,6 +324,13 @@ fi
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Mon Jul 18 2006 Martin Stransky <stransky@redhat.com> - 7:2.6.STABLE1-1
+- new upstream + the latest CVS snapshot from 2006/07/18
+- updated fd config patch
+- enabled epoll
+- fixed release format (#197405)
+- enabled WCCPv2 support (#198642)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 7:2.5.STABLE14-2.1
 - rebuild