From 2aa5f6100defbf9db5ea0cb8b4c5ce00d6cf40d8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 27 Jun 2011 20:52:35 +0200 Subject: [PATCH 1/3] smartmontools: update to 5.41. --- config/rootfiles/core/50/filelists/smartmontools | 1 + lfs/smartmontools | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/50/filelists/smartmontools diff --git a/config/rootfiles/core/50/filelists/smartmontools b/config/rootfiles/core/50/filelists/smartmontools new file mode 120000 index 000000000..fb66dafef --- /dev/null +++ b/config/rootfiles/core/50/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/lfs/smartmontools b/lfs/smartmontools index 5530f2108..3f92cb782 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 5.40 +VER = 5.41 THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0f0be0239914ad87830a4fff594bda5b +$(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692 install : $(TARGET) From 1abbf741cc7985ccaf9671102af8e80dffa0846f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 28 Jun 2011 00:46:48 +0200 Subject: [PATCH 2/3] load graph: fix unlocalized "minutes". --- config/cfgroot/graphs.pl | 6 +++--- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 196124614..5eb96d8f7 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -257,11 +257,11 @@ sub updateloadgraph { "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE", "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE", "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE", - "AREA:load1".$color{"color13"}."A0:1 Minute:", + "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":", "GPRINT:load1:LAST:%5.2lf", - "AREA:load5".$color{"color18"}."A0:5 Minuten:", + "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":", "GPRINT:load5:LAST:%5.2lf", - "AREA:load15".$color{"color14"}."A0:15 Minuten:", + "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":", "GPRINT:load15:LAST:%5.2lf\\j", "LINE1:load5".$color{"color13"}, "LINE1:load1".$color{"color18"}, diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 09cd50993..e6d451fe7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1150,6 +1150,7 @@ 'min delay' => 'Minimale Verzögerung', 'min size' => 'Min. Objektgröße (kB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minuten', 'misc-options' => 'Sonstige Optionen', 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index fcb9241fb..247814505 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1177,6 +1177,7 @@ 'min delay' => 'Minimum delay', 'min size' => 'Min object size (KB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minutes', 'misc-options' => 'Miscellaneous options', 'missing dat' => 'Encrypted archive not found', From ad8cad552baa2561f7c8cacc52ae14242a36abfb Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 28 Jun 2011 00:48:47 +0200 Subject: [PATCH 3/3] core50: add graphs.pl. --- config/rootfiles/core/50/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index dca50befa..400eafa7b 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -2,3 +2,4 @@ etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup +var/ipfire/graphs.pl