From 8aeb96083c999df7e6f7bc154cdd5f3f90170669 Mon Sep 17 00:00:00 2001
From: fenlason <fenlason@fedoraproject.org>
Date: Wed, 16 Mar 2005 15:07:34 +0000
Subject: [PATCH] Upgrade to STABLE9 with upstream patches.

---
 .cvsignore |  5 +----
 sources    |  2 +-
 squid.spec | 33 ++++++++++++++++++++++++++++-----
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 17c5820..a4ad31f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-squid-2.5.STABLE5.tar.bz2
-squid-2.5.STABLE6.tar.bz2
-squid-2.5.STABLE7.tar.bz2
-squid-2.5.STABLE8.tar.bz2
+squid-2.5.STABLE9.tar.bz2
diff --git a/sources b/sources
index f7ce428..8dcbaac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-687db8c5f0fec3798dbc77f94340b185  squid-2.5.STABLE8.tar.bz2
+5a34a303dcab8851c7ab20e24af69b61  squid-2.5.STABLE9.tar.bz2
diff --git a/squid.spec b/squid.spec
index fecb975..3b96c0e 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.5.STABLE8
+Version: 2.5.STABLE9
 Release: 2
 Epoch: 7
 License: GPL
@@ -19,10 +19,20 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE8-dns_assert.patch
-Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE8-format_fixes.patch
-Patch102: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE8-html_high_chars.patch
-Patch103: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE8-ftp_cleanup.patch
+Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-setcookie.patch
+Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ftp_EPLF.patch
+Patch102: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ftp_base_href.patch
+Patch103: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-acl_error.patch
+Patch104: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-date.patch
+Patch105: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-reload_into_ims.patch
+Patch106: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-delay_access_doc.patch
+Patch107: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-config_overflow.patch
+Patch108: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-bzero.patch
+Patch109: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-pid_t.patch
+Patch110: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ctype.patch
+Patch111: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-defer_digest_fetch.patch
+Patch112: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dup_content_length.patch
+Patch113: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-excess_data.patch
 
 
 # Local patches
@@ -59,6 +69,16 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
+%patch113 -p1
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -284,6 +304,9 @@ fi
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Tue Mar 15 2005 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE9-2
+- New upstream version, with 14 upstream patches.
+
 * Wed Feb 16 2005 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE8-2
 - new upstream version with 4 upstream patches.
 - Reorganize spec file to apply upstream patches first