From 5b14c71c75e4aec5c506f6ab906808675438a22e Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Oct 17 2006 14:56:00 +0000
Subject: upstream patches


---

diff --git a/squid.spec b/squid.spec
index 2f715bf..022aa23 100644
--- a/squid.spec
+++ b/squid.spec
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.6.STABLE4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -28,6 +28,9 @@ Patch106: squid-2.6.STABLE4-mem-leak.patch
 Patch107: squid-2.6.STABLE4-forward.patch
 Patch108: squid-2.6.STABLE4-snmp.patch
 Patch109: squid-2.6.STABLE4-mem-leak-ncsa.patch
+Patch110: squid-2.6.STABLE4-time.patch
+Patch111: squid-2.6.STABLE4-aio-done.patch
+Patch112: squid-2.6.STABLE4-reconfigure.patch
 
 # External patches
 
@@ -73,6 +76,9 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch107 -p1
 %patch108 -p1
 %patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -343,6 +349,12 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 17 2006 Martin Stransky <stransky@redhat.com> - 7:2.6.STABLE4-2
+- upstream fixes:
+  * Accept 00:00-24:00 as a valid time specification (upstream BZ #1794)
+  * aioDone() could be called twice
+  * Squid reconfiguration (upstream BZ #1800)
+
 * Mon Oct 2 2006 Martin Stransky <stransky@redhat.com> - 7:2.6.STABLE4-1
 - new upstream
 - fixes from upstream bugzilla, items #1782,#1780,#1785,#1719,#1784,#1776