From d0b6f9ac85fc33d958f554641a7a2bb9014822a2 Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy@fedoraproject.org>
Date: Dec 06 2007 08:34:44 +0000
Subject: - upgrade to latest upstream 2.6.STABLE17


---

diff --git a/.cvsignore b/.cvsignore
index edac4bd..382c0da 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-squid-2.6.STABLE16.tar.bz2
+squid-2.6.STABLE17.tar.bz2
diff --git a/sources b/sources
index 8cea872..ae08005 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-849bee6f269e6c773f215fd4b41de0e3  squid-2.6.STABLE16.tar.bz2
+e6face0dff4ea054d3ba94236eb56ea1  squid-2.6.STABLE17.tar.bz2
diff --git a/squid-2.6.STABLE16-fd.patch b/squid-2.6.STABLE16-fd.patch
index 9728061..bcb2728 100644
--- a/squid-2.6.STABLE16-fd.patch
+++ b/squid-2.6.STABLE16-fd.patch
@@ -1,14 +1,6 @@
 diff -up squid-2.6.STABLE16/src/tools.c.fd squid-2.6.STABLE16/src/tools.c
 --- squid-2.6.STABLE16/src/tools.c.fd	2007-09-01 22:09:50.000000000 +0200
 +++ squid-2.6.STABLE16/src/tools.c	2007-09-21 15:01:32.000000000 +0200
-@@ -1,6 +1,6 @@
- 
- /*
-- * $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-+ * $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-  *
-  * DEBUG: section 21    Misc Functions
-  * AUTHOR: Harvest Derived
 @@ -735,46 +735,62 @@ readPidFile(void)
  }
  
@@ -105,14 +97,6 @@ diff -up squid-2.6.STABLE16/src/tools.c.fd squid-2.6.STABLE16/src/tools.c
 diff -up squid-2.6.STABLE16/src/cf.data.pre.fd squid-2.6.STABLE16/src/cf.data.pre
 --- squid-2.6.STABLE16/src/cf.data.pre.fd	2007-09-21 12:52:28.000000000 +0200
 +++ squid-2.6.STABLE16/src/cf.data.pre	2007-09-21 15:07:15.000000000 +0200
-@@ -1,6 +1,6 @@
- 
- #
--# $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-+# $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
- #
- # SQUID Web Proxy Cache          http://www.squid-cache.org/
- # ----------------------------------------------------------
 @@ -5216,4 +5216,16 @@ DOC_START
  	rounded to 1000.
  DOC_END
@@ -133,14 +117,6 @@ diff -up squid-2.6.STABLE16/src/cf.data.pre.fd squid-2.6.STABLE16/src/cf.data.pr
 diff -up squid-2.6.STABLE16/src/protos.h.fd squid-2.6.STABLE16/src/protos.h
 --- squid-2.6.STABLE16/src/protos.h.fd	2007-07-15 11:52:17.000000000 +0200
 +++ squid-2.6.STABLE16/src/protos.h	2007-09-21 15:03:14.000000000 +0200
-@@ -1,6 +1,6 @@
- 
- /*
-- * $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-+ * $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-  *
-  *
-  * SQUID Web Proxy Cache          http://www.squid-cache.org/
 @@ -1102,6 +1102,7 @@ extern void no_suid(void);
  extern void writePidFile(void);
  extern void setSocketShutdownLifetimes(int);
@@ -152,14 +128,6 @@ diff -up squid-2.6.STABLE16/src/protos.h.fd squid-2.6.STABLE16/src/protos.h
 diff -up squid-2.6.STABLE16/src/main.c.fd squid-2.6.STABLE16/src/main.c
 --- squid-2.6.STABLE16/src/main.c.fd	2007-08-31 15:52:10.000000000 +0200
 +++ squid-2.6.STABLE16/src/main.c	2007-09-21 15:04:01.000000000 +0200
-@@ -1,6 +1,6 @@
- 
- /*
-- * $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-+ * $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-  *
-  * DEBUG: section 1     Startup and Main Loop
-  * AUTHOR: Harvest Derived
 @@ -552,6 +552,7 @@ mainInitialize(void)
  	debug(1, 0) ("Running on %s\n", WIN32_OS_string);
  #endif
@@ -171,14 +139,6 @@ diff -up squid-2.6.STABLE16/src/main.c.fd squid-2.6.STABLE16/src/main.c
 diff -up squid-2.6.STABLE16/src/structs.h.fd squid-2.6.STABLE16/src/structs.h
 --- squid-2.6.STABLE16/src/structs.h.fd	2007-09-05 23:28:34.000000000 +0200
 +++ squid-2.6.STABLE16/src/structs.h	2007-09-21 15:04:49.000000000 +0200
-@@ -1,6 +1,6 @@
- 
- /*
-- * $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-+ * $Id: squid-2.6.STABLE16-fd.patch,v 1.1 2007/09/25 12:25:50 mbacovsk Exp $
-  *
-  *
-  * SQUID Web Proxy Cache          http://www.squid-cache.org/
 @@ -810,6 +810,7 @@ struct _SquidConfig {
  #endif
      time_t refresh_stale_window;
diff --git a/squid.spec b/squid.spec
index 6ecd8b6..be585f1 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,8 +4,8 @@
 
 Summary:  The Squid proxy caching server
 Name:     squid
-Version:  2.6.STABLE16
-Release:  3%{?dist}
+Version:  2.6.STABLE17
+Release:  1%{?dist}
 Epoch:    7
 License:  GPL
 Group:    System Environment/Daemons
@@ -328,6 +328,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Dec 06 2007 Martin Nagy <mnagy@redhat.com> - 2.6.STABLE17-1
+- upgrade to latest upstream 2.6.STABLE17
+
 * Mon Nov 12 2007 Martin Bacovsky <mbacovsk@redhat.com> - 7:2.6.STABLE16-3
 - squid is compiled wirh arp acls support (--enable-arp-acl)