Merge branch 'master' into next

Conflicts:
	make.sh

diff --git a/config/rootfiles/core/50/update.sh b/config/rootfiles/core/50/update.sh
index 28826840479261f81158b4ae59400e0b49f53737..b114ded1e05cb1ddfc56b06c477859cdf3b38c80 100644 (file)
--- a/config/rootfiles/core/50/update.sh
+++ b/config/rootfiles/core/50/update.sh
@@ -34,13 +34,18 @@ done
 
 #
 #Stop services
-
+/etc/init.d/apache stop
+/etc/init.d/collectd stop
+/etc/init.d/squid stop
 #
 #Extract files
 extract_files
 
 #
 #Start services
+/etc/init.d/squid start
+/etc/init.d/collectd start
+/etc/init.d/apache start
 
 #
 #Update Language cache

diff --git a/lfs/squid b/lfs/squid
index ef676a2a5f7ce69ada12598b89654c9c1e028ba9..f85b5e9a8029cf47df49042843b0f5cd5ce341c5 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.13
+VER        = 3.1.14
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934
+$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 6d1e423905537ee788afe62917f7515ac4d35376..8c08fc34cb8384708c1f06aea8f1303eab1b78c8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.10"                                                 # Version number
-CORE="50"                                                      # Core Level (Filename)
-PAKFIRE_CORE="49"                                              # Core Level (PAKFIRE)
+CORE="51"                                                      # Core Level (Filename)
+PAKFIRE_CORE="50"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir