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, master has been updated via 0324cdbd19f1b09b66390823029e11993d40b140 (commit) via 72c5e364546485fa8db29197605d4be89d57918c (commit) from 24c0b6af6cb65f35068159f1d9bef42f8f7eb5c0 (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 0324cdbd19f1b09b66390823029e11993d40b140 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jan 31 20:58:14 2011 +0100

Updated cacti (0.8.7g).

commit 72c5e364546485fa8db29197605d4be89d57918c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jan 31 20:53:55 2011 +0100

Started core46.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/{oldcore/24 => core/46}/exclude | 0 config/rootfiles/core/46/filelists/files | 1 + config/rootfiles/core/{44 => 46}/meta | 0 config/rootfiles/{oldcore/42 => core/46}/update.sh | 8 ++++++-- config/rootfiles/packages/cacti | 9 ++++++--- lfs/cacti | 7 ++++--- make.sh | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/24 => core/46}/exclude (100%) create mode 100644 config/rootfiles/core/46/filelists/files copy config/rootfiles/core/{44 => 46}/meta (100%) copy config/rootfiles/{oldcore/42 => core/46}/update.sh (88%)

Difference in files: diff --git a/config/rootfiles/core/46/exclude b/config/rootfiles/core/46/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/46/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/46/meta b/config/rootfiles/core/46/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/46/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh new file mode 100644 index 0000000..5e84319 --- /dev/null +++ b/config/rootfiles/core/46/update.sh @@ -0,0 +1,52 @@ +#!/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) 2010 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove core updates from pakfire cache to save space... +rm -f /var/cache/pakfire/core-upgrade-*.ipfire +# +#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 +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti index 1935c5a..123d1f6 100644 --- a/config/rootfiles/packages/cacti +++ b/config/rootfiles/packages/cacti @@ -16,6 +16,7 @@ usr/share/cacti/cli/add_graph_template.php usr/share/cacti/cli/add_graphs.php usr/share/cacti/cli/add_perms.php usr/share/cacti/cli/add_tree.php +usr/share/cacti/cli/convert_innodb.php usr/share/cacti/cli/copy_user.php usr/share/cacti/cli/host_update_template.php usr/share/cacti/cli/import_template.php @@ -25,6 +26,7 @@ usr/share/cacti/cli/poller_output_empty.php usr/share/cacti/cli/poller_reindex_hosts.php usr/share/cacti/cli/rebuild_poller_cache.php usr/share/cacti/cli/repair_database.php +usr/share/cacti/cli/repair_templates.php usr/share/cacti/cli/structure_rra_paths.php usr/share/cacti/cli/upgrade_database.php usr/share/cacti/cmd.php @@ -311,6 +313,8 @@ usr/share/cacti/install/0_8_7a_to_0_8_7b.php usr/share/cacti/install/0_8_7b_to_0_8_7c.php usr/share/cacti/install/0_8_7c_to_0_8_7d.php usr/share/cacti/install/0_8_7d_to_0_8_7e.php +usr/share/cacti/install/0_8_7e_to_0_8_7f.php +usr/share/cacti/install/0_8_7f_to_0_8_7g.php usr/share/cacti/install/0_8_to_0_8_1.php usr/share/cacti/install/index.php usr/share/cacti/install/install_finish.gif @@ -495,8 +499,7 @@ usr/share/cacti/utilities.php #var/cacti #var/cacti/log var/cacti/log/.htaccess -var/cacti/log/.placeholder -var/cacti/log/cacti.log +#var/cacti/log/cacti.log #var/cacti/rra -var/cacti/rra/.placeholder +var/cacti/rra/.htaccess var/ipfire/backup/addons/includes/cacti diff --git a/lfs/cacti b/lfs/cacti index 9862cfe..ef06ead 100644 --- a/lfs/cacti +++ b/lfs/cacti @@ -24,7 +24,7 @@

include Config

-VER = 0.8.7e +VER = 0.8.7g

THISAPP = cacti-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cacti -PAK_VER = 2 +PAK_VER = 3

DEPS = "netsnmpd mysql"

@@ -44,7 +44,8 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 7563a58a57d2c6cc0da28cc341a30969 +$(DL_FILE)_MD5 = 268421cb1a58d3444f7ecbddb4c4b016 +

install : $(TARGET)

diff --git a/make.sh b/make.sh index f144ec4..b9a5078 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="45" # Core Level (Filename) +CORE="46" # Core Level (Filename) PAKFIRE_CORE="45" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan

hooks/post-receive -- IPFire 2.x development tree