added patch for delay pools and some minor fixes

squid.spec

@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE11
-Release: 1
+Release: 2
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -18,6 +18,14 @@ Source5: squid.pam
 Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
+# Upstream patches
+Patch100: squid-2.5.STABLE11-delaypools_truncated.patch
+Patch101: squid-2.5.STABLE11-tcp_outgoing_xxx.patch
+Patch102: squid-2.5.STABLE11-ldap_auth.patch
+Patch103: squid-2.5.STABLE11.accel_single_host_pconn.patch
+Patch104: squid-2.5.STABLE11-CACHE_HTTP_PORT.patch
+Patch105: squid-2.5.STABLE11-CNAME.patch
+
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
@@ -50,6 +58,13 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -85,7 +100,6 @@ lookup program (dnsserver), a program for retrieving FTP data
    --enable-referer-log \
    --disable-dependency-tracking \
    --enable-cachemgr-hostname=localhost \
-   --disable-ident-lookups \
    --enable-underscores \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,winbind" \
    --enable-cache-digests \
@@ -305,6 +319,9 @@ fi
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Thu Sep 29 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE11-2
+- added patch for delay pools and some minor fixes
+
 * Fri Sep 23 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE11-1
 - update to STABLE11