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 6411b32c6e1c6ffa066d27b8acbb2178ec33578d (commit) from 071df633cd1fb02057ea8ab6c27c609d5f993401 (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 6411b32c6e1c6ffa066d27b8acbb2178ec33578d Author: Christian Schmidt maniacikarus@ipfire.org Date: Wed Apr 21 07:15:44 2010 +0200

Some little bugfixes to current codebase

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

Summary of changes: config/outgoingfw/outgoingfw.pl | 1 - doc/packages-list.txt | 1 + html/cgi-bin/outgoingfw.cgi | 10 +++++----- html/cgi-bin/outgoinggrp.cgi | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)

Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index dd42415..58c97bc 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -145,7 +145,6 @@ foreach $configentry (sort @configs) } elsif ($configline[2] eq 'ip') { @SOURCE = ("$configline[5]"); $DEV = ""; - } } elsif ($configline[2] eq 'all') { @SOURCE = ("0/0"); $DEV = ""; diff --git a/doc/packages-list.txt b/doc/packages-list.txt index ea1498d..d5ed0ef 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,6 +62,7 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 +* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index e2bfcfd..be16beb 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -656,13 +656,13 @@ END <optgroup label='---'> <option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option> <optgroup label='$Lang::tr{'ip address'}'> - <option value='ip' $selected{'SNET'}{'ip'}>IPSEC $Lang::tr{'interface'}</option> - <option value='red' $selected{'SNET'}{'red'}>OpenVPN $Lang::tr{'interface'}</option> + <option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip'}</option> + <option value='red' $selected{'SNET'}{'red'}>$Lang::tr{'red'} IP</option> </optgroup> + <optgroup label='$Lang::tr{'alt vpns'}'> + <option value='ipsec' $selected{'SNET'}{'ipsec'}>IPSEC $Lang::tr{'interface'}</option> + <option value='ovpn' $selected{'SNET'}{'ovpn'}>OpenVPN $Lang::tr{'interface'}</option> </optgroup> - <option value='ipsec' $selected{'SNET'}{'ipsec'}>$Lang::tr{'source ip'}</option> - <option value='ovpn' $selected{'SNET'}{'ovpn'}>$Lang::tr{'red'} IP</option> - <optgroup label='$Lang::tr{'network'}'> <optgroup label='$Lang::tr{'network'}'> <option value='green' $selected{'SNET'}{'green'}>$Lang::tr{'green'}</option> END diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi index b277339..69656d0 100644 --- a/html/cgi-bin/outgoinggrp.cgi +++ b/html/cgi-bin/outgoinggrp.cgi @@ -199,7 +199,7 @@ print <<END </tr> <tr> <td align='left' colspan='3'> - <textarea name="ipgroupcontent" cols="20" rows="5" Wrap="off">192.168.1.0/14\n192.168.0.1\n192.168.0.2\n</textarea> + <textarea name="ipgroupcontent" cols="20" rows="5" Wrap="off">192.168.1.0/24\n192.168.3.0/255.255.255.0\n192.168.0.1\n192.168.0.2\n</textarea> </td> </tr> </table> diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0addee7..feef190 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -15,7 +15,7 @@ 'ConnSched change profile title' => 'Change to profile:', 'ConnSched days' => 'Days:', 'ConnSched down' => 'Down', -'Set time on boot' => 'Fixé l'heure en botte', +'Set time on boot' => 'Fixe l heure en botte', 'ConnSched ipsecstart' => 'IPSec (re)start', 'ConnSched ipsecstop' => 'IPSec stop', 'ConnSched reconnect' => 'Reconnect',

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