From 973545ec5c5efa843e605420e2be2fe63ad54175 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 12:38:40 +0000
Subject: [PATCH] auto-import squid-2.4.STABLE6-1.7.2 from
 squid-2.4.STABLE6-1.7.2.src.rpm

---
 .cvsignore |  2 +-
 sources    |  2 +-
 squid.spec | 17 ++++++-----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 675db2b..c13f59d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-squid-2.4.STABLE3-src.tar.gz
+squid-2.4.STABLE6-src.tar.gz
diff --git a/sources b/sources
index 779ac1e..ad59bb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fdaf22d66d7b776325902adc0fd438d  squid-2.4.STABLE3-src.tar.gz
+103fe9d03aca06f89218740f29730527  squid-2.4.STABLE6-src.tar.gz
diff --git a/squid.spec b/squid.spec
index e0cfd0c..b0b2e76 100644
--- a/squid.spec
+++ b/squid.spec
@@ -1,7 +1,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.4.STABLE3
-Release: 1.7.2s.1
+Version: 2.4.STABLE6
+Release: 1.7.2
 Serial: 7
 License: GPL
 Group: System Environment/Daemons
@@ -14,9 +14,6 @@ Patch0: squid-2.1-make.patch
 Patch1: squid-2.4-config.patch
 Patch2: squid-perlpath.patch
 Patch3: squid-location.patch
-Patch10: squid-2.4.STABLE3-SNMP_memory_leaks.patch
-Patch11: squid-2.4.STABLE3-ftp_coredump.patch
-Patch12: squid-2.4.STABLE3-htcp_off.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
 Requires: bash >= 2.0
@@ -41,9 +38,6 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch1 -p1 -b .config
 %patch2 -p1 -b .perlpath
 %patch3 -p1
-%patch10 -p1 -b .snmp
-%patch11 -p1 -b .ftp
-%patch12 -p1 -b .htcp
 
 %build
 %configure \
@@ -52,7 +46,7 @@ lookup program (dnsserver), a program for retrieving FTP data
    --enable-poll --enable-snmp --enable-removal-policies="heap,lru" \
    --enable-storeio="aufs,coss,diskd,ufs" \
    --enable-delay-pools --enable-linux-netfilter \
-   --enable-carp --with-pthreads \
+   --with-pthreads \
    --enable-auth-modules="LDAP,NCSA,PAM,SMB,MSNT"  # --enable-icmp
    
 # Some versions of autoconf fail to detect sys/resource.h correctly;
@@ -249,8 +243,9 @@ if [ "$1" -ge "1" ] ; then
 fi
 
 %changelog
-* Wed Mar 18 2003 D. Marlin <dmarlin@redhat.com>
-- new s390 release number and rebuild for s390 (bug #85960)
+* Fri Mar 22 2002 Bill Nottingham <notting@redhat.com>
+- 2.4.STABLE6
+- turn off carp
 
 * Mon Feb 18 2002 Bill Nottingham <notting@redhat.com>
 - 2.4.STABLE3 + patches