From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 15 Oct 2009 06:19:44 +0000 (+0200)
Subject: Updated squid to 2.7.STABLE7.
X-Git-Tag: v2.9-beta1~694
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f64126573097cb85365d14c82e7d13a1aa9a3a0;p=ipfire-2.x.git

Updated squid to 2.7.STABLE7.
---

diff --git a/config/rootfiles/core/32/exclude b/config/rootfiles/core/32/exclude
index e69de29bb2..fff2add0c8 100644
--- a/config/rootfiles/core/32/exclude
+++ b/config/rootfiles/core/32/exclude
@@ -0,0 +1,4 @@
+srv/web/ipfire/html/proxy.pac
+srv/web/ipfire/html/wpad.dat
+var/log/squid/access.log
+var/log/updatexlrator
diff --git a/config/rootfiles/core/32/filelists/squid b/config/rootfiles/core/32/filelists/squid
new file mode 120000
index 0000000000..2dc8372a0e
--- /dev/null
+++ b/config/rootfiles/core/32/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 1d7c89ce99..5578885f71 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -298,7 +298,7 @@
 * splix-2.0.0-rc2
 * sqlite-3.6.10
 * squashfs3.4
-* squid-2.7.STABLE6
+* squid-2.7.STABLE7
 * squidGuard-1.4
 * squidclamav-4.0
 * sshfs-fuse-2.2
diff --git a/lfs/squid b/lfs/squid
index b91faa13c7..f1120ff18e 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.STABLE6
+VER        = 2.7.STABLE7
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6de3a6a7a56a7ecae092f2d31a04f039
+$(DL_FILE)_MD5 = c18b0371fca813d5e7c7e0baf87baa22
 
 install : $(TARGET)