From 3aa1c0e3a27879cb5983502e32c086f3beeb4e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <hno@fedoraproject.org>
Date: Thu, 15 Jul 2010 09:01:06 +0000
Subject: [PATCH] 3.1.5 + bugfixes

---
 .cvsignore |  9 ++++++---
 sources    |  9 ++++++---
 squid.spec | 24 +++++++++++++++++-------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a803153..53d0ad8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,6 @@
-squid-3.1.4.tar.bz2
-squid-3.1.4.tar.bz2.asc
-squid-3-10526.patch
+squid-3.1.5.tar.bz2
+squid-3.1.5.tar.bz2.asc
+squid-3.1-10017.patch
+squid-3.1-10018.patch
+squid-3.1-10019.patch
+squid-3.1-10021.patch
diff --git a/sources b/sources
index adeed0d..b64d058 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,6 @@
-3fb544ae02fadc2b4085f62bb927e861  squid-3.1.4.tar.bz2
-a4abc8a4710d6fc59478293125f027bc  squid-3.1.4.tar.bz2.asc
-9601e84f06b7bbe4e44c133f9d0c585f  squid-3-10526.patch
+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
diff --git a/squid.spec b/squid.spec
index 6b40610..748b150 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.4
-Release:  2%{?dist}
+Version:  3.1.5
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2
@@ -21,8 +21,10 @@ 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-xxxx.patch
-Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10526.patch
+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
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -69,8 +71,11 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
-#patch001 -p0 -b .3.1-xxxx
-%patch001 -p0 -b .3-10526
+#patch001 -p0
+%patch001 -p0
+%patch002 -p0
+%patch003 -p0
+%patch004 -p0
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -261,7 +266,12 @@ fi
 
 
 %changelog
-* Mon May 31 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7: 3.1.4-2
+* Thu Jul 15 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.5-1
+- Upstream 3.1.5 bugfix release
+- Upstream patch for Bug #614665: Squid crashes with  ident auth
+- Upstream patches for various memory leaks
+
+* Mon May 31 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.4-2
 - Correct case-insensitiveness in HTTP list header parsing
 
 * Sun May 30 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.4-1