From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Aug 2013 11:03:51 +0000 (+0200)
Subject: core73: Add squid update to 3.3.
X-Git-Tag: v2.13-core73~29
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e65fe151a5b7bf7df9525fcae1cb920667818c2a

core73: Add squid update to 3.3.
---

diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files
index 42bb310a65..a1ef1bfdd5 100644
--- a/config/rootfiles/core/73/filelists/files
+++ b/config/rootfiles/core/73/filelists/files
@@ -1,6 +1,8 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/squid
 srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
+srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/html/redirect.cgi
 srv/web/ipfire/html/redirect-templates/
 var/ipfire/header.pl
diff --git a/config/rootfiles/core/73/filelists/squid b/config/rootfiles/core/73/filelists/squid
new file mode 120000
index 0000000000..2dc8372a0e
--- /dev/null
+++ b/config/rootfiles/core/73/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh
index 446e8a0ba0..6afca9fc54 100644
--- a/config/rootfiles/core/73/update.sh
+++ b/config/rootfiles/core/73/update.sh
@@ -35,19 +35,23 @@ done
 
 #
 #Stop services
+/etc/init.d/squid stop
 
 
 #
 #Extract files
 extract_files
 
+# Regenerate squid configuration files.
+/srv/web/ipfire/cgi-bin/proxy.cgi
 
 #
 #Start services
+/etc/init.d/squid start
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 sync