From 583c279480de190f53c731ce92c6c105478c2659 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Mon, 5 Sep 2005 15:59:33 +0000
Subject: [PATCH] Three upstream patches for #167414, Spanish and Greek
 messages, patch for     -D_FORTIFY_SOURCE=2

---
 squid.spec | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/squid.spec b/squid.spec
index b746a30..fb10f97 100644
--- a/squid.spec
+++ b/squid.spec
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE10
-Release: 3
+Release: 4
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,6 +19,12 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
+Patch100: squid-2.5.STABLE10-spanish.patch
+Patch101: squid-2.5.STABLE10-sslConnectTimeout.patch 
+Patch102: squid-2.5.STABLE10-statHistAssert.patch
+Patch103: squid-2.5.STABLE10-fortify_source.patch 
+Patch104: squid-2.5.STABLE10-greek.patch
+Patch105: squid-2.5.STABLE10-store_pending.patch
 
 
 # Local patches
@@ -53,6 +59,13 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -305,6 +318,11 @@ fi
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Mon Sep 5 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE10-4
+- Three upstream patches for #167414
+- Spanish and Greek messages
+- patch for -D_FORTIFY_SOURCE=2 
+
 * Tue Aug 30 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE10-3
 - removed "--enable-truncate" option (#165948)
 - added "--enable-cache-digests" option (#102134)