From 243f8ca6e937084c18085d85278ee9c200c69936 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 2 Oct 2014 18:21:51 +0200
Subject: [PATCH] squid: Update to 3.4.8

Contains some security fixes:

 * CVE-2014-6270
   http://www.squid-cache.org/Advisories/SQUID-2014_3.txt
 * CVE-2014-7141
   CVE-2014-7142
   http://www.squid-cache.org/Advisories/SQUID-2014_4.txt
---
 config/rootfiles/core/84/filelists/squid | 1 +
 config/rootfiles/core/84/update.sh       | 2 ++
 lfs/squid                                | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 120000 config/rootfiles/core/84/filelists/squid

diff --git a/config/rootfiles/core/84/filelists/squid b/config/rootfiles/core/84/filelists/squid
new file mode 120000
index 0000000000..2dc8372a0e
--- /dev/null
+++ b/config/rootfiles/core/84/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/84/update.sh b/config/rootfiles/core/84/update.sh
index 1b8332664b..93a9e2016b 100644
--- a/config/rootfiles/core/84/update.sh
+++ b/config/rootfiles/core/84/update.sh
@@ -32,6 +32,7 @@ do
 done
 
 # Stop services
+/etc/init.d/squid stop
 /etc/init.d/dnsmasq stop
 
 # Remove old files
@@ -41,6 +42,7 @@ extract_files
 
 # Start services
 /etc/init.d/dnsmasq start
+/etc/init.d/squid start
 
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
diff --git a/lfs/squid b/lfs/squid
index 921feebf2e..548abd937a 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.4.7
+VER        = 3.4.8
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 74677634121649ccb87a5655fcd4298d
+$(DL_FILE)_MD5 = b0c4335447248810169f58ea4d8b204a
 
 install : $(TARGET)
 
-- 
2.39.2