This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via e32571f0316a01ea940145287a5588640e3a3c2c (commit) via 9a5f5d39b669a02d80c4f034e24dac0aa7414f9a (commit) via f80f9d7e47f143f6d72e15ed2c3e0b8bc1ac7bc1 (commit) via dabe2eeb0deb3e28becf673ec13420b0e9574c22 (commit) from 162d2e2fc78b65b48fa84b7399a5a647b5c6534b (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e32571f0316a01ea940145287a5588640e3a3c2c Merge: 162d2e2 9a5f5d3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 30 12:38:10 2011 +0200
Merge branch 'master' into next
Conflicts: make.sh
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/{49 => 50}/exclude | 0 config/rootfiles/core/50/filelists/files | 1 + config/rootfiles/core/{49 => 50}/filelists/icons | 0 config/rootfiles/core/{49 => 50}/meta | 0 config/rootfiles/{oldcore/48 => core/50}/update.sh | 2 +- make.sh | 4 ++-- 6 files changed, 4 insertions(+), 3 deletions(-) copy config/rootfiles/core/{49 => 50}/exclude (100%) create mode 100644 config/rootfiles/core/50/filelists/files rename config/rootfiles/core/{49 => 50}/filelists/icons (100%) copy config/rootfiles/core/{49 => 50}/meta (100%) copy config/rootfiles/{oldcore/48 => core/50}/update.sh (99%)
Difference in files: diff --git a/config/rootfiles/core/49/filelists/icons b/config/rootfiles/core/49/filelists/icons deleted file mode 100644 index 52b22e0..0000000 --- a/config/rootfiles/core/49/filelists/icons +++ /dev/null @@ -1,13 +0,0 @@ -srv/web/ipfire/html/images/delete.gif -srv/web/ipfire/html/images/document-save.png -srv/web/ipfire/html/images/edit.gif -srv/web/ipfire/html/images/floppy.gif -srv/web/ipfire/html/images/forward.gif -srv/web/ipfire/html/images/info.gif -srv/web/ipfire/html/images/list-add.png -srv/web/ipfire/html/images/list-remove.png -srv/web/ipfire/html/images/package-x-generic.png -srv/web/ipfire/html/images/reload.gif -srv/web/ipfire/html/images/stock_ok.png -srv/web/ipfire/html/images/stock_stop.png -srv/web/ipfire/html/images/user-trash.png diff --git a/config/rootfiles/core/50/exclude b/config/rootfiles/core/50/exclude new file mode 100644 index 0000000..6fe46b4 --- /dev/null +++ b/config/rootfiles/core/50/exclude @@ -0,0 +1 @@ +/srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/50/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/50/filelists/icons b/config/rootfiles/core/50/filelists/icons new file mode 100644 index 0000000..52b22e0 --- /dev/null +++ b/config/rootfiles/core/50/filelists/icons @@ -0,0 +1,13 @@ +srv/web/ipfire/html/images/delete.gif +srv/web/ipfire/html/images/document-save.png +srv/web/ipfire/html/images/edit.gif +srv/web/ipfire/html/images/floppy.gif +srv/web/ipfire/html/images/forward.gif +srv/web/ipfire/html/images/info.gif +srv/web/ipfire/html/images/list-add.png +srv/web/ipfire/html/images/list-remove.png +srv/web/ipfire/html/images/package-x-generic.png +srv/web/ipfire/html/images/reload.gif +srv/web/ipfire/html/images/stock_ok.png +srv/web/ipfire/html/images/stock_stop.png +srv/web/ipfire/html/images/user-trash.png diff --git a/config/rootfiles/core/50/meta b/config/rootfiles/core/50/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/50/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/50/update.sh b/config/rootfiles/core/50/update.sh new file mode 100644 index 0000000..6c0c2ea --- /dev/null +++ b/config/rootfiles/core/50/update.sh @@ -0,0 +1,59 @@ +#!/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=50 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-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 5f595e8..4a7e374 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="49" # Core Level (Filename) -PAKFIRE_CORE="48" # Core Level (PAKFIRE) +CORE="50" # Core Level (Filename) +PAKFIRE_CORE="49" # 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
hooks/post-receive -- IPFire 2.x development tree