IPFire-SCM February 2014

ipfire-scm@lists.ipfire.org

1 participants
75 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2b4593b27f802a0a75ab8939a35d6a972b970d90
by git＠ipfire.org 04 Feb '14

04 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e27b3ca86497fc1843749dcfb1f3eecf5a6afbd
by git＠ipfire.org 04 Feb '14

04 Feb '14

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 8e27b3ca86497fc1843749dcfb1f3eecf5a6afbd (commit) via 6d72ff77e1f58fc7f0d6d4122ed231c47c5cdf13 (commit) from fe30713604357bf8e7d62aa7e0d4c39402699938 (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 8e27b3ca86497fc1843749dcfb1f3eecf5a6afbd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 4 12:55:33 2014 +0100 core76: Sort exclude file alphabetically. commit 6d72ff77e1f58fc7f0d6d4122ed231c47c5cdf13 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 4 12:51:21 2014 +0100 Never include rc.local or firewall.local in a core update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/76/exclude | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/76/exclude b/config/rootfiles/core/76/exclude index 321a931..a468d0a 100644 --- a/config/rootfiles/core/76/exclude +++ b/config/rootfiles/core/76/exclude @@ -1,17 +1,19 @@ -srv/web/ipfire/html/proxy.pac boot/config.txt -etc/udev/rules.d/30-persistent-network.rules etc/collectd.custom -etc/shadow etc/ipsec.conf etc/ipsec.secrets etc/ipsec.user.conf etc/ipsec.user.secrets -var/log/cache -var/updatecache etc/localtime -var/ipfire/ovpn +etc/shadow etc/ssh/ssh_config etc/ssh/sshd_config etc/ssl/openssl.cnf +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache var/state/dhcp/dhcpd.leases +var/updatecache hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fe30713604357bf8e7d62aa7e0d4c39402699938
by git＠ipfire.org 04 Feb '14

04 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 808465682327a3e8d3dd8e6a3ae247d36751041f
by git＠ipfire.org 02 Feb '14

02 Feb '14

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 808465682327a3e8d3dd8e6a3ae247d36751041f (commit) via 178df99a871760cfa773543f3258c04c76fc5d6f (commit) via 4a23c55b0dbf07d4a4449ef1ad637acc076fc67c (commit) via abff56f062a1bb09eecc755e61fc7d3e0e37d702 (commit) via 3704887e8edb3a286e30ff3216d845a62c47bb5d (commit) from 15b023b97944802aae90982511de103310496c31 (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 808465682327a3e8d3dd8e6a3ae247d36751041f Author: Alexander Marx <amarx(a)ipfire.org> Date: Fri Jan 31 21:23:21 2014 +0100 openvpn: Wrong subnet calculation bug fix. Fixes #10466. commit 178df99a871760cfa773543f3258c04c76fc5d6f Merge: 4a23c55 15b023b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 2 14:38:02 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 4a23c55b0dbf07d4a4449ef1ad637acc076fc67c Author: Alexander Marx <amarx(a)ipfire.org> Date: Fri Jan 31 12:31:49 2014 +0100 Update perl-DBI to 1.631 commit abff56f062a1bb09eecc755e61fc7d3e0e37d702 Author: Alexander Marx <amarx(a)ipfire.org> Date: Fri Jan 31 11:32:11 2014 +0100 perl-File-ReadBackwards added commit 3704887e8edb3a286e30ff3216d845a62c47bb5d Author: Alexander Marx <amarx(a)ipfire.org> Date: Fri Jan 31 10:48:56 2014 +0100 DBD-SQLite Addon added ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/perl-DBD-SQLite | 15 +++++++++++++++ config/rootfiles/packages/perl-File-ReadBackwards | 4 ++++ html/cgi-bin/ovpnmain.cgi | 2 +- lfs/{perl-DBD-mysql => perl-DBD-SQLite} | 14 +++++++------- lfs/perl-DBI | 4 ++-- lfs/{perl-DBD-mysql => perl-File-ReadBackwards} | 14 +++++++------- make.sh | 2 ++ 7 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 config/rootfiles/packages/perl-DBD-SQLite create mode 100644 config/rootfiles/packages/perl-File-ReadBackwards copy lfs/{perl-DBD-mysql => perl-DBD-SQLite} (94%) copy lfs/{perl-DBD-mysql => perl-File-ReadBackwards} (94%) Difference in files: diff --git a/config/rootfiles/packages/perl-DBD-SQLite b/config/rootfiles/packages/perl-DBD-SQLite new file mode 100644 index 0000000..74a1fe6 --- /dev/null +++ b/config/rootfiles/packages/perl-DBD-SQLite @@ -0,0 +1,15 @@ +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite/Cookbook.pod +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/SQLite.bs +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/SQLite.so +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/DBD-SQLite +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/DBD-SQLite/sqlite3.c +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/DBD-SQLite/sqlite3.h +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/DBD-SQLite/sqlite3ext.h +#usr/share/man/man3/DBD::SQLite.3 +#usr/share/man/man3/DBD::SQLite::Cookbook.3 diff --git a/config/rootfiles/packages/perl-File-ReadBackwards b/config/rootfiles/packages/perl-File-ReadBackwards new file mode 100644 index 0000000..be62542 --- /dev/null +++ b/config/rootfiles/packages/perl-File-ReadBackwards @@ -0,0 +1,4 @@ +usr/lib/perl5/site_perl/5.12.3/File/ReadBackwards.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/File/ReadBackwards +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/File/ReadBackwards/.packlist +#usr/share/man/man3/File::ReadBackwards.3 diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 71366cb..8858974 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -509,7 +509,7 @@ sub getccdadresses my @iprange=(); my %ccdhash=(); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); - $iprange[0]=$ip1.".".$ip2.".".$ip3.".".2; + $iprange[0]=$ip1.".".$ip2.".".$ip3.".".($ip4+2); for (my $i=1;$i<=$count;$i++) { my $tmpip=$iprange[$i-1]; my $stepper=$i*4; diff --git a/lfs/perl-DBD-SQLite b/lfs/perl-DBD-SQLite new file mode 100644 index 0000000..aaee284 --- /dev/null +++ b/lfs/perl-DBD-SQLite @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.40 + +THISAPP = DBD-SQLite-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = perl-DBD-SQLite +PAK_VER = 1 + +DEPS = "perl-DBI" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b9876882186499583428b14cf5c0e29c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-DBI b/lfs/perl-DBI index 8091374..76e8a25 100644 --- a/lfs/perl-DBI +++ b/lfs/perl-DBI @@ -24,7 +24,7 @@ include Config -VER = 1.607 +VER = 1.631 THISAPP = DBI-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bd5785b39675213948a61dea1b400012 +$(DL_FILE)_MD5 = 444d3c305e86597e11092b517794a840 install : $(TARGET) diff --git a/lfs/perl-File-ReadBackwards b/lfs/perl-File-ReadBackwards new file mode 100644 index 0000000..bafd557 --- /dev/null +++ b/lfs/perl-File-ReadBackwards @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.05 + +THISAPP = File-ReadBackwards-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = perl-File-ReadBackwards +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 613d9d02de6c1d86d5fa5b8816a6b214 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 186e65f..0e9099b 100755 --- a/make.sh +++ b/make.sh @@ -716,6 +716,8 @@ buildipfire() { ipfiremake netsnmpd ipfiremake perl-DBI ipfiremake perl-DBD-mysql + ipfiremake perl-DBD-SQLite + ipfiremake perl-File-ReadBackwards ipfiremake cacti ipfiremake icecc ipfiremake openvmtools hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15b023b97944802aae90982511de103310496c31
by git＠ipfire.org 02 Feb '14

02 Feb '14

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 15b023b97944802aae90982511de103310496c31 (commit) from 1c72742bca7e8e5e6151c77481e9110f6b8a1cf4 (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 15b023b97944802aae90982511de103310496c31 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 2 14:26:13 2014 +0100 Add an entropy graph. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 35 +++++++++++++++++++++++++++++++ config/collectd/collectd.conf | 1 + config/rootfiles/common/apache2 | 1 + config/rootfiles/core/76/filelists/files | 1 + doc/language_issues.es | 4 ++++ doc/language_issues.fr | 4 ++++ doc/language_issues.nl | 4 ++++ doc/language_issues.pl | 4 ++++ doc/language_issues.ru | 4 ++++ doc/language_issues.tr | 4 ++++ doc/language_missings | 16 ++++++++++++++ html/cgi-bin/{mdstat.cgi => entropy.cgi} | 36 +++++++++++++++++--------------- langs/de/cgi-bin/de.pl | 4 ++++ langs/en/cgi-bin/en.pl | 4 ++++ 14 files changed, 105 insertions(+), 17 deletions(-) copy html/cgi-bin/{mdstat.cgi => entropy.cgi} (71%) mode change 100644 => 100755 Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 19c0546..a0df5c0 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1114,3 +1114,38 @@ sub getprocesses { my @processesgraph = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/processes-*/ 2>/dev/null`; return @processesgraph; } + +sub updateentropygraph { + my $period = $_[0]; + my @command = ( + "-", + "--start", + "-1".$period, + "-aPNG", + "-i", + "-z", + "-W www.ipfire.org", + "--alt-y-grid", + "-w 600", + "-h 225", + "-r", + "--lower-limit","0", + "-t $Lang::tr{'entropy'}", + "-v $Lang::tr{'bit'}", + "DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE", + "CDEF:entropytrend=entropy,43200,TREND", + "LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}), + "VDEF:entrmin=entropy,MINIMUM", + "VDEF:entrmax=entropy,MAXIMUM", + "VDEF:entravg=entropy,AVERAGE", + "GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}), + "GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}), + "GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n", + "LINE3:entropytrend#000000", + ); + + RRDs::graph (@command); + $ERROR = RRDs::error; + + print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR; +} diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 14dd568..61327bf 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -15,6 +15,7 @@ ReadThreads 1 LoadPlugin cpu #LoadPlugin cpufreq LoadPlugin disk +LoadPlugin entropy LoadPlugin interface LoadPlugin iptables LoadPlugin load diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index c2be59b..2076fc3 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1391,6 +1391,7 @@ srv/web/ipfire/cgi-bin/dns.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/entropy.cgi srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/fireinfo.cgi srv/web/ipfire/cgi-bin/firewall.cgi diff --git a/config/rootfiles/core/76/filelists/files b/config/rootfiles/core/76/filelists/files index ed5b757..a6f5e7c 100644 --- a/config/rootfiles/core/76/filelists/files +++ b/config/rootfiles/core/76/filelists/files @@ -5,6 +5,7 @@ etc/rc.d/init.d/network run srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/gui.cgi +srv/web/ipfire/cgi-bin/entropy.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/netinternal.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/doc/language_issues.es b/doc/language_issues.es index 066ea50..d0cd3a8 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -577,6 +577,7 @@ WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: attention +WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: ccd add WARNING: untranslated string: ccd choose net @@ -633,6 +634,7 @@ WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption +WARNING: untranslated string: entropy WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -804,6 +806,8 @@ WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: maximum +WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: notice diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 42e1479..1dca032 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -587,6 +587,7 @@ WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: attention +WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: ccd add WARNING: untranslated string: ccd choose net @@ -644,6 +645,7 @@ WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption +WARNING: untranslated string: entropy WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -815,6 +817,8 @@ WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: maximum +WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: notice diff --git a/doc/language_issues.nl b/doc/language_issues.nl index aa8c5b6..75623b5 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -588,6 +588,7 @@ WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent +WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: dead peer detection @@ -608,6 +609,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: encryption +WARNING: untranslated string: entropy WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings @@ -762,6 +764,8 @@ WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: maximum +WARNING: untranslated string: minimum WARNING: untranslated string: most preferred WARNING: untranslated string: notice WARNING: untranslated string: openvpn network diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 066ea50..d0cd3a8 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -577,6 +577,7 @@ WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: attention +WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: ccd add WARNING: untranslated string: ccd choose net @@ -633,6 +634,7 @@ WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption +WARNING: untranslated string: entropy WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -804,6 +806,8 @@ WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: maximum +WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: notice diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 0e00e5e..c2b7bf3 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -580,6 +580,7 @@ WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: attention +WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: ccd add WARNING: untranslated string: ccd choose net @@ -638,6 +639,7 @@ WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption +WARNING: untranslated string: entropy WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount WARNING: untranslated string: extrahd install or load driver @@ -800,6 +802,8 @@ WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: maximum +WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred WARNING: untranslated string: notice diff --git a/doc/language_issues.tr b/doc/language_issues.tr index a21d735..9711f14 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -602,6 +602,7 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: addons WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent +WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip @@ -614,6 +615,7 @@ WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing WARNING: untranslated string: encryption +WARNING: untranslated string: entropy WARNING: untranslated string: firewall rules WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings @@ -768,6 +770,8 @@ WARNING: untranslated string: ipsec network WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: maximum +WARNING: untranslated string: minimum WARNING: untranslated string: most preferred WARNING: untranslated string: notice WARNING: untranslated string: openvpn network diff --git a/doc/language_missings b/doc/language_missings index b588cae..02de34a 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -23,6 +23,7 @@ < age sminute < age ssecond < attention +< bit < ccd add < ccd choose net < ccd clientip @@ -80,6 +81,7 @@ < drop forward < drop outgoing < encryption +< entropy < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -282,6 +284,8 @@ < least preferred < lifetime < mac filter +< maximum +< minimum < minute < most preferred < notice @@ -459,6 +463,7 @@ < age ssecond < Async logging enabled < attention +< bit < ccd add < ccd choose net < ccd clientip @@ -515,6 +520,7 @@ < drop forward < drop outgoing < encryption +< entropy < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -717,6 +723,8 @@ < least preferred < lifetime < mac filter +< maximum +< minimum < minute < most preferred < notice @@ -886,6 +894,7 @@ < age sminute < age ssecond < attention +< bit < ccd add < ccd choose net < ccd clientip @@ -942,6 +951,7 @@ < drop forward < drop outgoing < encryption +< entropy < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1136,6 +1146,8 @@ < least preferred < lifetime < mac filter +< maximum +< minimum < minute < most preferred < notice @@ -1290,6 +1302,7 @@ < age sminute < age ssecond < attention +< bit < ccd add < ccd choose net < ccd clientip @@ -1349,6 +1362,7 @@ < drop outgoing < Edit an existing route < encryption +< entropy < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -1546,6 +1560,8 @@ < least preferred < lifetime < mac filter +< maximum +< minimum < minute < month-graph < most preferred diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi new file mode 100755 index 0000000..9362e78 --- /dev/null +++ b/html/cgi-bin/entropy.cgi @@ -0,0 +1,53 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2005-2010 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +use strict; + +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; +require "${General::swroot}/graphs.pl"; + +my @querry = split(/\?/,$ENV{'QUERY_STRING'}); +$querry[0] = '' unless defined $querry[0]; +$querry[1] = 'hour' unless defined $querry[1]; + +if ( $querry[0] ne~ "") { + print "Content-type: image/png\n\n"; + binmode(STDOUT); + &Graphs::updateentropygraph($querry[1]); + +} else { + &Header::showhttpheaders(); + &Header::openpage($Lang::tr{'entropy'}, 1, ''); + &Header::openbigbox('100%', 'left'); + + &Header::openbox('100%', 'center', $Lang::tr{'entropy'}); + &Graphs::makegraphbox("entropy.cgi", "day", '', 350); + &Header::closebox(); + + &Header::closebigbox(); + &Header::closepage(); +} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 9da517e..e32ee94 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -397,6 +397,7 @@ 'basic options' => 'Basisoptionen', 'beep when ppp connects or disconnects' => 'Piepen, wenn IPFire verbindet oder trennt', 'behind a proxy' => 'Hinter einem Proxy:', +'bit' => 'Bit', 'bitrate' => 'Bitrate', 'bleeding rules' => 'Bleeding Edge Snort Rules', 'blue' => 'BLAU', @@ -808,6 +809,7 @@ 'end address' => 'Endadresse:', 'enter ack class' => 'Legen Sie hier die ACK-Klasse fest und klicken Sie danach auf Speichern.', 'enter data' => 'Geben Sie die Daten ein und klicken Sie danach auf Speichern.', +'entropy' => 'Entropie', 'err bk 1' => 'Fehler beim Erzeugen des Archivs', 'err bk 10 password' => 'Fehler beim Datensicherungs-Passwort', 'err bk 2 key' => 'Fehler beim Erzeugen der Schlüsseldatei', @@ -1388,6 +1390,7 @@ 'max size' => 'Max. Objektgröße (kB):', 'max throughput' => 'Maximaler Durchsatz', 'maximal' => 'Maximal', +'maximum' => 'Maximum', 'maximum retries' => 'Maximale Wiederholversuche:', 'may' => 'Mai', 'mbmon display' => 'Anzeigen', @@ -1413,6 +1416,7 @@ 'min delay' => 'Minimale Verzögerung', 'min size' => 'Min. Objektgröße (kB):', 'minimal' => 'Minimal', +'minimum' => 'Minimum', 'minute' => 'Minute', 'minutes' => 'Minuten', 'misc-options' => 'Sonstige Optionen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 3957b85..d3c8774 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -416,6 +416,7 @@ 'behind a proxy' => 'Behind a proxy:', 'bewan adsl pci st' => 'TO BE REMOVED', 'bewan adsl usb' => 'TO BE REMOVED', +'bit' => 'Bit', 'bitrate' => 'Bitrate', 'bleeding rules' => 'Bleeding Edge Snort Rules', 'blue' => 'BLUE', @@ -834,6 +835,7 @@ 'end address' => 'End address:', 'enter ack class' => 'Enter the ACK- Class and then press Save.', 'enter data' => 'Enter your settings and then press Save.', +'entropy' => 'Entropy', 'err bk 1' => 'Error creating archive', 'err bk 10 password' => 'Error with backup password', 'err bk 2 key' => 'Error creating key file', @@ -1417,6 +1419,7 @@ 'max size' => 'Max object size (KB):', 'max throughput' => 'Maximum throughput', 'maximal' => 'Maximal', +'maximum' => 'Maximum', 'maximum retries' => 'Maximum retries:', 'may' => 'May', 'mbmon display' => 'Display', @@ -1442,6 +1445,7 @@ 'min delay' => 'Minimum delay', 'min size' => 'Min object size (KB):', 'minimal' => 'Minimal', +'minimum' => 'Minimum', 'minute' => 'Minute', 'minutes' => 'Minutes', 'misc-options' => 'Miscellaneous options', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.15-beta1, created. c2bf88c1a4dd030fd8838cc8388e265f1e748a29
by git＠ipfire.org 02 Feb '14

02 Feb '14

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 tag, v2.15-beta1 has been created at c2bf88c1a4dd030fd8838cc8388e265f1e748a29 (commit) - Log ----------------------------------------------------------------- commit c2bf88c1a4dd030fd8838cc8388e265f1e748a29 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 1 17:14:39 2014 +0100 apache: sync filesystem after key generating. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1c72742bca7e8e5e6151c77481e9110f6b8a1cf4
by git＠ipfire.org 02 Feb '14

02 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c924c7d1d19da6863ec6de9352c1d6d50f35502f
by git＠ipfire.org 02 Feb '14

02 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d8656c914e11a04aaa64f73a21a1e2f5552dc292
by git＠ipfire.org 01 Feb '14

01 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73794dad879be8c3533030f229e269123ed2a51a
by git＠ipfire.org 01 Feb '14

01 Feb '14

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2014