[squid/f16] update to latest upstream 3.2.0.14 enabled eCAP

[Jiri Skala]

commit ce3df616a45e6dfd1e4585006bad5af6e1730b91
Author: Jiri Skala <jskala at redhat.com>
Date:   Thu Dec 22 07:41:01 2011 +0100

    update to latest upstream 3.2.0.14
    enabled eCAP

 .gitignore |    1 +
 sources    |    3 +--
 squid.spec |   15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2093bac..3e8ab07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ squid-3.1-10021.patch
 /squid-3.2.0.12.tar.bz2.asc
 /squid-3.2.0.13.tar.bz2
 /squid-3.2.0.13.tar.bz2.asc
+/squid-3.2.0.14.tar.bz2
diff --git a/sources b/sources
index 573f2d4..bfaea87 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-cef6d63729b34404a3e463f0bd81b1e3  squid-3.2.0.13.tar.bz2
-6a65c111b85313e4554e6c44d8f4fab2  squid-3.2.0.13.tar.bz2.asc
+b71beaa91e8d0a9f89956ac3685478a8  squid-3.2.0.14.tar.bz2
diff --git a/squid.spec b/squid.spec
index 399e811..a9e18a8 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.2.0.13
-Release:  5%{?dist}
+Version:  3.2.0.14
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -25,8 +25,6 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-XXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11383.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11406.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -61,7 +59,7 @@ BuildRequires: expat-devel libxml2-devel
 # TPROXY requires libcap, and also increases security somewhat
 BuildRequires: libcap-devel
 # eCAP support
-#BuildRequires: libecap-devel
+BuildRequires: libecap-devel
 # 
 BuildRequires: libtool libtool-ltdl-devel
 
@@ -91,8 +89,6 @@ The squid-sysvinit contains SysV initscritps support.
 %setup -q
 
 #patch001 -p0
-%patch001 -p0
-%patch002 -p0
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -146,6 +142,7 @@ LDFLAGS="-pie"
    --enable-useragent-log \
    --enable-wccpv2 \
    --enable-esi \
+   --enable-ecap \
    --with-aio \
    --with-default-user="squid" \
    --with-filedescriptors=16384 \
@@ -306,6 +303,10 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
+* Thu Dec 22 2011 Jiri Skala <jskala at redhat.com> - 7:3.2.0.14-1
+- update to latest upstream 3.2.0.14
+- enabled eCAP
+
 * Mon Nov 07 2011 Jiri Skala <jskala at redhat.com> - 7:3.2.0.13-5
 - fixes #751679 - host_strict_verify setting inverted in squid.conf