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 73c7eff80ece6765c5c147514a3ce2153f7bf4c8 (commit) via e85d32bbb3eb5c5debf106737c4a4fe8c4729325 (commit) from 7bb21658735d8e84fac4721892ed7c81ddc2ac7a (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 73c7eff80ece6765c5c147514a3ce2153f7bf4c8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 19 17:47:56 2011 +0100
Remove some httpd errorlog entries.
commit e85d32bbb3eb5c5debf106737c4a4fe8c4729325 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 19 17:35:18 2011 +0100
Fix index.cgi autorefresh.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/45/filelists/files | 4 ++++ html/cgi-bin/connections.cgi | 4 ++-- html/cgi-bin/index.cgi | 6 +++--- html/cgi-bin/pppsetup.cgi | 4 ++-- html/cgi-bin/proxy.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index d3c27e8..afefcad 100644 --- a/config/rootfiles/core/45/filelists/files +++ b/config/rootfiles/core/45/filelists/files @@ -1,3 +1,7 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 7b53c00..14ee209 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@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 # @@ -57,7 +57,7 @@ if (open(IP, "${General::swroot}/red/local-ipaddress")) { push(@colour, ${Header::colourfw} ); }
-my @vpn = `/usr/local/bin/ipsecctrl I|grep erouted|cut -d"]" -f3|cut -d"=" -f4|cut -d";" -f1| sed "s|/| |g"`; +my @vpn = `/usr/local/bin/ipsecctrl I 2>/dev/null|grep erouted|cut -d"]" -f3|cut -d"=" -f4|cut -d";" -f1| sed "s|/| |g"`; foreach my $route (@vpn) { chomp($route); my @temp = split(/[\t ]+/, $route); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 6a93b68..8e623c9 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2011 IPFire Team info@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 # @@ -58,7 +58,7 @@ my %mainsettings = ();
my $connstate = &Header::connectionstatus();
- if ( -e "/var/ipfire/main/gpl-acceted" ) { + if ( -e "/var/ipfire/main/gpl-accepted" ) { if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { $refresh = "<meta http-equiv='refresh' content='300;'>"; } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ @@ -431,7 +431,7 @@ foreach my $line (@df) { }
# S.M.A.R.T. health warning -my @files = `/bin/ls /var/run/smartctl_out_hddtemp-*`; +my @files = `/bin/ls /var/run/smartctl_out_hddtemp-* 2>/dev/null`; foreach my $file (@files) { chomp ($file); my $disk=`echo $file | cut -d"-" -f2`; diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 0bfeabd..e2af0a0 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@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 # @@ -486,7 +486,7 @@ print <<END END ;
-my $atmdev=`cat /proc/net/atm/devices | grep 0`; +my $atmdev=`cat /proc/net/atm/devices 2>/dev/null | grep 0`; chomp ($atmdev); if ($atmdev ne '') { print <<END diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index f732c5b..476de52 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2011 IPFire Team info@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 # diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f336ec6..5558295 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2010 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2011 IPFire Team info@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 # @@ -2400,7 +2400,7 @@ EOF &General::readhasharray("${General::swroot}/vpn/config", %confighash); $cgiparams{'CA_NAME'} = '';
- my @status = `/usr/local/bin/ipsecctrl I`; + my @status = `/usr/local/bin/ipsecctrl I 2>/dev/null`;
# suggest a default name for this side if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") {
hooks/post-receive -- IPFire 2.x development tree