[squid/f12/master] Upstream 3.1.6 bugfix release

[Henrik Nordström]

commit 13b3b84deaa73b11761bfa81e53ecd17de0fc8a1
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Sat Aug 21 21:00:41 2010 +0200

    Upstream 3.1.6 bugfix release

 .gitignore |    2 ++
 sources    |    8 ++------
 squid.spec |   21 ++++++---------------
 3 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a803153..b30aad5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 squid-3.1.4.tar.bz2
 squid-3.1.4.tar.bz2.asc
 squid-3-10526.patch
+/squid-3.1.6.tar.bz2
+/squid-3.1.6.tar.bz2.asc
diff --git a/sources b/sources
index b64d058..21721cd 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,2 @@
-2c6f256d55c4356e91db5faa4d6b236b  squid-3.1.5.tar.bz2
-4b7310b194657fd07be6253a75e69b85  squid-3.1.5.tar.bz2.asc
-dad04beee59b4a837c12c4c80c4960ba  squid-3.1-10017.patch
-655d54f5fc034b09df9fb53d162faa98  squid-3.1-10018.patch
-826216225b88fb11384854116f81f392  squid-3.1-10019.patch
-0e4c7d6ea22c6456efd12bb4b8f94fb8  squid-3.1-10021.patch
+e9e2e9a9b5a305ba717be93ebb85f245  squid-3.1.6.tar.bz2
+b7795be176612f83344612e3dd31d630  squid-3.1.6.tar.bz2.asc
diff --git a/squid.spec b/squid.spec
index 07248ec..2bd76f5 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,7 +3,7 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.5
+Version:  3.1.6
 Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
@@ -21,10 +21,7 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10017.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10018.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10019.patch
-Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10021.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10017.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -35,10 +32,6 @@ Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.1.0.15-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
 
-# Temporary patches
-# 3.1.5 bundles a slightly broken libtool. Fixed upstream.
-Patch301: squid-3.1.5-libtoolinclude.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
 Requires(pre): shadow-utils
@@ -76,10 +69,7 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
-%patch001 -p0
-%patch002 -p0
-%patch003 -p0
-%patch004 -p0
+#patch001 -p0
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -87,8 +77,6 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
 
-%patch301 -p1 -b .libtoolinclude
-
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
 %configure \
@@ -268,6 +256,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat Aug 21 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.6-1
+- Upstream 3.1.6 bugfix release
+
 * Thu Jul 15 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.5-2
 - Upstream 3.1.5 bugfix release
 - Upstream patch for Bug #614665: Squid crashes with  ident auth