From 6e568d9b25209a450c420790e8f6797aae352c09 Mon Sep 17 00:00:00 2001 From: Martin Nagy Date: Wed, 5 Dec 2007 08:15:05 +0000 Subject: [PATCH] - upgrade to latest upstream 2.6.STABLE17 --- .cvsignore | 2 +- sources | 2 +- squid-2.6.STABLE16-fd.patch | 40 ------------------------------------- squid.spec | 7 +++++-- 4 files changed, 7 insertions(+), 44 deletions(-) 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 6ab837b..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: tools.c,v 1.250.2.3 2007/09/01 20:09:50 hno Exp $ -+ * $Id: tools.c,v 1.255 2007/06/29 00:08:18 hno 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: cf.data.pre,v 1.382.2.14 2007/09/05 21:50:15 hno Exp $ -+# $Id: cf.data.pre,v 1.424 2007/09/19 11:50:39 hno 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: protos.h,v 1.520.2.3 2007/07/15 09:52:17 hno Exp $ -+ * $Id: protos.h,v 1.531 2007/06/29 00:08:18 hno 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: main.c,v 1.393.2.4 2007/08/31 13:52:10 hno Exp $ -+ * $Id: main.c,v 1.397 2007/06/29 00:08:18 hno 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: structs.h,v 1.507.2.8 2007/09/05 21:28:34 hno Exp $ -+ * $Id: structs.h,v 1.517 2007/06/28 23:22:01 hno 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 f4ae109..0afe23e 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 04 2007 Martin Bacovsky - 2.6.STABLE17-1 +- upgrade to latest upstream 2.6.STABLE17 + * Wed Oct 31 2007 Martin Bacovsky - 7:2.6.STABLE16-3 - arp-acl was enabled