From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 7 Sep 2011 12:01:27 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=ea1fa596326e2817d23e2282e7c75a45e4afcbdf;hp=39b14828cabf647dd505a7f5da956c7bb1f98f9e

Merge branch 'master' into next

Conflicts:
	make.sh
---

diff --git a/config/rootfiles/core/52/update.sh b/config/rootfiles/core/52/update.sh
index 1e2f61e7f..412299d60 100644
--- a/config/rootfiles/core/52/update.sh
+++ b/config/rootfiles/core/52/update.sh
@@ -34,6 +34,7 @@ done
 
 #
 #Stop services
+/etc/init.d/squid stop
 /etc/init.d/apache stop
 
 #
@@ -43,6 +44,7 @@ extract_files
 #
 #Start services
 /etc/init.d/apache start
+/etc/init.d/squid start
 
 #
 #Update Language cache
diff --git a/config/rootfiles/core/53/exclude b/config/rootfiles/core/53/exclude
new file mode 100644
index 000000000..bb0d8c84b
--- /dev/null
+++ b/config/rootfiles/core/53/exclude
@@ -0,0 +1,2 @@
+srv/web/ipfire/html/proxy.pac
+var/updatecache
diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files
new file mode 100644
index 000000000..0037af183
--- /dev/null
+++ b/config/rootfiles/core/53/filelists/files
@@ -0,0 +1 @@
+etc/system-release
diff --git a/config/rootfiles/core/53/meta b/config/rootfiles/core/53/meta
new file mode 100644
index 000000000..d547fa86f
--- /dev/null
+++ b/config/rootfiles/core/53/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh
new file mode 100644
index 000000000..f13519a6f
--- /dev/null
+++ b/config/rootfiles/core/53/update.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=53
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/squid stop
+/etc/init.d/apache stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/apache start
+/etc/init.d/squid start
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.43-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/make.sh b/make.sh
index af8847169..c986ec80e 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.10"							# Version number
-CORE="52"							# Core Level (Filename)
-PAKFIRE_CORE="51"						# Core Level (PAKFIRE)
+CORE="53"							# Core Level (Filename)
+PAKFIRE_CORE="52"						# 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